You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/01 14:07:10 UTC

[01/82] [abbrv] [partial] ignite git commit: master - imports

Repository: ignite
Updated Branches:
  refs/heads/ignite-1093-2 0e6866c55 -> 59936ba02


http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
index d5a0300..28a080c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * Tests {@link org.apache.ignite.cache.CacheInterceptor}.
@@ -43,4 +45,4 @@ public class GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest
     @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
         return PRIMARY;
     }
-}
+}
\ No newline at end of file


[73/82] [abbrv] ignite git commit: Platforms: WIP on better interfaces.

Posted by sb...@apache.org.
Platforms: WIP on better interfaces.


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

Branch: refs/heads/ignite-1093-2
Commit: 66d46ecacd0a6babce6e0a722c580d6646eeb9cb
Parents: 39da853
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 11:23:50 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 11:23:50 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/PlatformContext.java    |  13 +-
 .../cluster/PlatformClusterNodeFilter.java      |  28 +++++
 .../datastreamer/PlatformStreamReceiver.java    |  27 +++++
 .../cluster/PlatformClusterNodeFilter.java      |  79 ------------
 .../cluster/PlatformClusterNodeFilterImpl.java  |  78 ++++++++++++
 .../datastreamer/PlatformStreamReceiver.java    | 120 -------------------
 .../PlatformStreamReceiverImpl.java             | 119 ++++++++++++++++++
 7 files changed, 259 insertions(+), 205 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index bff0fc8..4c70360 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import java.util.Collection;
-import java.util.UUID;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cluster.ClusterMetrics;
@@ -33,15 +31,18 @@ import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinu
 import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
 import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery;
 import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
+import org.apache.ignite.internal.processors.platform.cluster.PlatformClusterNodeFilter;
 import org.apache.ignite.internal.processors.platform.compute.PlatformJob;
+import org.apache.ignite.internal.processors.platform.datastreamer.PlatformStreamReceiver;
 import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream;
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManager;
 import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.stream.StreamReceiver;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+import java.util.UUID;
+
 /**
  * Platform context. Acts as an entry point for platform operations.
  */
@@ -266,7 +267,7 @@ public interface PlatformContext {
      * @param keepPortable Keep portable flag.
      * @return Stream receiver.
      */
-    public StreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepPortable);
+    public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepPortable);
 
     /**
      * Create cluster node filter.
@@ -274,5 +275,5 @@ public interface PlatformContext {
      * @param filter Native filter.
      * @return Cluster node filter.
      */
-    public IgnitePredicate<ClusterNode> createClusterNodeFilter(Object filter);
+    public PlatformClusterNodeFilter createClusterNodeFilter(Object filter);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java
new file mode 100644
index 0000000..fd550fb
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.cluster;
+
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/**
+ * Platform cluster node filter marker interface.
+ */
+public interface PlatformClusterNodeFilter extends IgnitePredicate<ClusterNode> {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java
new file mode 100644
index 0000000..9108920
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.datastreamer;
+
+import org.apache.ignite.stream.StreamReceiver;
+
+/**
+ * Platform data streamer filter marker interface.
+ */
+public interface PlatformStreamReceiver extends StreamReceiver<Object, Object> {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java
deleted file mode 100644
index eb203cd..0000000
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform.cluster;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
-import org.apache.ignite.internal.processors.platform.PlatformContext;
-import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
-import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
-import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.resources.IgniteInstanceResource;
-
-/**
- * Interop cluster node filter.
- */
-public class PlatformClusterNodeFilter extends PlatformAbstractPredicate implements IgnitePredicate<ClusterNode> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * {@link java.io.Externalizable} support.
-     */
-    public PlatformClusterNodeFilter() {
-        // No-op.
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param pred .Net portable predicate.
-     * @param ctx Kernal context.
-     */
-    public PlatformClusterNodeFilter(Object pred, PlatformContext ctx) {
-        super(pred, 0, ctx);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean apply(ClusterNode clusterNode) {
-        try (PlatformMemory mem = ctx.memory().allocate()) {
-            PlatformOutputStream out = mem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            writer.writeObject(pred);
-            ctx.writeNode(writer, clusterNode);
-
-            out.synchronize();
-
-            return ctx.gateway().clusterNodeFilterApply(mem.pointer()) != 0;
-        }
-    }
-
-    /**
-     * @param ignite Ignite instance.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    @IgniteInstanceResource
-    public void setIgniteInstance(Ignite ignite) {
-        ctx = PlatformUtils.platformContext(ignite);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
new file mode 100644
index 0000000..5ba9a85
--- /dev/null
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.cluster;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
+import org.apache.ignite.internal.processors.platform.PlatformContext;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
+import org.apache.ignite.resources.IgniteInstanceResource;
+
+/**
+ * Interop cluster node filter.
+ */
+public class PlatformClusterNodeFilterImpl extends PlatformAbstractPredicate implements PlatformClusterNodeFilter {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * {@link java.io.Externalizable} support.
+     */
+    public PlatformClusterNodeFilterImpl() {
+        // No-op.
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param pred .Net portable predicate.
+     * @param ctx Kernal context.
+     */
+    public PlatformClusterNodeFilterImpl(Object pred, PlatformContext ctx) {
+        super(pred, 0, ctx);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean apply(ClusterNode clusterNode) {
+        try (PlatformMemory mem = ctx.memory().allocate()) {
+            PlatformOutputStream out = mem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            writer.writeObject(pred);
+            ctx.writeNode(writer, clusterNode);
+
+            out.synchronize();
+
+            return ctx.gateway().clusterNodeFilterApply(mem.pointer()) != 0;
+        }
+    }
+
+    /**
+     * @param ignite Ignite instance.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    @IgniteInstanceResource
+    public void setIgniteInstance(Ignite ignite) {
+        ctx = PlatformUtils.platformContext(ignite);
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java
deleted file mode 100644
index 851216a..0000000
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiver.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform.datastreamer;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collection;
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
-import org.apache.ignite.internal.processors.platform.PlatformContext;
-import org.apache.ignite.internal.processors.platform.cache.PlatformCache;
-import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
-import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
-import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.stream.StreamReceiver;
-
-/**
- * Interop receiver.
- */
-public class PlatformStreamReceiver<K, V> extends PlatformAbstractPredicate implements StreamReceiver<K, V> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
-    private boolean keepPortable;
-
-    /**
-     * Constructor.
-     */
-    public PlatformStreamReceiver()
-    {
-        super();
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param pred .Net portable receiver.
-     * @param ptr Pointer to receiver in the native platform.
-     * @param ctx Kernal context.
-     */
-    public PlatformStreamReceiver(Object pred, long ptr, boolean keepPortable, PlatformContext ctx) {
-        super(pred, ptr, ctx);
-
-        assert pred != null;
-
-        this.keepPortable = keepPortable;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void receive(IgniteCache<K, V> cache, Collection<Map.Entry<K, V>> collection)
-        throws IgniteException {
-        assert ctx != null;
-
-        try (PlatformMemory mem = ctx.memory().allocate()) {
-            PlatformOutputStream out = mem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            writer.writeObject(pred);
-
-            writer.writeInt(collection.size());
-
-            for (Map.Entry<K, V> e : collection) {
-                writer.writeObject(e.getKey());
-                writer.writeObject(e.getValue());
-            }
-
-            out.synchronize();
-
-            ctx.gateway().dataStreamerStreamReceiverInvoke(ptr,
-                new PlatformCache(ctx, cache, keepPortable), mem.pointer(), keepPortable);
-        }
-    }
-
-    /**
-     * @param ignite Ignite instance.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    @IgniteInstanceResource
-    public void setIgniteInstance(Ignite ignite) {
-        ctx = PlatformUtils.platformContext(ignite);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        super.writeExternal(out);
-
-        out.writeBoolean(keepPortable);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        super.readExternal(in);
-
-        keepPortable = in.readBoolean();
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/66d46eca/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
new file mode 100644
index 0000000..92250c0
--- /dev/null
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.datastreamer;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
+import org.apache.ignite.internal.processors.platform.PlatformContext;
+import org.apache.ignite.internal.processors.platform.cache.PlatformCache;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
+import org.apache.ignite.resources.IgniteInstanceResource;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Interop receiver.
+ */
+public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implements PlatformStreamReceiver {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** */
+    private boolean keepPortable;
+
+    /**
+     * Constructor.
+     */
+    public PlatformStreamReceiverImpl()
+    {
+        super();
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param pred .Net portable receiver.
+     * @param ptr Pointer to receiver in the native platform.
+     * @param ctx Kernal context.
+     */
+    public PlatformStreamReceiverImpl(Object pred, long ptr, boolean keepPortable, PlatformContext ctx) {
+        super(pred, ptr, ctx);
+
+        assert pred != null;
+
+        this.keepPortable = keepPortable;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void receive(IgniteCache<Object, Object> cache, Collection<Map.Entry<Object, Object>> collection)
+        throws IgniteException {
+        assert ctx != null;
+
+        try (PlatformMemory mem = ctx.memory().allocate()) {
+            PlatformOutputStream out = mem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            writer.writeObject(pred);
+
+            writer.writeInt(collection.size());
+
+            for (Map.Entry<Object, Object> e : collection) {
+                writer.writeObject(e.getKey());
+                writer.writeObject(e.getValue());
+            }
+
+            out.synchronize();
+
+            ctx.gateway().dataStreamerStreamReceiverInvoke(ptr, new PlatformCache(ctx, cache, keepPortable),
+                mem.pointer(), keepPortable);
+        }
+    }
+
+    /**
+     * @param ignite Ignite instance.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    @IgniteInstanceResource
+    public void setIgniteInstance(Ignite ignite) {
+        ctx = PlatformUtils.platformContext(ignite);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeExternal(ObjectOutput out) throws IOException {
+        super.writeExternal(out);
+
+        out.writeBoolean(keepPortable);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        super.readExternal(in);
+
+        keepPortable = in.readBoolean();
+    }
+}
\ No newline at end of file


[21/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
index 8e95ab8..5ed6502 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
@@ -18,10 +18,11 @@
 package org.apache.ignite.internal.processors.query.h2.twostep.messages;
 
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Request to fetch next page.
@@ -164,4 +165,4 @@ public class GridQueryNextPageRequest implements Message {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
index d06e118..ade7d90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.processors.query.h2.twostep.messages;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Next page response.
@@ -295,4 +299,4 @@ public class GridQueryNextPageResponse implements Message {
     public void retry(AffinityTopologyVersion retry) {
         this.retry = retry;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
index 2b04c52..a7b4d7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.processors.query.h2.twostep.messages;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Query request.
@@ -307,4 +311,4 @@ public class GridQueryRequest implements Message {
     @Override public byte fieldsCount() {
         return 7;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java
index 93b833d..620f03c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java
@@ -22,4 +22,4 @@ package org.apache.ignite.internal.processors.resource;
  */
 public interface GridNoImplicitInjection {
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java
index 4ada7bb..ddb84ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Simple injector which wraps only one resource object.
@@ -68,4 +68,4 @@ class GridResourceBasicInjector<T> implements GridResourceInjector {
     @Override public String toString() {
         return S.toString(GridResourceBasicInjector.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
index fed7ebd..2c88bb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Wrapper for data where resource should be injected.
@@ -90,4 +89,4 @@ class GridResourceField {
     @Override public String toString() {
         return S.toString(GridResourceField.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java
index 1a3566f..0b3a6c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.deployment.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
 
 /**
  * Resource injector implementations contain logic and resources that
@@ -53,4 +53,4 @@ interface GridResourceInjector {
      * @param dep Deployment to undeploy.
      */
     public void undeploy(GridDeployment dep);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
index 1e85ecd..35824fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.util.GridLeanIdentitySet;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Resource container contains caches for classes used for injection.
@@ -343,4 +351,4 @@ class GridResourceIoc {
             return annMap.get(annCls);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
index 5c7b301..3a6e779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.managers.deployment.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
 
 /**
  * Simple injector which wraps ComputeJobContext resource object.
@@ -51,4 +52,4 @@ public class GridResourceJobContextInjector extends GridResourceBasicInjector<Co
         if (!(target instanceof ComputeTask))
             super.inject(mtd, target, depCls, dep);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java
index 7a36067..8c66efa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  *
@@ -65,4 +66,4 @@ public class GridResourceLoggerInjector extends GridResourceBasicInjector<Ignite
 
         return rsrc;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
index ad08a40..9e411d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Wrapper for data where resource should be injected.
@@ -85,4 +84,4 @@ class GridResourceMethod {
     @Override public String toString() {
         return S.toString(GridResourceMethod.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
index f5ba492..afe0ef1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
@@ -17,22 +17,42 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.services.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.internal.GridInternalWrapper;
+import org.apache.ignite.internal.GridJobContextImpl;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.resources.CacheNameResource;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.resources.LoadBalancerResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.ServiceResource;
+import org.apache.ignite.resources.SpringApplicationContextResource;
+import org.apache.ignite.resources.SpringResource;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.spi.IgniteSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Processor for all Ignite and task/job resources.
@@ -582,4 +602,4 @@ public class GridResourceProcessor extends GridProcessorAdapter {
 
         ioc.printMemoryStats();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java
index 9c2b2e6..f204e56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.services.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.resources.ServiceResource;
+import org.apache.ignite.services.Service;
 
 /**
  * Grid service injector.
@@ -81,4 +81,4 @@ public class GridResourceServiceInjector extends GridResourceBasicInjector<Colle
         if (svc != null)
             GridResourceUtils.inject(mtd.getMethod(), target, svc);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java
index 660d6ba..d27799c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.lang.reflect.*;
-import java.util.concurrent.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteClosure;
 
 /**
  * Collection of utility methods used in package for classes reflection.
@@ -103,4 +104,4 @@ final class GridResourceUtils {
             Callable.class.isAssignableFrom(f.getType()) || Runnable.class.isAssignableFrom(f.getType()) ||
             IgniteClosure.class.isAssignableFrom(f.getType());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
index f0d17ec..37b558f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.resource;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgnitionEx;
 
 /**
  * Interface was introduced to avoid compile-time dependency on spring framework. Spring resource context
@@ -45,4 +45,3 @@ public interface GridSpringResourceContext {
      */
     public Object unwrapTarget(Object target) throws IgniteCheckedException;
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
index 76a33b1..4f9b3ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Supported commands.
@@ -193,4 +193,4 @@ public enum GridRestCommand {
     public String key() {
         return key;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index bb796d2..d606ba4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -17,38 +17,60 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.handlers.cache.*;
-import org.apache.ignite.internal.processors.rest.handlers.datastructures.*;
-import org.apache.ignite.internal.processors.rest.handlers.query.*;
-import org.apache.ignite.internal.processors.rest.handlers.task.*;
-import org.apache.ignite.internal.processors.rest.handlers.top.*;
-import org.apache.ignite.internal.processors.rest.handlers.version.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.ConnectorMessageInterceptor;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.datastructures.DataStructuresCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.query.QueryCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.top.GridTopologyCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.version.GridVersionCommandHandler;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestProtocol;
+import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestTaskRequest;
+import org.apache.ignite.internal.processors.rest.request.RestSqlQueryRequest;
+import org.apache.ignite.internal.processors.security.SecurityContext;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.internal.util.worker.GridWorkerFuture;
+import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.security.AuthenticationContext;
+import org.apache.ignite.plugin.security.SecurityCredentials;
 import org.apache.ignite.plugin.security.SecurityException;
-import org.jsr166.*;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.jsr166.LongAdder8;
 
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestResponse.*;
-import static org.apache.ignite.plugin.security.SecuritySubjectType.*;
+import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_AUTH_FAILED;
+import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_FAILED;
+import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_SECURITY_CHECK_FAILED;
+import static org.apache.ignite.plugin.security.SecuritySubjectType.REMOTE_CLIENT;
 
 /**
  * Rest processor implementation.
@@ -697,4 +719,4 @@ public class GridRestProcessor extends GridProcessorAdapter {
         X.println(">>>   protosSize: " + protos.size());
         X.println(">>>   handlersSize: " + handlers.size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java
index 468d7fa..202f742 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * REST protocol.
@@ -56,4 +55,4 @@ public interface GridRestProtocol {
      * Stops protocol.
      */
     public abstract void stop();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
index ed9fd81..b14beb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.request.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
 
 /**
  * Command protocol handler.
@@ -37,4 +37,4 @@ public interface GridRestProtocolHandler {
      * @return Future.
      */
     public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
index 83c987f..ecbc6c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * JSON response. Getters and setters must conform to JavaBean standard.
@@ -174,4 +177,4 @@ public class GridRestResponse implements Externalizable {
         err = U.readString(in);
         obj = in.readObject();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
index c6557bc..0d55b16 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This class provides implementation for commit message fields and cannot be used directly.
@@ -99,4 +102,4 @@ public abstract class GridClientAbstractMessage implements GridClientMessage, Ex
     @Override public String toString() {
         return S.toString(GridClientAbstractMessage.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java
index 8eed157..d48df26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Client authentication request.
@@ -63,4 +64,4 @@ public class GridClientAuthenticationRequest extends GridClientAbstractMessage {
     @Override public String toString() {
         return S.toString(GridClientAuthenticationRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java
index 58e973b..b1afff1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generic cache request.
@@ -268,4 +271,4 @@ public class GridClientCacheRequest extends GridClientAbstractMessage {
         return getClass().getSimpleName() + " [op=" + op + ", key=" + key + ", val=" + val +
             ", val2=" + val2 + ", vals=" + vals + ", cacheFlagsOn=" + cacheFlagsOn + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
index b3dd30c..3790dd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Arrays;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * A client handshake request, containing version info and
@@ -105,4 +104,4 @@ public class GridClientHandshakeRequest extends GridClientAbstractMessage {
     @Override public String toString() {
         return getClass().getSimpleName() + " [arr=" + Arrays.toString(arr) + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java
index ec677dc..f125462 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import java.io.*;
+import java.io.Externalizable;
 
 /**
  * A client handshake response, containing result
@@ -63,4 +63,4 @@ public class GridClientHandshakeResponse extends GridClientAbstractMessage {
     @Override public String toString() {
         return getClass().getSimpleName() + " [resCode=" + resCode + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java
index 4f34a9c..4db618d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
 
 /**
  * Interface for all client messages.
@@ -79,4 +79,4 @@ public interface GridClientMessage extends Serializable {
      * @param sesTok Session token.
      */
     public void sessionToken(byte[] sesTok);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
index 833abd9..2a34c80 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java
@@ -17,10 +17,15 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Node bean.
@@ -278,4 +283,4 @@ public class GridClientNodeBean implements Externalizable {
     @Override public String toString() {
         return "GridClientNodeBean [id=" + nodeId + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
index 91bfd6a..4138c24 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
 /**
  * Node metrics bean.
@@ -1457,4 +1460,4 @@ public class GridClientNodeMetricsBean implements Externalizable {
         rcvdMsgsCnt = in.readInt();
         rcvdBytesCnt = in.readLong();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java
index 90235df..36c83c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG;
 
 /**
  * Fictive ping packet.
@@ -36,4 +36,4 @@ public class GridClientPingPacket extends GridClientAbstractMessage {
     @Override public String toString() {
         return getClass().getName();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java
index e96baf5..5522095 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Portable meta data sent from client.
@@ -69,4 +68,4 @@ public class GridClientPortableMetaData {
     @Override public String toString() {
         return S.toString(GridClientPortableMetaData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java
index c9a7263..8208229 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Bean representing client operation result.
@@ -119,4 +120,4 @@ public class GridClientResponse extends GridClientAbstractMessage {
             "destId=" + destinationId() + ", status=" + successStatus + ", errMsg=" + errorMessage() +
             ", result=" + res + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
index a7fa86e..6b53143 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * {@code Task} command request.
@@ -121,4 +122,4 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
     @Override public String toString() {
         return getClass().getSimpleName() + " [taskName=" + taskName + ", arg=" + arg + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java
index 696ac03..dc2a953 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Task result.
@@ -118,4 +120,4 @@ public class GridClientTaskResultBean implements Externalizable {
         return getClass().getSimpleName() + " [res=" + res + ", error=" + error +
             ", finished=" + finished + ", id=" + id + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java
index 8b27084..f35bdad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * {@code Topology} command request.
@@ -146,4 +147,4 @@ public class GridClientTopologyRequest extends GridClientAbstractMessage {
         return getClass().getSimpleName() + " [includeMetrics=" + includeMetrics +
             ", includeAttrs=" + includeAttrs + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java
index 7839e22..35411a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
 
 /**
  * Container for routed message information.
@@ -73,4 +76,4 @@ public class GridRouterRequest extends GridClientAbstractMessage {
         return "GridRouterRequest [clientId=" + clientId() + ", reqId=" + requestId() + ", " +
             "destId=" + destinationId() + ", length=" + body.length + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java
index 9054d8e..fb9297d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.client.message;
 
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
 
 /**
  *
@@ -99,4 +102,4 @@ public class GridRouterResponse extends GridClientAbstractMessage {
             ", status=" + status +
             ", errMsg=" + errorMessage() + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
index e185332..77427fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.handlers;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
 
 /**
  * Command handler.
@@ -37,4 +37,4 @@ public interface GridRestCommandHandler {
      * @return Future.
      */
     public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
index 2fd0f2d..31c26b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.handlers;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
 
 /**
  * Abstract command handler.
@@ -48,4 +48,4 @@ public abstract class GridRestCommandHandlerAdapter implements GridRestCommandHa
     protected static String missingParameter(String param) {
         return "Failed to find mandatory parameter in request: " + param;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 64f595d..b3af2f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -17,35 +17,78 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.internal.GridClosureCallMode.*;
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ModifiedExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.IgniteClosure2X;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_DECREMENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_INCREMENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_ADD;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_APPEND;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CAS;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CONTAINS_KEY;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CONTAINS_KEYS;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_PUT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_PUT_IF_ABSENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_REMOVE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_REPLACE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_METRICS;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PREPEND;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT_IF_ABSENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE_VALUE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE_VALUE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_SIZE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.DESTROY_CACHE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.GET_OR_CREATE_CACHE;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Command handler for API requests.
@@ -1348,4 +1391,4 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             return c.sizeAsync(new CachePeekMode[]{CachePeekMode.PRIMARY});
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java
index d723800..be38696 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.cache;
 
-import org.apache.ignite.internal.util.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.internal.util.GridLeanMap;
 
 /**
  * Grid cache metrics for rest.
@@ -139,4 +138,4 @@ public class GridCacheRestMetrics {
 
         return map;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java
index aa52f47..9d73867 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.cache;
 
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Adds affinity node ID to cache responses.
@@ -64,4 +66,4 @@ public class GridCacheRestResponse extends GridRestResponse {
 
         affinityNodeId = U.readString(in);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
index 5abbb77..e3cdcf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java
@@ -17,19 +17,23 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.DataStructuresRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_DECREMENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_INCREMENT;
 
 /**
  *
@@ -107,4 +111,4 @@ public class DataStructuresCommandHandler extends GridRestCommandHandlerAdapter
             }
         }, false);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java
index 8c4ddb0..4c8a054 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.query;
 
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Cache query fields metadata.
@@ -130,4 +132,4 @@ public class CacheQueryFieldsMetaResult implements Externalizable {
         fieldName = U.readString(in);
         fieldTypeName = U.readString(in);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java
index 544a094..f5a920f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.query;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Client query result.
@@ -117,4 +120,4 @@ public class CacheQueryResult implements Externalizable {
         items = U.readCollection(in);
         fieldsMeta = U.readCollection(in);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
index 1712dd4..64c7673 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
@@ -17,23 +17,35 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.Query;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.rest.request.RestSqlQueryRequest;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CLOSE_SQL_QUERY;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXECUTE_SQL_FIELDS_QUERY;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXECUTE_SQL_QUERY;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.FETCH_SQL_QUERY;
 
 /**
  * Query command handler.
@@ -289,4 +301,4 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
index d832b21..232353a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -17,42 +17,70 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.task;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridClosureCallMode.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.ComputeTaskInternalFuture;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestTaskRequest;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS;
+import static org.apache.ignite.IgniteSystemProperties.getInteger;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
+import static org.apache.ignite.internal.GridTopic.TOPIC_REST;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.NOOP;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.RESULT;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBJ_ID;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TIMEOUT;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q;
 
 /**
  * Command handler for API requests.
@@ -636,4 +664,4 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
             clientId = U.readUuid(in);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
index 951b1e0..64eb5fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.task;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Task result request.
@@ -165,4 +166,4 @@ public class GridTaskResultRequest implements Message {
     @Override public byte fieldsCount() {
         return 2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
index d29c525..8876d4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.task;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task result response.
@@ -211,4 +212,4 @@ public class GridTaskResultResponse implements Message {
     @Override public byte fieldsCount() {
         return 4;
     }
-}
+}
\ No newline at end of file


[80/82] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/master'

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-1093-2
Commit: 2cd3da2356bd0f9cf663886cdee2b2b22c0d6c15
Parents: fda434c 9a55758
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 1 13:20:58 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 1 13:20:58 2015 +0300

----------------------------------------------------------------------
 .../internal/GridEventConsumeHandler.java       |  15 +-
 .../managers/communication/GridIoManager.java   |  50 +++---
 .../GridLifecycleAwareMessageFilter.java        |  38 -----
 .../eventstorage/GridEventStorageManager.java   |  16 +-
 .../CacheContinuousQueryFilterEx.java           |  31 ----
 .../continuous/CacheContinuousQueryHandler.java |   5 +-
 .../platform/PlatformAwareEventFilter.java      |  39 -----
 .../processors/platform/PlatformContext.java    |  19 +--
 .../platform/PlatformEventFilterListener.java   |  39 +++++
 .../platform/PlatformLocalEventListener.java    |  28 ----
 .../cache/query/PlatformContinuousQuery.java    |   6 +-
 .../query/PlatformContinuousQueryFilter.java    |  30 ++++
 .../platform/message/PlatformMessageFilter.java |  40 +++++
 .../PlatformContinuousQueryRemoteFilter.java    |  20 +--
 .../platform/events/PlatformEventFilter.java    | 164 -------------------
 .../events/PlatformEventFilterListenerImpl.java | 163 ++++++++++++++++++
 .../platform/events/PlatformEvents.java         |  15 +-
 .../messaging/PlatformMessageFilter.java        | 110 -------------
 .../messaging/PlatformMessageFilterImpl.java    | 110 +++++++++++++
 .../messaging/PlatformMessageLocalFilter.java   |   9 +-
 .../platform/messaging/PlatformMessaging.java   |   7 +-
 21 files changed, 464 insertions(+), 490 deletions(-)
----------------------------------------------------------------------



[71/82] [abbrv] ignite git commit: IGNITE-1337: Moved "common" CPP project to Ignite.

Posted by sb...@apache.org.
IGNITE-1337: Moved "common" CPP project to Ignite.


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

Branch: refs/heads/ignite-1093-2
Commit: 7ca8cbc774b0c23aca537b078898707a2ede3cbd
Parents: 10e51d1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 10:39:17 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 10:39:17 2015 +0300

----------------------------------------------------------------------
 .../platform/src/main/cpp/common/Makefile.am    |   45 +
 .../platform/src/main/cpp/common/configure.ac   |   62 +
 .../src/main/cpp/common/ignite-common.pc.in     |    9 +
 .../src/main/cpp/common/include/Makefile.am     |   22 +
 .../common/include/ignite/common/concurrent.h   |  210 ++
 .../cpp/common/include/ignite/common/exports.h  |  145 ++
 .../cpp/common/include/ignite/common/java.h     |  652 ++++++
 .../cpp/common/os/linux/include/Makefile.am     |   21 +
 .../os/linux/include/ignite/common/common.h     |   81 +
 .../linux/include/ignite/common/concurrent_os.h |  394 ++++
 .../src/main/cpp/common/os/linux/src/common.cpp |   59 +
 .../cpp/common/os/linux/src/concurrent_os.cpp   |  175 ++
 .../os/win/include/ignite/common/common.h       |   56 +
 .../win/include/ignite/common/concurrent_os.h   |  406 ++++
 .../src/main/cpp/common/os/win/src/common.cpp   |   65 +
 .../cpp/common/os/win/src/concurrent_os.cpp     |  151 ++
 .../src/main/cpp/common/project/README.TXT      |    1 +
 .../src/main/cpp/common/project/vs/README.TXT   |    1 +
 .../main/cpp/common/project/vs/common.vcxproj   |  202 ++
 .../common/project/vs/common.vcxproj.filters    |   54 +
 .../src/main/cpp/common/project/vs/module.def   |   99 +
 .../src/main/cpp/common/project/vs/targetver.h  |   25 +
 .../src/main/cpp/common/src/concurrent.cpp      |   94 +
 .../src/main/cpp/common/src/exports.cpp         |  413 ++++
 .../platform/src/main/cpp/common/src/java.cpp   | 2204 ++++++++++++++++++
 parent/pom.xml                                  |    5 +
 26 files changed, 5651 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/Makefile.am b/modules/platform/src/main/cpp/common/Makefile.am
new file mode 100644
index 0000000..f5ca5dd
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/Makefile.am
@@ -0,0 +1,45 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+SUBDIRS = . include os/linux/include
+DIST_SUBDIRS = . include os/linux/include
+
+AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/os/linux/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL
+AM_CXXFLAGS = -Wall -std=c++0x
+LIB_LDFLAGS = -no-undefined -version-info 1
+
+COMMON_SRC = os/linux/src/concurrent_os.cpp \
+             src/concurrent.cpp \
+             src/java.cpp \
+             src/exports.cpp \
+             os/linux/src/common.cpp
+
+lib_LTLIBRARIES = libignite-common.la
+libignite_common_la_SOURCES = $(COMMON_SRC)
+libignite_common_la_LIBADD = -L$(JAVA_HOME)/jre/lib/amd64/server
+libignite_common_la_LDFLAGS = $(LIB_LDFLAGS) -L/usr/local/lib -ljvm -version-info 0:0:0 -release $(PACKAGE_VERSION)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ignite-common.pc
+
+clean-local:
+	$(RM) *.gcno *.gcda
+
+clean-docs:
+	$(RM) $(DX_CLEANFILES)

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/configure.ac b/modules/platform/src/main/cpp/common/configure.ac
new file mode 100644
index 0000000..7706737
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/configure.ac
@@ -0,0 +1,62 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT([Ignite JNI bridge for C++], [7.4.1], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_CONFIG_SRCDIR(src)
+
+AC_CANONICAL_SYSTEM
+AC_CONFIG_MACRO_DIR([m4])
+AC_LANG([C++])
+
+# Initialize automake
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+AC_CONFIG_HEADER(config.h)
+
+AM_PROG_AR
+
+# Checks for programs.
+GXX="-g -O2"
+
+AC_PROG_CXX
+
+# Initialize Libtool
+LT_INIT
+
+# Checks for libraries.
+AC_CHECK_LIB([pthread], [pthread_mutex_lock])
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_INT8_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
+
+AC_CONFIG_FILES(Makefile include/Makefile os/linux/include/Makefile ignite-common.pc)
+
+AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/ignite-common.pc.in
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/ignite-common.pc.in b/modules/platform/src/main/cpp/common/ignite-common.pc.in
new file mode 100644
index 0000000..3cd3cec
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/ignite-common.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ignite-common
+Description: Ignite JNI bridge for C++.
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lignite-common

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/include/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/include/Makefile.am b/modules/platform/src/main/cpp/common/include/Makefile.am
new file mode 100644
index 0000000..5db1d4a
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/include/Makefile.am
@@ -0,0 +1,22 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+nobase_include_HEADERS = ignite/common/concurrent.h \
+                         ignite/common/java.h \
+                         ignite/common/exports.h

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/include/ignite/common/concurrent.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/include/ignite/common/concurrent.h b/modules/platform/src/main/cpp/common/include/ignite/common/concurrent.h
new file mode 100644
index 0000000..1c9ab22
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/include/ignite/common/concurrent.h
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_COMMON_CONCURRENT
+#define _IGNITE_COMMON_CONCURRENT
+
+#include "ignite/common/concurrent_os.h"
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace concurrent
+        {
+            /**
+             * Default deleter implementation.
+             *
+             * @param obj Object to be deleted.
+             */
+            template<typename T>
+            IGNITE_IMPORT_EXPORT void SharedPointerDefaultDeleter(T* obj)
+            {
+                delete obj;
+            }
+
+            /**
+             * Holder of shared pointer data.
+             */
+            class IGNITE_IMPORT_EXPORT SharedPointerImpl
+            {
+            public:
+                /**
+                 * Constructor.
+                 *
+                 * @param ptr Raw pointer.
+                 */
+                SharedPointerImpl(void* ptr);
+
+                /**
+                 * Get raw pointer.
+                 *
+                 * @return Raw pointer.
+                 */
+                void* Pointer();
+
+                /**
+                 * Increment usage counter.
+                 */
+                void Increment();
+
+                /**
+                 * Decrement usage counter.
+                 *
+                 * @return True if counter reached zero.
+                 */
+                bool Decrement();
+            private:
+                /** Raw pointer. */
+                void* ptr;
+
+                /** Reference count. */
+                int32_t refCnt;
+
+                IGNITE_NO_COPY_ASSIGNMENT(SharedPointerImpl)
+            };
+
+            /**
+             * Shared pointer.
+             */
+            template<typename T>
+            class IGNITE_IMPORT_EXPORT SharedPointer
+            {
+            public:
+                /**
+                 * Constructor.
+                 */
+                SharedPointer() : impl(NULL), deleter(NULL)
+                {
+                    // No-op.
+                }
+
+                /**
+                 * Constructor.
+                 *
+                 * @param ptr Raw pointer.
+                 */
+                explicit SharedPointer(T* ptr)
+                {
+                    if (ptr)
+                    {
+                        impl = new SharedPointerImpl(ptr);
+                        deleter = SharedPointerDefaultDeleter;
+                    }
+                    else
+                    {
+                        impl = NULL;
+                        deleter = NULL;
+                    }
+                }
+
+                /**
+                 * Constructor.
+                 *
+                 * @param ptr Raw pointer.
+                 * @param deleter Delete function.
+                 */
+                SharedPointer(T* ptr, void(*deleter)(T*))
+                {
+                    if (ptr)
+                    {
+                        this->impl = new SharedPointerImpl(ptr);
+                        this->deleter = deleter;
+                    }
+                    else
+                    {
+                        this->impl = NULL;
+                        this->deleter = NULL;
+                    }
+                }
+
+                /**
+                 * Copy constructor.
+                 *
+                 * @param other Instance to copy.
+                 */
+                SharedPointer(const SharedPointer& other)
+                {
+                    impl = other.impl;
+                    deleter = other.deleter;
+
+                    if (impl)
+                        impl->Increment();
+                }
+
+                /**
+                 * Assignment operator.
+                 *
+                 * @param other Other instance.
+                 */
+                SharedPointer& operator=(const SharedPointer& other)
+                {
+                    if (this != &other)
+                    {
+                        // 1. Create new instance.
+                        SharedPointer tmp(other);
+
+                        // 2. Swap with temp.
+                        SharedPointerImpl* impl0 = impl;
+                        void(*deleter0)(T*) = deleter;
+
+                        impl = tmp.impl;
+                        deleter = tmp.deleter;
+
+                        tmp.impl = impl0;
+                        tmp.deleter = deleter0;
+                    }
+
+                    return *this;
+                }
+
+                /**
+                 * Destructor.
+                 */
+                ~SharedPointer()
+                {
+                    if (impl && impl->Decrement())
+                    {
+                        T* ptr = Get();
+
+                        delete impl;
+
+                        deleter(ptr);
+                    }
+                }
+
+                /**
+                 * Get raw pointer.
+                 *
+                 * @return Raw pointer.
+                 */
+                T* Get()
+                {
+                    return impl ? static_cast<T*>(impl->Pointer()) : NULL;
+                }
+            private:
+                /** Implementation. */
+                SharedPointerImpl* impl;
+
+                /** Delete function. */
+                void(*deleter)(T*);
+            };
+        }
+    }
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/include/ignite/common/exports.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/include/ignite/common/exports.h b/modules/platform/src/main/cpp/common/include/ignite/common/exports.h
new file mode 100644
index 0000000..48e86f0
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/include/ignite/common/exports.h
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_COMMON_EXPORTS
+#define _IGNITE_COMMON_EXPORTS
+
+#include "ignite/common/java.h"
+
+namespace gcj = ignite::common::java;
+
+extern "C" {
+    int IGNITE_CALL IgniteReallocate(long long memPtr, int cap);
+
+    void* IGNITE_CALL IgniteIgnitionStart(gcj::JniContext* ctx, char* cfgPath, char* gridName, int factoryId, long long dataPtr);
+    void* IGNITE_CALL IgniteIgnitionInstance(gcj::JniContext* ctx, char* gridName);
+    long long IGNITE_CALL IgniteIgnitionEnvironmentPointer(gcj::JniContext* ctx, char* gridName);
+    bool IGNITE_CALL IgniteIgnitionStop(gcj::JniContext* ctx, char* gridName, bool cancel);
+    void IGNITE_CALL IgniteIgnitionStopAll(gcj::JniContext* ctx, bool cancel);
+
+    void IGNITE_CALL IgniteProcessorReleaseStart(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProcessorProjection(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProcessorCache(gcj::JniContext* ctx, void* obj, char* name);
+    void* IGNITE_CALL IgniteProcessorCreateCache(gcj::JniContext* ctx, void* obj, char* name);
+    void* IGNITE_CALL IgniteProcessorGetOrCreateCache(gcj::JniContext* ctx, void* obj, char* name);
+    void* IGNITE_CALL IgniteProcessorAffinity(gcj::JniContext* ctx, void* obj, char* name);
+    void* IGNITE_CALL IgniteProcessorDataStreamer(gcj::JniContext* ctx, void* obj, char* name, bool keepPortable);
+    void* IGNITE_CALL IgniteProcessorTransactions(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProcessorCompute(gcj::JniContext* ctx, void* obj, void* prj);
+    void* IGNITE_CALL IgniteProcessorMessage(gcj::JniContext* ctx, void* obj, void* prj);
+    void* IGNITE_CALL IgniteProcessorEvents(gcj::JniContext* ctx, void* obj, void* prj);
+    void* IGNITE_CALL IgniteProcessorServices(gcj::JniContext* ctx, void* obj, void* prj);
+    void* IGNITE_CALL IgniteProcessorExtensions(gcj::JniContext* ctx, void* obj);
+    
+    long long IGNITE_CALL IgniteTargetInStreamOutLong(gcj::JniContext* ctx, void* obj, int opType, long long memPtr);
+    void IGNITE_CALL IgniteTargetInStreamOutStream(gcj::JniContext* ctx, void* obj, int opType, long long inMemPtr, long long outMemPtr);
+    void* IGNITE_CALL IgniteTargetInStreamOutObject(gcj::JniContext* ctx, void* obj, int opType, long long memPtr);
+    void IGNITE_CALL IgniteTargetInObjectStreamOutStream(gcj::JniContext* ctx, void* obj, int opType, void* arg, long long inMemPtr, long long outMemPtr);
+    long long IGNITE_CALL IgniteTargetOutLong(gcj::JniContext* ctx, void* obj, int opType);
+    void IGNITE_CALL IgniteTargetOutStream(gcj::JniContext* ctx, void* obj, int opType, long long memPtr);
+    void* IGNITE_CALL IgniteTargetOutObject(gcj::JniContext* ctx, void* obj, int opType);
+    void IGNITE_CALL IgniteTargetListenFuture(gcj::JniContext* ctx, void* obj, long long futId, int typ);
+    void IGNITE_CALL IgniteTargetListenFutureForOperation(gcj::JniContext* ctx, void* obj, long long futId, int typ, int opId);
+
+    int IGNITE_CALL IgniteAffinityPartitions(gcj::JniContext* ctx, void* obj);
+
+    void* IGNITE_CALL IgniteCacheWithSkipStore(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteCacheWithNoRetries(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteCacheWithExpiryPolicy(gcj::JniContext* ctx, void* obj, long long create, long long update, long long access);
+    void* IGNITE_CALL IgniteCacheWithAsync(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteCacheWithKeepPortable(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteCacheClear(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteCacheRemoveAll(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteCacheOutOpQueryCursor(gcj::JniContext* ctx, void* obj, int type, long long memPtr);
+    void* IGNITE_CALL IgniteCacheOutOpContinuousQuery(gcj::JniContext* ctx, void* obj, int type, long long memPtr);
+    void* IGNITE_CALL IgniteCacheIterator(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteCacheLocalIterator(gcj::JniContext* ctx, void* obj, int peekModes);
+    void IGNITE_CALL IgniteCacheEnterLock(gcj::JniContext* ctx, void* obj, long long id);
+    void IGNITE_CALL IgniteCacheExitLock(gcj::JniContext* ctx, void* obj, long long id);
+    bool IGNITE_CALL IgniteCacheTryEnterLock(gcj::JniContext* ctx, void* obj, long long id, long long timeout);
+    void IGNITE_CALL IgniteCacheCloseLock(gcj::JniContext* ctx, void* obj, long long id);
+    void IGNITE_CALL IgniteCacheRebalance(gcj::JniContext* ctx, void* obj, long long futId);
+    int IGNITE_CALL IgniteCacheSize(gcj::JniContext* ctx, void* obj, int peekModes, bool loc);
+
+    void IGNITE_CALL IgniteCacheStoreCallbackInvoke(gcj::JniContext* ctx, void* obj, long long memPtr);
+
+    void IGNITE_CALL IgniteComputeWithNoFailover(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteComputeWithTimeout(gcj::JniContext* ctx, void* obj, long long timeout);
+    void IGNITE_CALL IgniteComputeExecuteNative(gcj::JniContext* ctx, void* obj, long long taskPtr, long long topVer);
+
+    void IGNITE_CALL IgniteContinuousQueryClose(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteContinuousQueryGetInitialQueryCursor(gcj::JniContext* ctx, void* obj);
+
+    void IGNITE_CALL IgniteDataStreamerListenTopology(gcj::JniContext* ctx, void* obj, long long ptr);
+    bool IGNITE_CALL IgniteDataStreamerAllowOverwriteGet(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteDataStreamerAllowOverwriteSet(gcj::JniContext* ctx, void* obj, bool val);
+    bool IGNITE_CALL IgniteDataStreamerSkipStoreGet(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteDataStreamerSkipStoreSet(gcj::JniContext* ctx, void* obj, bool val);
+    int IGNITE_CALL IgniteDataStreamerPerNodeBufferSizeGet(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteDataStreamerPerNodeBufferSizeSet(gcj::JniContext* ctx, void* obj, int val);
+    int IGNITE_CALL IgniteDataStreamerPerNodeParallelOperationsGet(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteDataStreamerPerNodeParallelOperationsSet(gcj::JniContext* ctx, void* obj, int val);
+
+    void* IGNITE_CALL IgniteMessagingWithAsync(gcj::JniContext* ctx, void* obj);
+
+    void* IGNITE_CALL IgniteProjectionForOthers(gcj::JniContext* ctx, void* obj, void* prj);
+    void* IGNITE_CALL IgniteProjectionForRemotes(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProjectionForDaemons(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProjectionForRandom(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProjectionForOldest(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProjectionForYoungest(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteProjectionResetMetrics(gcj::JniContext* ctx, void* obj);
+    void* IGNITE_CALL IgniteProjectionOutOpRet(gcj::JniContext* ctx, void* obj, int type, long long memPtr);
+
+    void IGNITE_CALL IgniteQueryCursorIterator(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteQueryCursorClose(gcj::JniContext* ctx, void* obj);
+
+    long long IGNITE_CALL IgniteTransactionsStart(gcj::JniContext* ctx, void* obj, int concurrency, int isolation, long long timeout, int txSize);
+    int IGNITE_CALL IgniteTransactionsCommit(gcj::JniContext* ctx, void* obj, long long id);
+    void IGNITE_CALL IgniteTransactionsCommitAsync(gcj::JniContext* ctx, void* obj, long long id, long long futId);
+    int IGNITE_CALL IgniteTransactionsRollback(gcj::JniContext* ctx, void* obj, long long id);
+    void IGNITE_CALL IgniteTransactionsRollbackAsync(gcj::JniContext* ctx, void* obj, long long id, long long futId);
+    int IGNITE_CALL IgniteTransactionsClose(gcj::JniContext* ctx, void* obj, long long id);
+    int IGNITE_CALL IgniteTransactionsState(gcj::JniContext* ctx, void* obj, long long id);
+    bool IGNITE_CALL IgniteTransactionsSetRollbackOnly(gcj::JniContext* ctx, void* obj, long long id);
+    void IGNITE_CALL IgniteTransactionsResetMetrics(gcj::JniContext* ctx, void* obj);
+
+    void* IGNITE_CALL IgniteAcquire(gcj::JniContext* ctx, void* obj);
+    void IGNITE_CALL IgniteRelease(void* obj);
+
+    void IGNITE_CALL IgniteThrowToJava(gcj::JniContext* ctx, char* errMsg);
+    
+    int IGNITE_CALL IgniteHandlersSize();
+
+    void* IGNITE_CALL IgniteCreateContext(char** opts, int optsLen, gcj::JniHandlers* cbs);
+    void IGNITE_CALL IgniteDeleteContext(gcj::JniContext* ctx);
+
+    void IGNITE_CALL IgniteDestroyJvm(gcj::JniContext* ctx);
+
+    void* IGNITE_CALL IgniteEventsWithAsync(gcj::JniContext* ctx, void* obj);
+    bool IGNITE_CALL IgniteEventsStopLocalListen(gcj::JniContext* ctx, void* obj, long long hnd);
+    void IGNITE_CALL IgniteEventsLocalListen(gcj::JniContext* ctx, void* obj, long long hnd, int type);
+    bool IGNITE_CALL IgniteEventsIsEnabled(gcj::JniContext* ctx, void* obj, int type);
+        
+	void* IGNITE_CALL IgniteServicesWithAsync(gcj::JniContext* ctx, void* obj);
+	void* IGNITE_CALL IgniteServicesWithServerKeepPortable(gcj::JniContext* ctx, void* obj);
+	void IGNITE_CALL IgniteServicesCancel(gcj::JniContext* ctx, void* obj, char* name);
+	void IGNITE_CALL IgniteServicesCancelAll(gcj::JniContext* ctx, void* obj);
+	void* IGNITE_CALL IgniteServicesGetServiceProxy(gcj::JniContext* ctx, void* obj, char* name, bool sticky);
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/include/ignite/common/java.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/include/ignite/common/java.h b/modules/platform/src/main/cpp/common/include/ignite/common/java.h
new file mode 100644
index 0000000..426ac68
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/include/ignite/common/java.h
@@ -0,0 +1,652 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_COMMON_JVM
+#define _IGNITE_COMMON_JVM
+
+#include <jni.h>
+
+#include "ignite/common/common.h"
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace java
+        {
+            /* Error constants. */
+            const int IGNITE_JNI_ERR_SUCCESS = 0;
+            const int IGNITE_JNI_ERR_GENERIC = 1;
+            const int IGNITE_JNI_ERR_JVM_INIT = 2;
+            const int IGNITE_JNI_ERR_JVM_ATTACH = 3;
+
+            /* Handlers for callbacks from Java. */
+            typedef long long(JNICALL *CacheStoreCreateHandler)(void* target, long long memPtr);
+            typedef int(JNICALL *CacheStoreInvokeHandler)(void* target, long long objPtr, long long memPtr, void* cb);
+            typedef void(JNICALL *CacheStoreDestroyHandler)(void* target, long long objPtr);
+            typedef long long(JNICALL *CacheStoreSessionCreateHandler)(void* target, long long storePtr);
+
+            typedef long long(JNICALL *CacheEntryFilterCreateHandler)(void* target, long long memPtr);
+            typedef int(JNICALL *CacheEntryFilterApplyHandler)(void* target, long long ptr, long long memPtr);
+            typedef void(JNICALL *CacheEntryFilterDestroyHandler)(void* target, long long ptr);
+
+            typedef void(JNICALL *CacheInvokeHandler)(void* target, long long inMemPtr, long long outMemPtr);
+
+            typedef void(JNICALL *ComputeTaskMapHandler)(void* target, long long taskPtr, long long inMemPtr, long long outMemPtr);
+            typedef int(JNICALL *ComputeTaskJobResultHandler)(void* target, long long taskPtr, long long jobPtr, long long memPtr);
+            typedef void(JNICALL *ComputeTaskReduceHandler)(void* target, long long taskPtr);
+            typedef void(JNICALL *ComputeTaskCompleteHandler)(void* target, long long taskPtr, long long memPtr);
+            typedef int(JNICALL *ComputeJobSerializeHandler)(void* target, long long jobPtr, long long memPtr);
+            typedef long long(JNICALL *ComputeJobCreateHandler)(void* target, long long memPtr);
+            typedef void(JNICALL *ComputeJobExecuteHandler)(void* target, long long jobPtr, int cancel, long long memPtr);
+            typedef void(JNICALL *ComputeJobCancelHandler)(void* target, long long jobPtr);
+            typedef void(JNICALL *ComputeJobDestroyHandler)(void* target, long long jobPtr);
+
+            typedef void(JNICALL *ContinuousQueryListenerApplyHandler)(void* target, long long lsnrPtr, long long memPtr);
+            typedef long long(JNICALL *ContinuousQueryFilterCreateHandler)(void* target, long long memPtr);
+            typedef int(JNICALL *ContinuousQueryFilterApplyHandler)(void* target, long long filterPtr, long long memPtr);
+            typedef void(JNICALL *ContinuousQueryFilterReleaseHandler)(void* target, long long filterPtr);
+
+			typedef void(JNICALL *DataStreamerTopologyUpdateHandler)(void* target, long long ldrPtr, long long topVer, int topSize);
+			typedef void(JNICALL *DataStreamerStreamReceiverInvokeHandler)(void* target, long long ptr, void* cache, long long memPtr, unsigned char keepPortable);
+
+            typedef void(JNICALL *FutureByteResultHandler)(void* target, long long futAddr, int res);
+            typedef void(JNICALL *FutureBoolResultHandler)(void* target, long long futAddr, int res);
+            typedef void(JNICALL *FutureShortResultHandler)(void* target, long long futAddr, int res);
+            typedef void(JNICALL *FutureCharResultHandler)(void* target, long long futAddr, int res);
+            typedef void(JNICALL *FutureIntResultHandler)(void* target, long long futAddr, int res);
+            typedef void(JNICALL *FutureFloatResultHandler)(void* target, long long futAddr, float res);
+            typedef void(JNICALL *FutureLongResultHandler)(void* target, long long futAddr, long long res);
+            typedef void(JNICALL *FutureDoubleResultHandler)(void* target, long long futAddr, double res);
+            typedef void(JNICALL *FutureObjectResultHandler)(void* target, long long futAddr, long long memPtr);
+            typedef void(JNICALL *FutureNullResultHandler)(void* target, long long futAddr);
+            typedef void(JNICALL *FutureErrorHandler)(void* target, long long futAddr, long long memPtr);
+
+            typedef void(JNICALL *LifecycleEventHandler)(void* target, long long ptr, int evt);
+
+            typedef void(JNICALL *MemoryReallocateHandler)(void* target, long long memPtr, int cap);
+
+            typedef long long(JNICALL *MessagingFilterCreateHandler)(void* target, long long memPtr);
+            typedef int(JNICALL *MessagingFilterApplyHandler)(void* target, long long ptr, long long memPtr);
+            typedef void(JNICALL *MessagingFilterDestroyHandler)(void* target, long long ptr);
+
+            typedef long long(JNICALL *EventFilterCreateHandler)(void* target, long long memPtr);
+            typedef int(JNICALL *EventFilterApplyHandler)(void* target, long long ptr, long long memPtr);
+            typedef void(JNICALL *EventFilterDestroyHandler)(void* target, long long ptr);
+
+			typedef long long(JNICALL *ServiceInitHandler)(void* target, long long memPtr);
+			typedef void(JNICALL *ServiceExecuteHandler)(void* target, long long svcPtr, long long memPtr);
+			typedef void(JNICALL *ServiceCancelHandler)(void* target, long long svcPtr, long long memPtr);
+			typedef void(JNICALL *ServiceInvokeMethodHandler)(void* target, long long svcPtr, long long inMemPtr, long long outMemPtr);
+			typedef int(JNICALL *ClusterNodeFilterApplyHandler)(void* target, long long memPtr);
+
+            typedef long long(JNICALL *NodeInfoHandler)(void* target, long long memPtr);
+
+            typedef void(JNICALL *OnStartHandler)(void* target, long long memPtr);
+            typedef void(JNICALL *OnStopHandler)(void* target);
+            typedef void(JNICALL *ErrorHandler)(void* target, int errCode, const char* errClsChars, int errClsCharsLen, const char* errMsgChars, int errMsgCharsLen, void* errData, int errDataLen);
+
+            typedef long long(JNICALL *ExtensionCallbackInLongOutLongHandler)(void* target, int typ, long long arg1);
+            typedef long long(JNICALL *ExtensionCallbackInLongLongOutLongHandler)(void* target, int typ, long long arg1, long long arg2);
+
+            /**
+             * JNI handlers holder.
+             */
+            struct JniHandlers {
+                void* target;
+
+                CacheStoreCreateHandler cacheStoreCreate;
+                CacheStoreInvokeHandler cacheStoreInvoke;
+                CacheStoreDestroyHandler cacheStoreDestroy;
+                CacheStoreSessionCreateHandler cacheStoreSessionCreate;
+
+                CacheEntryFilterCreateHandler cacheEntryFilterCreate;
+                CacheEntryFilterApplyHandler cacheEntryFilterApply;
+                CacheEntryFilterDestroyHandler cacheEntryFilterDestroy;
+
+                CacheInvokeHandler cacheInvoke;
+
+                ComputeTaskMapHandler computeTaskMap;
+                ComputeTaskJobResultHandler computeTaskJobRes;
+                ComputeTaskReduceHandler computeTaskReduce;
+                ComputeTaskCompleteHandler computeTaskComplete;
+                ComputeJobSerializeHandler computeJobSerialize;
+                ComputeJobCreateHandler computeJobCreate;
+                ComputeJobExecuteHandler computeJobExec;
+                ComputeJobCancelHandler computeJobCancel;
+                ComputeJobDestroyHandler computeJobDestroy;
+
+                ContinuousQueryListenerApplyHandler contQryLsnrApply;
+                ContinuousQueryFilterCreateHandler contQryFilterCreate;
+                ContinuousQueryFilterApplyHandler contQryFilterApply;
+                ContinuousQueryFilterReleaseHandler contQryFilterRelease;
+
+				DataStreamerTopologyUpdateHandler dataStreamerTopologyUpdate;
+				DataStreamerStreamReceiverInvokeHandler streamReceiverInvoke;
+
+                FutureByteResultHandler futByteRes;
+                FutureBoolResultHandler futBoolRes;
+                FutureShortResultHandler futShortRes;
+                FutureCharResultHandler futCharRes;
+                FutureIntResultHandler futIntRes;
+                FutureFloatResultHandler futFloatRes;
+                FutureLongResultHandler futLongRes;
+                FutureDoubleResultHandler futDoubleRes;
+                FutureObjectResultHandler futObjRes;
+                FutureNullResultHandler futNullRes;
+                FutureErrorHandler futErr;
+
+                LifecycleEventHandler lifecycleEvt;
+
+                MemoryReallocateHandler memRealloc;
+
+                MessagingFilterCreateHandler messagingFilterCreate;
+                MessagingFilterApplyHandler messagingFilterApply;
+                MessagingFilterDestroyHandler messagingFilterDestroy;
+                
+                EventFilterCreateHandler eventFilterCreate;
+                EventFilterApplyHandler eventFilterApply;
+                EventFilterDestroyHandler eventFilterDestroy;
+
+				ServiceInitHandler serviceInit;
+				ServiceExecuteHandler serviceExecute;
+				ServiceCancelHandler serviceCancel;
+				ServiceInvokeMethodHandler serviceInvokeMethod;
+				
+				ClusterNodeFilterApplyHandler clusterNodeFilterApply;
+
+                NodeInfoHandler nodeInfo;
+
+                OnStartHandler onStart;
+                OnStopHandler onStop;
+                ErrorHandler error;
+
+                ExtensionCallbackInLongOutLongHandler extensionCallbackInLongOutLong;
+                ExtensionCallbackInLongLongOutLongHandler extensionCallbackInLongLongOutLong;
+            };
+
+            /**
+             * JNI Java members.
+             */
+            struct JniJavaMembers {
+                jclass c_Class;
+                jmethodID m_Class_getName;
+
+                jclass c_Throwable;
+                jmethodID m_Throwable_getMessage;
+                jmethodID m_Throwable_printStackTrace;
+
+                /**
+                 * Constructor.
+                 */
+                void Initialize(JNIEnv* env);
+
+                /**
+                 * Destroy members releasing all allocated classes.
+                 */
+                void Destroy(JNIEnv* env);
+
+                /**
+                 * Write error information.
+                 */
+                bool WriteErrorInfo(JNIEnv* env, char** errClsName, int* errClsNameLen, char** errMsg, int* errMsgLen);
+            };
+
+            /**
+             * JNI members.
+             */
+            struct JniMembers {
+                jclass c_PlatformAbstractQryCursor;
+                jmethodID m_PlatformAbstractQryCursor_iter;
+                jmethodID m_PlatformAbstractQryCursor_iterHasNext;
+                jmethodID m_PlatformAbstractQryCursor_close;
+
+                jclass c_PlatformAffinity;
+                jmethodID m_PlatformAffinity_partitions;
+
+                jclass c_PlatformCache;
+                jmethodID m_PlatformCache_withSkipStore;
+                jmethodID m_PlatformCache_withNoRetries;
+                jmethodID m_PlatformCache_withExpiryPolicy;
+                jmethodID m_PlatformCache_withAsync;
+                jmethodID m_PlatformCache_withKeepPortable;
+                jmethodID m_PlatformCache_clear;
+                jmethodID m_PlatformCache_removeAll;
+                jmethodID m_PlatformCache_iterator;
+                jmethodID m_PlatformCache_localIterator;
+                jmethodID m_PlatformCache_enterLock;
+                jmethodID m_PlatformCache_exitLock;
+                jmethodID m_PlatformCache_tryEnterLock;
+                jmethodID m_PlatformCache_closeLock;
+                jmethodID m_PlatformCache_rebalance;
+                jmethodID m_PlatformCache_size;
+
+                jclass c_PlatformCacheStoreCallback;
+                jmethodID m_PlatformCacheStoreCallback_invoke;
+
+                jclass c_IgniteException;
+
+                jclass c_PlatformClusterGroup;
+                jmethodID m_PlatformClusterGroup_forOthers;
+                jmethodID m_PlatformClusterGroup_forRemotes;
+                jmethodID m_PlatformClusterGroup_forDaemons;
+                jmethodID m_PlatformClusterGroup_forRandom;
+                jmethodID m_PlatformClusterGroup_forOldest;
+                jmethodID m_PlatformClusterGroup_forYoungest;
+                jmethodID m_PlatformClusterGroup_resetMetrics;
+
+                jclass c_PlatformCompute;
+                jmethodID m_PlatformCompute_withNoFailover;
+                jmethodID m_PlatformCompute_withTimeout;
+                jmethodID m_PlatformCompute_executeNative;
+
+                jclass c_PlatformContinuousQuery;
+                jmethodID m_PlatformContinuousQuery_close;
+                jmethodID m_PlatformContinuousQuery_getInitialQueryCursor;
+
+                jclass c_PlatformDataStreamer;
+                jmethodID m_PlatformDataStreamer_listenTopology;
+                jmethodID m_PlatformDataStreamer_getAllowOverwrite;
+                jmethodID m_PlatformDataStreamer_setAllowOverwrite;
+                jmethodID m_PlatformDataStreamer_getSkipStore;
+                jmethodID m_PlatformDataStreamer_setSkipStore;
+                jmethodID m_PlatformDataStreamer_getPerNodeBufSize;
+                jmethodID m_PlatformDataStreamer_setPerNodeBufSize;
+                jmethodID m_PlatformDataStreamer_getPerNodeParallelOps;
+                jmethodID m_PlatformDataStreamer_setPerNodeParallelOps;
+                
+                jclass c_PlatformEvents;
+                jmethodID m_PlatformEvents_withAsync;
+                jmethodID m_PlatformEvents_stopLocalListen;
+                jmethodID m_PlatformEvents_localListen;
+                jmethodID m_PlatformEvents_isEnabled;
+                
+				jclass c_PlatformServices;
+				jmethodID m_PlatformServices_withAsync;
+				jmethodID m_PlatformServices_withServerKeepPortable;
+				jmethodID m_PlatformServices_cancel;
+				jmethodID m_PlatformServices_cancelAll;
+				jmethodID m_PlatformServices_serviceProxy;
+
+				jclass c_PlatformIgnition;
+                jmethodID m_PlatformIgnition_start;
+                jmethodID m_PlatformIgnition_instance;
+                jmethodID m_PlatformIgnition_environmentPointer;
+                jmethodID m_PlatformIgnition_stop;
+                jmethodID m_PlatformIgnition_stopAll;
+
+                jclass c_PlatformMessaging;
+                jmethodID m_PlatformMessaging_withAsync;
+
+                jclass c_PlatformProcessor;
+                jmethodID m_PlatformProcessor_releaseStart;
+                jmethodID m_PlatformProcessor_cache;
+                jmethodID m_PlatformProcessor_createCache;
+                jmethodID m_PlatformProcessor_getOrCreateCache;
+                jmethodID m_PlatformProcessor_affinity;
+                jmethodID m_PlatformProcessor_dataStreamer;
+                jmethodID m_PlatformProcessor_transactions;
+                jmethodID m_PlatformProcessor_projection;
+                jmethodID m_PlatformProcessor_compute;
+                jmethodID m_PlatformProcessor_message;
+                jmethodID m_PlatformProcessor_events;
+                jmethodID m_PlatformProcessor_services;
+                jmethodID m_PlatformProcessor_extensions;
+
+                jclass c_PlatformTarget;
+                jmethodID m_PlatformTarget_inStreamOutLong;
+                jmethodID m_PlatformTarget_inStreamOutObject;
+                jmethodID m_PlatformTarget_outLong;
+                jmethodID m_PlatformTarget_outStream;
+                jmethodID m_PlatformTarget_outObject;
+                jmethodID m_PlatformTarget_inStreamOutStream;
+                jmethodID m_PlatformTarget_inObjectStreamOutStream;
+                jmethodID m_PlatformTarget_listenFuture;
+                jmethodID m_PlatformTarget_listenFutureForOperation;
+
+                jclass c_PlatformTransactions;
+                jmethodID m_PlatformTransactions_txStart;
+                jmethodID m_PlatformTransactions_txCommit;
+                jmethodID m_PlatformTransactions_txCommitAsync;
+                jmethodID m_PlatformTransactions_txRollback;
+                jmethodID m_PlatformTransactions_txRollbackAsync;
+                jmethodID m_PlatformTransactions_txState;
+                jmethodID m_PlatformTransactions_txSetRollbackOnly;
+                jmethodID m_PlatformTransactions_txClose;
+                jmethodID m_PlatformTransactions_resetMetrics;
+
+                jclass c_PlatformUtils;
+                jmethodID m_PlatformUtils_reallocate;
+                jmethodID m_PlatformUtils_errData;
+
+                /**
+                 * Constructor.
+                 */
+                void Initialize(JNIEnv* env);
+
+                /**
+                 * Destroy members releasing all allocated classes.
+                 */
+                void Destroy(JNIEnv* env);
+            };
+
+            /**
+             * JNI JVM wrapper.
+             */
+            class IGNITE_IMPORT_EXPORT JniJvm {
+            public:
+                /**
+                 * Default constructor for uninitialized JVM.
+                 */
+                JniJvm();
+
+                /**
+                 * Constructor.
+                 *
+                 * @param jvm JVM.
+                 * @param javaMembers Java members.
+                 * @param members Members.
+                 */
+                JniJvm(JavaVM* jvm, JniJavaMembers javaMembers, JniMembers members);
+
+                /**
+                 * Get JVM.
+                 *
+                 * @param JVM.
+                 */
+                JavaVM* GetJvm();
+
+                /**
+                 * Get Java members.
+                 *
+                 * @param Java members.
+                 */
+                JniJavaMembers& GetJavaMembers();
+
+                /**
+                 * Get members.
+                 *
+                 * @param Members.
+                 */
+                JniMembers& GetMembers();
+            private:
+                /** JVM. */
+                JavaVM* jvm;
+
+                /** Java members. */
+                JniJavaMembers javaMembers;
+
+                /** Members. */
+                JniMembers members;
+            };
+
+            /**
+             * JNI error information.
+             */
+            struct IGNITE_IMPORT_EXPORT JniErrorInfo
+            {
+                int code;
+                char* errCls;
+                char* errMsg;
+
+                /**
+                 * Default constructor. Creates empty error info.
+                 */
+                JniErrorInfo();
+
+                /**
+                 * Constructor.
+                 *
+                 * @param code Code.
+                 * @param errCls Error class.
+                 * @param errMsg Error message.
+                 */
+                JniErrorInfo(int code, const char* errCls, const char* errMsg);
+
+                /**
+                 * Copy constructor.
+                 *
+                 * @param other Other instance.
+                 */
+                JniErrorInfo(const JniErrorInfo& other);
+
+                /**
+                 * Assignment operator overload.
+                 *
+                 * @param other Other instance.
+                 * @return This instance.
+                 */
+                JniErrorInfo& operator=(const JniErrorInfo& other);
+
+                /**
+                 * Destructor.
+                 */
+                ~JniErrorInfo();
+            };
+
+            /**
+             * Unmanaged context.
+             */
+            class IGNITE_IMPORT_EXPORT JniContext {
+            public:
+                static JniContext* Create(char** opts, int optsLen, JniHandlers hnds);
+                static JniContext* Create(char** opts, int optsLen, JniHandlers hnds, JniErrorInfo* errInfo);
+                static int Reallocate(long long memPtr, int cap);
+                static void Detach();
+                static void Release(jobject obj);
+
+                jobject IgnitionStart(char* cfgPath, char* gridName, int factoryId, long long dataPtr);
+                jobject IgnitionStart(char* cfgPath, char* gridName, int factoryId, long long dataPtr, JniErrorInfo* errInfo);
+                jobject IgnitionInstance(char* gridName);
+                jobject IgnitionInstance(char* gridName, JniErrorInfo* errInfo);
+                long long IgnitionEnvironmentPointer(char* gridName);
+                long long IgnitionEnvironmentPointer(char* gridName, JniErrorInfo* errInfo);
+                bool IgnitionStop(char* gridName, bool cancel);
+                bool IgnitionStop(char* gridName, bool cancel, JniErrorInfo* errInfo);
+                void IgnitionStopAll(bool cancel);
+                void IgnitionStopAll(bool cancel, JniErrorInfo* errInfo);
+                
+                void ProcessorReleaseStart(jobject obj);
+                jobject ProcessorProjection(jobject obj);
+                jobject ProcessorCache(jobject obj, const char* name);
+                jobject ProcessorCache(jobject obj, const char* name, JniErrorInfo* errInfo);
+                jobject ProcessorCreateCache(jobject obj, const char* name);
+                jobject ProcessorCreateCache(jobject obj, const char* name, JniErrorInfo* errInfo);
+                jobject ProcessorGetOrCreateCache(jobject obj, const char* name);
+                jobject ProcessorGetOrCreateCache(jobject obj, const char* name, JniErrorInfo* errInfo);
+                jobject ProcessorAffinity(jobject obj, const char* name);
+                jobject ProcessorDataStreamer(jobject obj, const char* name, bool keepPortable);
+                jobject ProcessorTransactions(jobject obj);
+                jobject ProcessorCompute(jobject obj, jobject prj);
+                jobject ProcessorMessage(jobject obj, jobject prj);
+                jobject ProcessorEvents(jobject obj, jobject prj);
+                jobject ProcessorServices(jobject obj, jobject prj);
+                jobject ProcessorExtensions(jobject obj);
+                
+                long long TargetInStreamOutLong(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL);
+                void TargetInStreamOutStream(jobject obj, int opType, long long inMemPtr, long long outMemPtr, JniErrorInfo* errInfo = NULL);
+                jobject TargetInStreamOutObject(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL);
+                void TargetInObjectStreamOutStream(jobject obj, int opType, void* arg, long long inMemPtr, long long outMemPtr, JniErrorInfo* errInfo = NULL);
+                long long TargetOutLong(jobject obj, int opType, JniErrorInfo* errInfo = NULL);
+                void TargetOutStream(jobject obj, int opType, long long memPtr, JniErrorInfo* errInfo = NULL);
+                jobject TargetOutObject(jobject obj, int opType, JniErrorInfo* errInfo = NULL);
+                void TargetListenFuture(jobject obj, long long futId, int typ);
+                void TargetListenFutureForOperation(jobject obj, long long futId, int typ, int opId);
+                
+                int AffinityPartitions(jobject obj);
+
+                jobject CacheWithSkipStore(jobject obj);
+                jobject CacheWithNoRetries(jobject obj);
+                jobject CacheWithExpiryPolicy(jobject obj, long long create, long long update, long long access);
+                jobject CacheWithAsync(jobject obj);
+                jobject CacheWithKeepPortable(jobject obj);
+                void CacheClear(jobject obj, JniErrorInfo* errInfo = NULL);
+                void CacheRemoveAll(jobject obj, JniErrorInfo* errInfo = NULL);
+                jobject CacheOutOpQueryCursor(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL);
+                jobject CacheOutOpContinuousQuery(jobject obj, int type, long long memPtr);
+                jobject CacheIterator(jobject obj);
+                jobject CacheLocalIterator(jobject obj, int peekModes);
+                void CacheEnterLock(jobject obj, long long id);
+                void CacheExitLock(jobject obj, long long id);
+                bool CacheTryEnterLock(jobject obj, long long id, long long timeout);
+                void CacheCloseLock(jobject obj, long long id);
+                void CacheRebalance(jobject obj, long long futId);
+                int CacheSize(jobject obj, int peekModes, bool loc, JniErrorInfo* errInfo = NULL);
+
+                void CacheStoreCallbackInvoke(jobject obj, long long memPtr);
+
+                void ComputeWithNoFailover(jobject obj);
+                void ComputeWithTimeout(jobject obj, long long timeout);
+                void ComputeExecuteNative(jobject obj, long long taskPtr, long long topVer);
+
+                void ContinuousQueryClose(jobject obj);
+                void* ContinuousQueryGetInitialQueryCursor(jobject obj);
+
+                void DataStreamerListenTopology(jobject obj, long long ptr);
+                bool DataStreamerAllowOverwriteGet(jobject obj);
+                void DataStreamerAllowOverwriteSet(jobject obj, bool val);
+                bool DataStreamerSkipStoreGet(jobject obj);
+                void DataStreamerSkipStoreSet(jobject obj, bool val);
+                int DataStreamerPerNodeBufferSizeGet(jobject obj);
+                void DataStreamerPerNodeBufferSizeSet(jobject obj, int val);
+                int DataStreamerPerNodeParallelOperationsGet(jobject obj);
+                void DataStreamerPerNodeParallelOperationsSet(jobject obj, int val);
+
+                jobject MessagingWithAsync(jobject obj);
+
+                jobject ProjectionForOthers(jobject obj, jobject prj);
+                jobject ProjectionForRemotes(jobject obj);
+                jobject ProjectionForDaemons(jobject obj);
+                jobject ProjectionForRandom(jobject obj);
+                jobject ProjectionForOldest(jobject obj);
+                jobject ProjectionForYoungest(jobject obj);
+                void ProjectionResetMetrics(jobject obj);
+                jobject ProjectionOutOpRet(jobject obj, int type, long long memPtr);
+
+                void QueryCursorIterator(jobject obj, JniErrorInfo* errInfo = NULL);
+                bool QueryCursorIteratorHasNext(jobject obj, JniErrorInfo* errInfo = NULL);
+                void QueryCursorClose(jobject obj, JniErrorInfo* errInfo = NULL);
+
+                long long TransactionsStart(jobject obj, int concurrency, int isolation, long long timeout, int txSize);
+                int TransactionsCommit(jobject obj, long long id);
+                void TransactionsCommitAsync(jobject obj, long long id, long long futId);
+                int TransactionsRollback(jobject obj, long long id);
+                void TransactionsRollbackAsync(jobject obj, long long id, long long futId);
+                int TransactionsClose(jobject obj, long long id);
+                int TransactionsState(jobject obj, long long id);
+                bool TransactionsSetRollbackOnly(jobject obj, long long id);
+                void TransactionsResetMetrics(jobject obj);
+
+                jobject EventsWithAsync(jobject obj);
+                bool EventsStopLocalListen(jobject obj, long long hnd);
+                void EventsLocalListen(jobject obj, long long hnd, int type);
+                bool EventsIsEnabled(jobject obj, int type);
+                
+				jobject ServicesWithAsync(jobject obj);
+                jobject ServicesWithServerKeepPortable(jobject obj);
+				void ServicesCancel(jobject obj, char* name);
+				void ServicesCancelAll(jobject obj);
+				void* ServicesGetServiceProxy(jobject obj, char* name, bool sticky);
+
+                jobject Acquire(jobject obj);
+
+                void DestroyJvm();
+                void ThrowToJava(char* errMsg);
+            private:
+                JniJvm* jvm;
+                JniHandlers hnds;
+
+                JniContext(JniJvm* jvm, JniHandlers hnds);
+
+                JNIEnv* Attach();
+                void ExceptionCheck(JNIEnv* env);
+                void ExceptionCheck(JNIEnv* env, JniErrorInfo* errInfo);
+                jobject LocalToGlobal(JNIEnv* env, jobject obj);
+                jobject ProcessorCache0(jobject proc, const char* name, jmethodID mthd, JniErrorInfo* errInfo);
+            };
+
+            JNIEXPORT jlong JNICALL JniCacheStoreCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT jint JNICALL JniCacheStoreInvoke(JNIEnv *env, jclass cls, jlong envPtr, jlong objPtr, jlong memPtr, jobject cb);
+            JNIEXPORT void JNICALL JniCacheStoreDestroy(JNIEnv *env, jclass cls, jlong envPtr, jlong objPtr);
+            JNIEXPORT jlong JNICALL JniCacheStoreSessionCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong storePtr);
+
+            JNIEXPORT jlong JNICALL JniCacheEntryFilterCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT jint JNICALL JniCacheEntryFilterApply(JNIEnv *env, jclass cls, jlong envPtr, jlong objPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniCacheEntryFilterDestroy(JNIEnv *env, jclass cls, jlong envPtr, jlong objPtr);
+
+            JNIEXPORT void JNICALL JniCacheInvoke(JNIEnv *env, jclass cls, jlong envPtr, jlong inMemPtr, jlong outMemPtr);
+
+            JNIEXPORT void JNICALL JniComputeTaskMap(JNIEnv *env, jclass cls, jlong envPtr, jlong taskPtr, jlong inMemPtr, jlong outMemPtr);
+            JNIEXPORT jint JNICALL JniComputeTaskJobResult(JNIEnv *env, jclass cls, jlong envPtr, jlong taskPtr, jlong jobPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniComputeTaskReduce(JNIEnv *env, jclass cls, jlong envPtr, jlong taskPtr);
+            JNIEXPORT void JNICALL JniComputeTaskComplete(JNIEnv *env, jclass cls, jlong envPtr, jlong taskPtr, jlong memPtr);
+            JNIEXPORT jint JNICALL JniComputeJobSerialize(JNIEnv *env, jclass cls, jlong envPtr, jlong jobPtr, jlong memPtr);
+            JNIEXPORT jlong JNICALL JniComputeJobCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniComputeJobExecute(JNIEnv *env, jclass cls, jlong envPtr, jlong jobPtr, jint cancel, jlong memPtr);
+            JNIEXPORT void JNICALL JniComputeJobCancel(JNIEnv *env, jclass cls, jlong envPtr, jlong jobPtr);
+            JNIEXPORT void JNICALL JniComputeJobDestroy(JNIEnv *env, jclass cls, jlong envPtr, jlong jobPtr);
+
+            JNIEXPORT void JNICALL JniContinuousQueryListenerApply(JNIEnv *env, jclass cls, jlong envPtr, jlong cbPtr, jlong memPtr);
+            JNIEXPORT jlong JNICALL JniContinuousQueryFilterCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT jint JNICALL JniContinuousQueryFilterApply(JNIEnv *env, jclass cls, jlong envPtr, jlong filterPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniContinuousQueryFilterRelease(JNIEnv *env, jclass cls, jlong envPtr, jlong filterPtr);
+
+			JNIEXPORT void JNICALL JniDataStreamerTopologyUpdate(JNIEnv *env, jclass cls, jlong envPtr, jlong ldrPtr, jlong topVer, jint topSize);
+			JNIEXPORT void JNICALL JniDataStreamerStreamReceiverInvoke(JNIEnv *env, jclass cls, jlong envPtr, jlong ptr, jobject cache, jlong memPtr, jboolean keepPortable);
+
+            JNIEXPORT void JNICALL JniFutureByteResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jint res);
+            JNIEXPORT void JNICALL JniFutureBoolResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jint res);
+            JNIEXPORT void JNICALL JniFutureShortResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jint res);
+            JNIEXPORT void JNICALL JniFutureCharResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jint res);
+            JNIEXPORT void JNICALL JniFutureIntResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jint res);
+            JNIEXPORT void JNICALL JniFutureFloatResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jfloat res);
+            JNIEXPORT void JNICALL JniFutureLongResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jlong res);
+            JNIEXPORT void JNICALL JniFutureDoubleResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jdouble res);
+            JNIEXPORT void JNICALL JniFutureObjectResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniFutureNullResult(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr);
+            JNIEXPORT void JNICALL JniFutureError(JNIEnv *env, jclass cls, jlong envPtr, jlong futPtr, jlong memPtr);
+
+            JNIEXPORT void JNICALL JniLifecycleEvent(JNIEnv *env, jclass cls, jlong envPtr, jlong ptr, jint evt);
+
+            JNIEXPORT void JNICALL JniMemoryReallocate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr, jint cap);
+
+            JNIEXPORT jlong JNICALL JniMessagingFilterCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT jint JNICALL JniMessagingFilterApply(JNIEnv *env, jclass cls, jlong envPtr, jlong ptr, jlong memPtr);
+            JNIEXPORT void JNICALL JniMessagingFilterDestroy(JNIEnv *env, jclass cls, jlong envPtr, jlong ptr);
+            
+            JNIEXPORT jlong JNICALL JniEventFilterCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT jint JNICALL JniEventFilterApply(JNIEnv *env, jclass cls, jlong envPtr, jlong ptr, jlong memPtr);
+            JNIEXPORT void JNICALL JniEventFilterDestroy(JNIEnv *env, jclass cls, jlong envPtr, jlong ptr);
+
+			JNIEXPORT jlong JNICALL JniServiceInit(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+			JNIEXPORT void JNICALL JniServiceExecute(JNIEnv *env, jclass cls, jlong envPtr, jlong svcPtr, jlong memPtr);
+			JNIEXPORT void JNICALL JniServiceCancel(JNIEnv *env, jclass cls, jlong envPtr, jlong svcPtr, jlong memPtr);
+			JNIEXPORT void JNICALL JniServiceInvokeMethod(JNIEnv *env, jclass cls, jlong envPtr, jlong svcPtr, jlong inMemPtr, jlong outMemPtr);
+			JNIEXPORT jint JNICALL JniClusterNodeFilterApply(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+
+            JNIEXPORT jlong JNICALL JniNodeInfo(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+
+            JNIEXPORT void JNICALL JniOnStart(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniOnStop(JNIEnv *env, jclass cls, jlong envPtr);
+
+            JNIEXPORT jlong JNICALL JniExtensionCallbackInLongOutLong(JNIEnv *env, jclass cls, jlong envPtr, jint typ, jlong arg1);
+            JNIEXPORT jlong JNICALL JniExtensionCallbackInLongLongOutLong(JNIEnv *env, jclass cls, jlong envPtr, jint typ, jlong arg1, jlong arg2);
+        }
+    }
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/linux/include/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/linux/include/Makefile.am b/modules/platform/src/main/cpp/common/os/linux/include/Makefile.am
new file mode 100644
index 0000000..68e45e6
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/linux/include/Makefile.am
@@ -0,0 +1,21 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+nobase_include_HEADERS = ignite/common/common.h \
+                         ignite/common/concurrent_os.h

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/common.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/common.h b/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/common.h
new file mode 100644
index 0000000..6577ad8
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/common.h
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_COMMON_OS
+#define _IGNITE_COMMON_OS
+
+#ifndef __has_attribute
+  #define __has_attribute(x) 0
+#endif
+
+#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
+  #define IGNITE_EXPORT __attribute__((visibility("default")))
+  #define IGNITE_IMPORT __attribute__((visibility("default")))
+#else
+  #define IGNITE_EXPORT
+  #define IGNITE_IMPORT
+#endif
+
+#define IGNITE_CALL
+
+#ifdef IGNITE_IMPL
+    #define IGNITE_IMPORT_EXPORT IGNITE_EXPORT
+#else
+    #define IGNITE_IMPORT_EXPORT IGNITE_IMPORT
+#endif
+
+/**
+ * Common construction to disable copy constructor and assignment for class.
+ */
+#define IGNITE_NO_COPY_ASSIGNMENT(cls) \
+    cls(const cls& src); \
+    cls& operator= (const cls& other);
+
+namespace ignite
+{
+    namespace common
+    {
+        /**
+         * Helper class to manage attached threads.
+         */
+        class AttachHelper 
+        {
+        public:            
+            /**
+             * Destructor.
+             */
+            ~AttachHelper();
+            
+            /**
+             * Callback invoked on successful thread attach ot JVM.
+             */
+            static void OnThreadAttach();
+        private:
+            /**
+             * Helper method to allocate attach key.
+             */
+            static void AllocateAttachKey();
+
+            /**
+             * Attach key destructor.
+             */
+            static void DestroyAttachKey(void* key);
+        };        
+    }
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/concurrent_os.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/concurrent_os.h b/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/concurrent_os.h
new file mode 100644
index 0000000..63798b1
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/linux/include/ignite/common/concurrent_os.h
@@ -0,0 +1,394 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_COMMON_CONCURRENT_OS
+#define _IGNITE_COMMON_CONCURRENT_OS
+
+#include <map>
+#include <stdint.h>
+#include <pthread.h>
+
+#include "ignite/common/common.h"
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace concurrent
+        {
+            /**
+             * Static class to manage memory visibility semantics. 
+             */
+            class IGNITE_IMPORT_EXPORT Memory {
+            public:
+                /**
+                 * Full fence. 
+                 */
+                static void Fence();
+            };
+
+            /**
+             * Critical section.
+             */
+            class IGNITE_IMPORT_EXPORT CriticalSection {
+            public:
+                /**
+                 * Constructor.
+                 */
+                CriticalSection();
+
+                /**
+                 * Destructor. 
+                 */
+                ~CriticalSection();
+
+                /**
+                 * Enter critical section.
+                 */
+                void Enter();
+
+                /**
+                 * Leave critical section.
+                 */
+                void Leave();
+            private:
+                pthread_mutex_t mux;
+                
+                IGNITE_NO_COPY_ASSIGNMENT(CriticalSection)
+            };
+
+            /**
+             * Special latch with count = 1.
+             */
+            class IGNITE_IMPORT_EXPORT SingleLatch
+            {                
+            public:
+                /**
+                 * Constructor.
+                 */
+                SingleLatch();
+
+                /**
+                 * Destructor.
+                 */
+                ~SingleLatch();
+
+                /**
+                 * Perform the countdown.
+                 */
+                void CountDown();
+
+                /**
+                 * Await the countdown.
+                 */
+                void Await();
+            private:
+                /** Mutex. */
+                pthread_mutex_t mux;
+
+                /** Condition. */
+                pthread_cond_t cond;
+
+                /** Ready flag. */
+                bool ready;
+                
+                IGNITE_NO_COPY_ASSIGNMENT(SingleLatch)
+            };
+
+            /**
+             * Primitives for atomic access.
+             */
+            class IGNITE_IMPORT_EXPORT Atomics
+            {
+            public:
+                /**
+                 * Update the 32-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return True if update occurred as a result of this call, false otherwise.
+                 */
+                static bool CompareAndSet32(int32_t* ptr, int32_t expVal, int32_t newVal);
+
+                /**
+                 * Update the 32-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return Value which were observed during CAS attempt.
+                 */
+                static int32_t CompareAndSet32Val(int32_t* ptr, int32_t expVal, int32_t newVal);
+
+                /**
+                 * Increment 32-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after increment.
+                 */
+                static int32_t IncrementAndGet32(int32_t* ptr);
+
+                /**
+                 * Decrement 32-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after decrement.
+                 */
+                static int32_t DecrementAndGet32(int32_t* ptr);
+
+                /**
+                 * Update the 64-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return True if update occurred as a result of this call, false otherwise.
+                 */
+                static bool CompareAndSet64(int64_t* ptr, int64_t expVal, int64_t newVal);
+
+                /**
+                 * Update the 64-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return Value which were observed during CAS attempt.
+                 */
+                static int64_t CompareAndSet64Val(int64_t* ptr, int64_t expVal, int64_t newVal);
+
+                /**
+                 * Increment 64-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after increment.
+                 */
+                static int64_t IncrementAndGet64(int64_t* ptr);
+
+                /**
+                 * Decrement 64-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after decrement.
+                 */
+                static int64_t DecrementAndGet64(int64_t* ptr);
+            };
+
+            /**
+             * Thread-local entry.
+             */
+            class IGNITE_IMPORT_EXPORT ThreadLocalEntry
+            {
+            public:
+                /**
+                 * Virtual destructor to allow for correct typed entries cleanup.
+                 */
+                virtual ~ThreadLocalEntry()
+                {
+                    // No-op.
+                }
+            };
+
+            /**
+             * Typed thread-local entry.
+             */
+            template<typename T>
+            class IGNITE_IMPORT_EXPORT ThreadLocalTypedEntry : public ThreadLocalEntry
+            {
+            public:
+                /**
+                 * Constructor.
+                 *
+                 * @param val Value.
+                 */
+                ThreadLocalTypedEntry(T val) : val(val)
+                {
+                    // No-op.
+                }
+
+                ~ThreadLocalTypedEntry()
+                {
+                    // No-op.
+                }
+
+                /**
+                 * Get value.
+                 *
+                 * @return Value.
+                 */
+                T Get()
+                {
+                    return val;
+                }
+            private:
+                /** Value. */
+                T val;
+            };
+
+            /**
+             * Thread-local abstraction.
+             */
+            class IGNITE_IMPORT_EXPORT ThreadLocal
+            {
+            public:
+                /**
+                 * Get next available index to be used in thread-local storage.
+                 *
+                 * @return Index.
+                 */
+                static int32_t NextIndex();
+
+                /**
+                 * Get value by index.
+                 *
+                 * @param idx Index.
+                 * @return Value associated with the index or NULL.
+                 */
+                template<typename T>
+                static T Get(int32_t idx)
+                {
+                    void* linuxVal = Get0();
+
+                    if (linuxVal)
+                    {
+                        std::map<int32_t, ThreadLocalEntry*>* map =
+                            static_cast<std::map<int32_t, ThreadLocalEntry*>*>(linuxVal);
+
+                        ThreadLocalTypedEntry<T>* entry = static_cast<ThreadLocalTypedEntry<T>*>((*map)[idx]);
+
+                        if (entry)
+                            return entry->Get();
+                    }
+
+                    return T();
+                }
+
+                /**
+                 * Set value at the given index.
+                 *
+                 * @param idx Index.
+                 * @param val Value to be associated with the index.
+                 */
+                template<typename T>
+                static void Set(int32_t idx, const T& val)
+                {
+                    void* linuxVal = Get0();
+
+                    if (linuxVal)
+                    {
+                        std::map<int32_t, ThreadLocalEntry*>* map =
+                            static_cast<std::map<int32_t, ThreadLocalEntry*>*>(linuxVal);
+
+                        ThreadLocalEntry* appVal = (*map)[idx];
+
+                        if (appVal)
+                            delete appVal;
+
+                        (*map)[idx] = new ThreadLocalTypedEntry<T>(val);
+                    }
+                    else
+                    {
+                        std::map<int32_t, ThreadLocalEntry*>* map = new std::map<int32_t, ThreadLocalEntry*>();
+
+                        Set0(map);
+
+                        (*map)[idx] = new ThreadLocalTypedEntry<T>(val);
+                    }
+                }
+
+                /**
+                 * Remove value at the given index.
+                 *
+                 * @param idx Index.
+                 */
+                static void Remove(int32_t idx);
+
+                /**
+                 * Internal thread-local map clear routine.
+                 *
+                 * @param mapPtr Pointer to map.
+                 */
+                static void Clear0(void* mapPtr);
+
+            private:
+                /**
+                 * Internal get routine.
+                 *
+                 * @param Associated value.
+                 */
+                static void* Get0();
+
+                /**
+                 * Internal set routine.
+                 *
+                 * @param ptr Pointer.
+                 */
+                static void Set0(void* ptr);
+            };
+
+            /**
+             * Thread-local instance. Simplifies API avoiding direct index allocations.
+             */
+            template<typename T>
+            class IGNITE_IMPORT_EXPORT ThreadLocalInstance
+            {
+            public:
+                /**
+                 * Constructor.
+                 */
+                ThreadLocalInstance() : idx(ThreadLocal::NextIndex())
+                {
+                    // No-op.
+                }
+
+                /**
+                 * Get value.
+                 *
+                 * @return Value.
+                 */
+                T Get()
+                {
+                    return ThreadLocal::Get<T>(idx);
+                }
+
+                /**
+                 * Set instance.
+                 *
+                 * @param val Value.
+                 */
+                void Set(const T& val)
+                {
+                    ThreadLocal::Set<T>(idx, val);
+                }
+
+                /**
+                 * Remove instance.
+                 */
+                void Remove()
+                {
+                    ThreadLocal::Remove(idx);
+                }
+
+            private:
+                /** Index. */
+                int32_t idx;
+            };
+        }
+    }
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/linux/src/common.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/linux/src/common.cpp b/modules/platform/src/main/cpp/common/os/linux/src/common.cpp
new file mode 100644
index 0000000..c0cccdc
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/linux/src/common.cpp
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <pthread.h>
+
+#include "ignite/common/common.h"
+#include "ignite/common/java.h"
+
+using namespace ignite::common::java;
+
+namespace ignite
+{
+    namespace common
+    {
+        /** Key indicating that the thread is attached. */
+        static pthread_key_t attachKey;
+
+        /** Helper to ensure that attach key is allocated only once. */
+        static pthread_once_t attachKeyInit = PTHREAD_ONCE_INIT;
+        
+        AttachHelper::~AttachHelper()
+        {
+            JniContext::Detach();
+        }
+        
+        void AttachHelper::OnThreadAttach()
+        {
+            pthread_once(&attachKeyInit, AllocateAttachKey);
+            
+            void* val = pthread_getspecific(attachKey);
+            
+            if (!val)
+                pthread_setspecific(attachKey, new AttachHelper());
+        }
+        
+        void AttachHelper::AllocateAttachKey()
+        {
+            pthread_key_create(&attachKey, DestroyAttachKey);
+        }   
+        
+        void AttachHelper::DestroyAttachKey(void* key)
+        {
+            delete reinterpret_cast<AttachHelper*>(key);
+        }             
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/linux/src/concurrent_os.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/linux/src/concurrent_os.cpp b/modules/platform/src/main/cpp/common/os/linux/src/concurrent_os.cpp
new file mode 100644
index 0000000..44f0b22
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/linux/src/concurrent_os.cpp
@@ -0,0 +1,175 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ignite/common/concurrent_os.h"
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace concurrent
+        {
+            /** Key indicating that the thread is attached. */
+            static pthread_key_t tlsKey;
+
+            /** Helper to ensure that attach key is allocated only once. */
+            static pthread_once_t tlsKeyInit = PTHREAD_ONCE_INIT;
+            
+            /**
+             * Routine to destroy TLS key.
+             * 
+             * @param key Key.
+             */
+            void DestroyTlsKey(void* key) {
+                ThreadLocal::Clear0(key);
+            }
+            
+            /**
+             * Routine to allocate TLS key.
+             */
+            void AllocateTlsKey() {
+                pthread_key_create(&tlsKey, DestroyTlsKey);
+            }
+            
+            void Memory::Fence() {
+                __asm__ volatile ("" ::: "memory");
+            }
+
+            CriticalSection::CriticalSection() {
+                pthread_mutex_init(&mux, NULL);
+                
+                Memory::Fence();
+            }
+
+            CriticalSection::~CriticalSection() {
+                Memory::Fence();
+                
+                pthread_mutex_destroy(&mux);
+            }
+
+            void CriticalSection::Enter() {
+                Memory::Fence();
+                
+                pthread_mutex_lock(&mux);
+            }
+
+            void CriticalSection::Leave() {
+                Memory::Fence();
+                
+                pthread_mutex_unlock(&mux);
+            }
+
+            SingleLatch::SingleLatch()
+            {
+                pthread_mutex_init(&mux, NULL);
+                pthread_cond_init(&cond, NULL);
+                ready = false;
+                
+                Memory::Fence();
+            }
+
+            SingleLatch::~SingleLatch()
+            {
+                Memory::Fence();
+
+                pthread_cond_destroy(&cond);
+                pthread_mutex_destroy(&mux);
+            }
+
+            void SingleLatch::CountDown()
+            {
+                pthread_mutex_lock(&mux);
+                
+                if (!ready) {
+                    ready = true;
+                    
+                    pthread_cond_broadcast(&cond);
+                }
+                
+                pthread_mutex_unlock(&mux);
+                
+                Memory::Fence();
+            }
+
+            void SingleLatch::Await()
+            {
+                pthread_mutex_lock(&mux);
+                
+                while (!ready)
+                    pthread_cond_wait(&cond, &mux);
+                
+                pthread_mutex_unlock(&mux);
+                
+                Memory::Fence();
+            }
+
+            bool Atomics::CompareAndSet32(int32_t* ptr, int32_t expVal, int32_t newVal)
+            {
+                return __sync_bool_compare_and_swap(ptr, expVal, newVal);
+            }
+
+            int32_t Atomics::CompareAndSet32Val(int32_t* ptr, int32_t expVal, int32_t newVal)
+            {
+                return __sync_val_compare_and_swap(ptr, expVal, newVal);
+            }
+
+            int32_t Atomics::IncrementAndGet32(int32_t* ptr)
+            {
+               return __sync_fetch_and_add(ptr, 1) + 1;
+            }
+
+            int32_t Atomics::DecrementAndGet32(int32_t* ptr)
+            {
+               return __sync_fetch_and_sub(ptr, 1) - 1;
+            }
+
+            bool Atomics::CompareAndSet64(int64_t* ptr, int64_t expVal, int64_t newVal)
+            {
+               return __sync_bool_compare_and_swap(ptr, expVal, newVal);
+            }
+
+            int64_t Atomics::CompareAndSet64Val(int64_t* ptr, int64_t expVal, int64_t newVal)
+            {
+               return __sync_val_compare_and_swap(ptr, expVal, newVal);
+            }
+
+            int64_t Atomics::IncrementAndGet64(int64_t* ptr)
+            {
+               return __sync_fetch_and_add(ptr, 1) + 1;
+            }
+
+            int64_t Atomics::DecrementAndGet64(int64_t* ptr)
+            {
+               return __sync_fetch_and_sub(ptr, 1) - 1;
+            }
+
+            void* ThreadLocal::Get0()
+            {
+                pthread_once(&tlsKeyInit, AllocateTlsKey);
+                                
+                return pthread_getspecific(tlsKey);
+            }
+
+            void ThreadLocal::Set0(void* ptr)
+            {
+                pthread_once(&tlsKeyInit, AllocateTlsKey);
+                
+                pthread_setspecific(tlsKey, ptr);
+            }
+        }
+    }
+}
\ No newline at end of file


[63/82] [abbrv] ignite git commit: updated code style xml file for Intellij IDEA

Posted by sb...@apache.org.
updated code style xml file for Intellij IDEA


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

Branch: refs/heads/ignite-1093-2
Commit: 8438d0afdf411613536bf1448dbb5f72e98eccb7
Parents: 9e42600
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Sep 1 09:18:00 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Sep 1 09:18:00 2015 +0300

----------------------------------------------------------------------
 idea/ignite_codeStyle.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8438d0af/idea/ignite_codeStyle.xml
----------------------------------------------------------------------
diff --git a/idea/ignite_codeStyle.xml b/idea/ignite_codeStyle.xml
index 14faf54..426588a 100644
--- a/idea/ignite_codeStyle.xml
+++ b/idea/ignite_codeStyle.xml
@@ -14,22 +14,15 @@
     </value>
   </option>
   <option name="PREFER_LONGER_NAMES" value="false" />
-  <option name="USE_SINGLE_CLASS_IMPORTS" value="false" />
-  <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="0" />
-  <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="0" />
+  <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1000" />
+  <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1000" />
   <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
     <value />
   </option>
   <option name="IMPORT_LAYOUT_TABLE">
     <value>
-      <package name="org.apache" withSubpackages="true" static="false" />
-      <package name="import org.gridgain" withSubpackages="true" static="false" />
-      <emptyLine />
       <package name="" withSubpackages="true" static="false" />
       <emptyLine />
-      <package name="javax" withSubpackages="true" static="false" />
-      <package name="java" withSubpackages="true" static="false" />
-      <emptyLine />
       <package name="" withSubpackages="true" static="true" />
     </value>
   </option>


[56/82] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite


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

Branch: refs/heads/ignite-1093-2
Commit: e7ec8c59a2d64625c68c691bccbce235b1dc0371
Parents: c28d134 d907afc
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Aug 31 17:41:59 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Aug 31 17:41:59 2015 +0300

----------------------------------------------------------------------
 .../callback/PlatformCallbackGateway.java       | 82 ++++++++++++++++++--
 .../callback/PlatformCallbackUtils.java         | 21 +++++
 2 files changed, 98 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7ec8c59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7ec8c59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
----------------------------------------------------------------------


[81/82] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 03110c9,d9fef86..edfa692
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -1170,7 -1295,9 +1295,10 @@@ public class IgniteKernal implements Ig
          add(ATTR_MARSHALLER, cfg.getMarshaller().getClass().getName());
          add(ATTR_USER_NAME, System.getProperty("user.name"));
          add(ATTR_GRID_NAME, gridName);
 +        add(REBALANCING_VERSION, 1);
+         add(ATTR_PORTABLE_PROTO_VER, cfg.getMarshaller() instanceof PortableMarshaller ?
+             ((PortableMarshaller)cfg.getMarshaller()).getProtocolVersion().toString() :
+             PortableMarshaller.DFLT_PORTABLE_PROTO_VER.toString());
  
          add(ATTR_PEER_CLASSLOADING, cfg.isPeerClassLoadingEnabled());
          add(ATTR_DEPLOYMENT_MODE, cfg.getDeploymentMode());

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
index c04c69b,7be2af3..94c41fd
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@@ -135,9 -135,9 +135,12 @@@ public final class IgniteNodeAttribute
      /** Node consistent id. */
      public static final String ATTR_NODE_CONSISTENT_ID = ATTR_PREFIX + ".consistent.id";
  
+     /** Portable protocol version. */
+     public static final String ATTR_PORTABLE_PROTO_VER = ATTR_PREFIX + ".portable.proto.ver";
+ 
 +    /** Rebalancing version id. */
 +    public static final String REBALANCING_VERSION = ATTR_PREFIX + ".rebalancing.version";
 +
      /**
       * Enforces singleton.
       */

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/59936ba0/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java
----------------------------------------------------------------------


[65/82] [abbrv] ignite git commit: Fixed compilation issue in Ignite.

Posted by sb...@apache.org.
Fixed compilation issue in Ignite.


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

Branch: refs/heads/ignite-1093-2
Commit: dfc1e40eb7fb6025b0b7def972062d8aa5d689a3
Parents: afce269
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 10:29:53 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 10:29:53 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/dfc1e40e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 9b9bbba..f246107 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheVariableTopologySelf
 import org.apache.ignite.internal.processors.cache.IgniteAtomicCacheEntryProcessorNodeJoinTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorNodeJoinTest;
 import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdateTest;
+import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop
 import org.apache.ignite.internal.processors.cache.distributed.CacheLoadingConcurrentGridStartSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionNotLoadedEventSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedAffinityFilterSelfTest;


[02/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
index 533d702..c84a2d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
@@ -17,20 +17,27 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.GridArgumentCheck;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
 
 /**
  * Test affinity mapper.
@@ -206,4 +213,4 @@ public abstract class GridCacheAbstractUsersAffinityMapperSelfTest extends GridC
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
index 2ad42c3..25a0be3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
@@ -17,17 +17,27 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityFunctionContext;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.affinity.GridAffinityFunctionContextImpl;
+import org.apache.ignite.internal.util.typedef.F;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Affinity API tests.
@@ -335,4 +345,4 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest {
         for (int i = 0; i < gridCount(); i++)
             assertEquals(expPart, grid(i).affinity(null).partition(key));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
index 943605d..4bb6ce9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test affinity mapper.
@@ -146,4 +148,4 @@ public class GridCacheAffinityMapperSelfTest extends GridCommonAbstractTest {
             return affKey;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index a56ab9f..a89403d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -17,25 +17,30 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobFailoverException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.CAX;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Affinity routing tests.
@@ -413,4 +418,4 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java
index 7ee82e4..92e1bab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.eviction.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
 
 /**
  * Cache eviction policy that expires every entry essentially keeping the cache empty.
@@ -42,4 +45,4 @@ public class GridCacheAlwaysEvictionPolicy<K, V> implements EvictionPolicy<K, V>
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
index 545447d..a3ec90c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.GridAtomicInteger;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Checks that number of concurrent asynchronous operations is limited when configuration parameter is set.
@@ -78,4 +77,4 @@ public class GridCacheAsyncOperationsLimitSelfTest extends GridCacheAbstractSelf
             assertTrue("Maximum number of permits exceeded: " + max.get(),  max.get() <= 51);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
index f2be20a..0e17102 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
@@ -17,28 +17,31 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests messages being sent between nodes in ATOMIC mode.
@@ -234,4 +237,4 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
             cntMap.clear();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
index ad20fa2..8b8bff5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicUsersAffinityMapperSelfTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.NearCacheConfiguration;
 
 /**
  * Test affinity mapper.
@@ -38,4 +39,4 @@ public class GridCacheAtomicUsersAffinityMapperSelfTest extends GridCacheAbstrac
     @Override protected CacheMode getCacheMode() {
         return CacheMode.PARTITIONED;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
index 1dc5b7e..7a9e651 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -17,26 +17,34 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.expiry.TouchedExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestThread;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVTS_CACHE;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_REMOVED;
 
 /**
  * Test cases for multi-threaded tests.
@@ -691,4 +699,4 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe
             return true;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
index 78f7131..8ddd737 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -17,25 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.P2;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Basic store test.
@@ -582,4 +589,4 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
             assert lastMtd.equals(mtd) : "Last method does not match [expected=" + mtd + ", lastMtd=" + lastMtd + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
index 4baaf39..ebd0c03 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
@@ -17,19 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.configuration.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Basic store test.
@@ -129,4 +130,4 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC
 
         assertEquals(1, cntr.get());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
index b4d385a..7334418 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
@@ -17,19 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * Test {@link IgniteCache#clear()} operation in multinode environment with nodes
@@ -192,4 +195,4 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
             return F.eq(attrValue, clusterNode.attribute(TEST_ATTRIBUTE));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
index c82101e..df9f676 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
@@ -17,24 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheAdapter.*;
+import java.lang.reflect.Array;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.processors.cache.GridCacheAdapter.CLEAR_ALL_SPLIT_THRESHOLD;
 
 /**
  * Test {@link IgniteCache#localClearAll(java.util.Set)} operations in multinode environment with nodes having caches with different names.
@@ -374,4 +378,4 @@ public class GridCacheClearLocallySelfTest extends GridCommonAbstractTest {
             return false;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java
index 8bf39b2..0fb3c8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.NearCacheConfiguration;
 
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
@@ -35,4 +35,4 @@ public class GridCacheColocatedTxStoreExceptionSelfTest extends IgniteTxStoreExc
     @Override protected NearCacheConfiguration nearConfiguration() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 7476fea..3381a34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -17,21 +17,24 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Grid cache concurrent hash map self test.
@@ -359,4 +362,4 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
             assertEquals(0, local().map.iteratorMapSize());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
index 06e826d..6111b2f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
@@ -17,19 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Grid cache concurrent hash map self test.
@@ -135,4 +135,4 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest {
         fut1.get();
         fut2.get();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index bba4ad9..67bc08c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -17,39 +17,68 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.eviction.lru.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
+import org.apache.ignite.cache.query.annotations.QueryGroupIndex;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.AtomicConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.util.GridAtomicLong;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.T5;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheRebalanceMode.NONE;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -829,4 +858,4 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index 445a5e1..31e34bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -17,39 +17,56 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.fair.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.eviction.fifo.*;
-import org.apache.ignite.cache.eviction.lru.*;
-import org.apache.ignite.cache.eviction.random.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.configuration.DeploymentMode.*;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheInterceptorAdapter;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityNodeIdHashResolver;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cache.eviction.EvictionFilter;
+import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
+import org.apache.ignite.cache.eviction.random.RandomEvictionPolicy;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridStringLogger;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC;
+import static org.apache.ignite.cache.CacheRebalanceMode.NONE;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  *
@@ -943,4 +960,4 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
 
     private static class TestCacheDefaultAffinityKeyMapper extends GridCacheDefaultAffinityKeyMapper {
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
index 10926eb..5d67fc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
@@ -17,17 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Attribute validation self test.
@@ -210,4 +213,4 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract
     private static class TestCacheDefaultAffinityKeyMapper extends GridCacheDefaultAffinityKeyMapper {
         // No-op. Just to have another class name.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
index 4badba9..73454b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
@@ -17,22 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Test cache operations with daemon node.
@@ -180,4 +181,4 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
index 9685771..fda054f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
 
 /**
  * Tests deployment with off-heap storage.
@@ -37,4 +38,4 @@ public class GridCacheDeploymentOffHeapSelfTest extends GridCacheDeploymentSelfT
 
         return cacheCfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index f46a463..5965852 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -17,24 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.configuration.DeploymentMode.*;
+import java.util.Arrays;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  * Cache + Deployment test.
@@ -432,4 +436,4 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
         throw new IllegalStateException("Unable to find matching key [start=" + start + ", primary=" + primary.id() +
             ", backup=" + backup.id() + ']');
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index 981ba78..0e92f50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -17,25 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  *
@@ -339,4 +346,4 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
             return arr != null ? Arrays.hashCode(arr) : 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
index 28358d4..197a62a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
@@ -17,23 +17,24 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager.*;
+import java.util.Map;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager.TOP_VER_BASE_TIME;
 
 /**
  * Tests that entry version is
@@ -156,4 +157,4 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest {
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
index 46a28dd..4dc3659 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
@@ -17,21 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 
 /**
  * Eviction event self test.
@@ -111,4 +118,4 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr
 
         assertNotNull(oldVal.get());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
index 82634be..d61394f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
@@ -17,23 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.transactions.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Abstract class for cache tests.
@@ -321,4 +327,4 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
 
         return end.get() - start;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
index a661ee5..56a480e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
@@ -17,19 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.cache.query.annotations.QueryTextField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Multithreaded reduce query tests with lots of data.
@@ -154,4 +155,4 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra
             return S.toString(H2TextValue.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
index bc54951..fbd92f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
@@ -17,18 +17,21 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static javax.cache.Cache.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+
+import static javax.cache.Cache.Entry;
 
 /**
  * Test store.
@@ -272,4 +275,4 @@ public class GridCacheGenericTestStore<K, V> implements CacheStore<K, V> {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
index dc9880c..b30ca8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
@@ -17,24 +17,26 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.configuration.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.io.Serializable;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Basic get and transform store test.
@@ -164,4 +166,4 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
index 418c95a..812baa5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
@@ -17,26 +17,30 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.io.Serializable;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePartialUpdateException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests cache in-place modification logic with iterative value increment.
@@ -228,4 +232,4 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
index 72769d9..c57869f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
@@ -17,27 +17,40 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.processor.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheInterceptor;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * Tests {@link CacheInterceptor}.
@@ -1718,4 +1731,4 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
             return 1;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java
index 1dab633..9b4c4b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.cache.CacheInterceptor;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.configuration.NearCacheConfiguration;
 
 /**
  * Tests {@link CacheInterceptor}.
@@ -28,4 +28,4 @@ public class GridCacheInterceptorAtomicNearEnabledSelfTest extends GridCacheInte
     @Override protected NearCacheConfiguration nearConfiguration() {
         return new NearCacheConfiguration();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
index cbc54ad..04f18a78c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheInterceptor;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  * Tests {@link CacheInterceptor}.
@@ -42,4 +44,4 @@ public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCac
     @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
         return PRIMARY;
     }
-}
+}
\ No newline at end of file


[64/82] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main


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

Branch: refs/heads/ignite-1093-2
Commit: 1eded2506f79a40a0e67721ff3924b7edd023179
Parents: 8438d0a afce269
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Sep 1 09:18:17 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Sep 1 09:18:17 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheQueryExample.java    |  6 +-
 .../hibernate/HibernateL2CacheExample.java      |  4 +-
 .../java8/datagrid/CacheAffinityExample.java    |  4 +-
 .../java8/datagrid/CacheApiExample.java         |  4 +-
 .../java8/datagrid/CacheAsyncApiExample.java    |  4 +-
 .../processors/cache/GridCacheProcessor.java    | 27 ++++--
 .../GridDhtPartitionsExchangeFuture.java        | 94 +++++++++++--------
 .../cache/IgniteDynamicCacheAndNodeStop.java    | 95 ++++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite2.java       |  3 +-
 9 files changed, 186 insertions(+), 55 deletions(-)
----------------------------------------------------------------------



[06/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index d820dba..ef2ecea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -17,24 +17,34 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 
 /**
  * Tests discovery event topology snapshots.
@@ -426,4 +436,4 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
index 4a2483d..c4e4aab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
@@ -17,29 +17,41 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.lang.IgniteProductVersion.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.lang.IgniteProductVersion.fromString;
 
 /**
  *  GridDiscovery self test.
@@ -415,4 +427,4 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
             return id().hashCode();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
index aaac93f..75ec7b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
@@ -17,21 +17,56 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.ComputeTaskTimeoutException;
+import org.apache.ignite.events.CheckpointEvent;
+import org.apache.ignite.events.DeploymentEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_LOADED;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_REMOVED;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_SAVED;
+import static org.apache.ignite.events.EventType.EVT_JOB_CANCELLED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_JOB_QUEUED;
+import static org.apache.ignite.events.EventType.EVT_JOB_RESULTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_STARTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_TIMEDOUT;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_TASK_REDUCED;
+import static org.apache.ignite.events.EventType.EVT_TASK_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT;
+import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED;
 
 /**
  * Test event storage.
@@ -430,4 +465,4 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe
             return (Serializable)results;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
index c3fc539..17479f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
@@ -17,19 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.junit.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteEvents;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_CREATED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED;
+import static org.apache.ignite.events.EventType.EVT_JOB_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_TASK_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT;
 
 /**
  * Tests for runtime events configuration.
@@ -344,4 +354,4 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
 
         return U.toIntArray(res);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
index 8748c73..a3b9608 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
@@ -17,19 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVTS_ALL_MINUS_METRIC_UPDATE;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_TASK_STARTED;
 
 /**
  * Event storage tests.
@@ -264,4 +274,4 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest {
             return evt.type() == EVT_TASK_STARTED;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
index cf4fe79..ab58746 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteState.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteState;
+import org.apache.ignite.IgnitionListener;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteState.STARTED;
+import static org.apache.ignite.IgniteState.STOPPED;
 
 /**
  * Tests for {@link org.apache.ignite.Ignition}.
@@ -94,4 +97,4 @@ public class GridFactoryVmShutdownTest {
     private static String maskNull(String s) {
         return s != null ? s : "null-mask-8AE34BF8";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
index 238115d..49a3f94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
@@ -17,24 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.messaging.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.messaging.MessagingListenActor;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
 
 /**
  * Fail fast test.
@@ -130,4 +129,4 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
 
         U.invoke(comm.getClass(), comm, "simulateNodeFailure");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
index 77ca8f4..f60deef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVTS_ALL;
 
 /**
  * Test for invalid input parameters.
@@ -151,4 +153,4 @@ public class GridFailedInputParametersSelfTest extends GridCommonAbstractTest {
         // Check for exceptions.
         ignite.compute().localDeployTask(GridTestTask.class, U.detectClassLoader(GridTestTask.class));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
index 0e140ba..0105ff4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
@@ -17,18 +17,30 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test failover and custom topology. Topology returns local node if remote node fails.
@@ -185,4 +197,4 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest {
             return results.get(0).getData();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
index f0205c2..e734b9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
@@ -17,17 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeUserUndeclaredException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Failover tests.
@@ -148,4 +160,4 @@ public class GridFailoverSelfTest extends GridCommonAbstractTest {
             return results.get(0).getData();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
index d14ed0d..8d441cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
@@ -17,19 +17,32 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeUserUndeclaredException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test failover of a task with Node filter predicate.
@@ -242,4 +255,4 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes
         }
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
index 8d01f34..5bd9158 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test failover and topology. It don't pick local node if it has been excluded from topology.
@@ -157,4 +165,4 @@ public class GridFailoverTopologySelfTest extends GridCommonAbstractTest {
             return results.get(0).getData();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
index 5fcc9e1..acdd722 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
 
 /**
  *
@@ -72,4 +73,4 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
index c3ab123..ec139da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
@@ -17,18 +17,27 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test for checkpoint cleanup.
@@ -160,4 +169,4 @@ public class GridJobCheckpointCleanupSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
index 5fd30df..09e8799 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
@@ -17,17 +17,34 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.ComputeTaskTimeoutException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Job collision cancel test.
@@ -273,4 +290,4 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
----------------------------------------------------------------------
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 81f0f13..42b1ba0 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
@@ -17,13 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Job context test.
@@ -118,4 +128,4 @@ public class GridJobContextSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
index 355c795..a7cab3f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
@@ -17,30 +17,51 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobMasterLeaveAware;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Test behavior of jobs when master node has failed, but job class implements {@link org.apache.ignite.compute.ComputeJobMasterLeaveAware}
@@ -797,4 +818,4 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
             U.await(respLatch);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
index ea04f35..21c0430 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
@@ -17,22 +17,39 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.collision.jobstealing.*;
-import org.apache.ignite.spi.failover.jobstealing.*;
-import org.apache.ignite.testframework.config.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi;
+import org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi;
+import org.apache.ignite.testframework.config.GridTestProperties;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job stealing test.
@@ -432,4 +449,4 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
             return ignite.cluster().localNode().id();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
index 94377cc..c36211d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
@@ -17,18 +17,28 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.collision.jobstealing.*;
-import org.apache.ignite.spi.failover.jobstealing.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi;
+import org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job stealing test.
@@ -166,4 +176,4 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
             return ignite.name();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
index 8866549..0772067 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test job subject ID propagation.
@@ -149,4 +157,4 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
index f8e3c5d..954834d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 
 /**
  * Tests kernal stop while it is being accessed from asynchronous even listener.
@@ -60,4 +62,4 @@ public class GridKernalConcurrentAccessStopSelfTest  extends GridCommonAbstractT
             }, EVT_NODE_FAILED, EVT_NODE_LEFT, EVT_NODE_JOINED);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
index d7f2103..68ab559 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
+import org.apache.ignite.Ignite;
 
 /**
  * Test kernal utils.
@@ -41,4 +41,4 @@ public class GridKernalTestUtils {
 
         return ((IgniteKernal) ignite).context();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
index 112f5c5..d293b89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.logger.java.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.ConnectorMessageInterceptor;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.logger.java.JavaLogger;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.plugin.segmentation.SegmentationResolver;
+import org.apache.ignite.testframework.junits.common.GridAbstractLifecycleAwareSelfTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test for {@link org.apache.ignite.lifecycle.LifecycleAware} support in {@link org.apache.ignite.configuration.IgniteConfiguration}.
@@ -193,4 +197,4 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
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 f0f890d..28c87c8 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
@@ -17,18 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.lifecycle.LifecycleEventType.*;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteState;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_START;
+import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_STOP;
+import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_START;
+import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_STOP;
 
 /**
  * Lifecycle bean test.
@@ -345,4 +356,4 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
             super.onLifecycleEvent(evt);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
index 4cacd61..4b488be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
@@ -17,16 +17,15 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.messaging.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.PA;
+import org.apache.ignite.messaging.MessagingListenActor;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Tests for {@link org.apache.ignite.messaging.MessagingListenActor}.
@@ -226,4 +225,4 @@ public class GridListenActorSelfTest extends GridCommonAbstractTest {
 
         assert cnt.intValue() == rcv;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
index b2f5953..ec384e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test ensuring that event listeners are picked by started node.
@@ -70,4 +72,4 @@ public class GridLocalEventListenerSelfTest extends GridCommonAbstractTest {
 
         assert fired.await(5000, TimeUnit.MILLISECONDS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index c889baa..d5f6287 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -17,22 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.CAX;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests multiple parallel jobs execution.
@@ -228,4 +235,4 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
             return "key";
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
index 71c5912..ba510a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
@@ -17,19 +17,31 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.sharedfs.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeTaskSpis;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Multiple SPIs test.
@@ -299,4 +311,4 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
             return argument(0);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
index e20b613..370869c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
@@ -17,22 +17,36 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.GridTestClassLoader;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED;
 
 /**
  *
@@ -303,4 +317,4 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
index 65a5b07..8846d0c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
@@ -17,21 +17,30 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.collision.jobstealing.*;
-import org.apache.ignite.spi.failover.jobstealing.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi;
+import org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Multithreaded job stealing test.
@@ -236,4 +245,4 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
         /** */
         NONE_STOLEN
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
index 442754c..59d3156 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Node filter test.
@@ -75,4 +76,4 @@ public class GridNodeFilterSelfTest extends GridCommonAbstractTest {
         assert rmtNodes.size() == 1;
         assert rmtNodes.iterator().next().id().equals(rmtNodeId);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
index 9c8084f..5379fe7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Date;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * This test will test node local storage.
@@ -62,4 +63,4 @@ public class GridNodeLocalSelfTest extends GridCommonAbstractTest {
         assert "Hello world!".equals(nl.get(keyStr));
         assert (Integer)nl.get(key) == 12;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
index f0288ca..fddfd74 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Ensures that system properties required by Visor are always passed to node attributes.
@@ -111,4 +110,4 @@ public class GridNodeVisorAttributesSelfTest extends GridCommonAbstractTest {
 
         startGridAndCheck();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
index df1b2df..1911176 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
@@ -17,21 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.GridTestJob;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  *
@@ -121,4 +126,4 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest {
             return results;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
index 04cd3f0..2386ae4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
@@ -17,21 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests for {@link ClusterGroup#forCacheNodes(String)} method.
@@ -302,4 +306,4 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
             return false;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index 3bdc9cf..58ff1fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -17,20 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests for methods that run job locally with multiple arguments.
@@ -150,4 +153,4 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
         assertEquals(36, F.sumInt(res));
         assertEquals(3, ids.size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
index 2130c64..4b89241 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.internal.util.typedef.R1;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test reduce with long operations.
@@ -190,4 +192,4 @@ public class GridReduceSelfTest extends GridCommonAbstractTest {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 96d5f1a..4d284c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test grids starting with non compatible release types.
@@ -125,4 +125,4 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
                 throw e;
         }
     }
-}
+}
\ No newline at end of file


[61/82] [abbrv] ignite git commit: Minor fixes to examples

Posted by sb...@apache.org.
Minor fixes to examples


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

Branch: refs/heads/ignite-1093-2
Commit: 2814d0e91bfe6686aa6c24807997a7a2c4e13c32
Parents: 9e42600
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Aug 31 23:45:23 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Aug 31 23:45:23 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/examples/datagrid/CacheQueryExample.java | 6 +++---
 .../examples/datagrid/hibernate/HibernateL2CacheExample.java   | 4 ++--
 .../ignite/examples/java8/datagrid/CacheAffinityExample.java   | 4 ++--
 .../apache/ignite/examples/java8/datagrid/CacheApiExample.java | 4 ++--
 .../ignite/examples/java8/datagrid/CacheAsyncApiExample.java   | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2814d0e9/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 1b2e02a..8fba3f6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -91,8 +91,8 @@ public class CacheQueryExample {
             personCacheCfg.setIndexedTypes(AffinityKey.class, Person.class);
 
             try (
-                IgniteCache<UUID, Organization> orgCache = ignite.createCache(orgCacheCfg);
-                IgniteCache<AffinityKey<UUID>, Person> personCache = ignite.createCache(personCacheCfg)
+                IgniteCache<UUID, Organization> orgCache = ignite.getOrCreateCache(orgCacheCfg);
+                IgniteCache<AffinityKey<UUID>, Person> personCache = ignite.getOrCreateCache(personCacheCfg)
             ) {
                 // Populate cache.
                 initialize();
@@ -425,4 +425,4 @@ public class CacheQueryExample {
             return "Organization [id=" + id + ", name=" + name + ']';
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/2814d0e9/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index 43088a4..2f271c8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -199,7 +199,7 @@ public class HibernateL2CacheExample {
         ccfg.setAtomicityMode(atomicityMode);
         ccfg.setWriteSynchronizationMode(FULL_SYNC);
 
-        return Ignition.ignite().createCache(ccfg);
+        return Ignition.ignite().getOrCreateCache(ccfg);
     }
 
     /**
@@ -242,4 +242,4 @@ public class HibernateL2CacheExample {
 
         System.out.println("=====================================");
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/2814d0e9/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
index aa1fc25..6635e7f 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
@@ -51,7 +51,7 @@ public final class CacheAffinityExample {
             cfg.setCacheMode(CacheMode.PARTITIONED);
             cfg.setName(CACHE_NAME);
 
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(cfg)) {
                 for (int i = 0; i < KEY_CNT; i++)
                     cache.put(i, Integer.toString(i));
 
@@ -119,4 +119,4 @@ public final class CacheAffinityExample {
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/2814d0e9/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
index 98f37c7..cca1812 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
@@ -55,7 +55,7 @@ public class CacheApiExample {
             cfg.setCacheMode(CacheMode.PARTITIONED);
             cfg.setName(CACHE_NAME);
 
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(cfg)) {
                 // Demonstrate atomic map operations.
                 atomicMapOperations(cache);
             }
@@ -102,4 +102,4 @@ public class CacheApiExample {
         b2 = cache.replace(7, "7", "777");
         assert b1 & !b2;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/2814d0e9/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
index 1313181..2ad5640 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
@@ -57,7 +57,7 @@ public class CacheAsyncApiExample {
             cfg.setCacheMode(CacheMode.PARTITIONED);
             cfg.setName(CACHE_NAME);
 
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(cfg)) {
                 // Enable asynchronous mode.
                 IgniteCache<Integer, String> asyncCache = cache.withAsync();
 
@@ -82,4 +82,4 @@ public class CacheAsyncApiExample {
             }
         }
     }
-}
\ No newline at end of file
+}


[14/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
index 99634d7..212aaa9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-
-import javax.cache.expiry.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import javax.cache.expiry.CreatedExpiryPolicy;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Task to loads caches.
@@ -92,4 +96,4 @@ public class VisorCacheLoadTask extends
             return S.toString(VisorCachesLoadJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
index f64b7ef..6ba783c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.escapeName;
 
 /**
  * Task to get cache SQL metadata.
@@ -75,4 +78,4 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq
             return S.toString(VisorCacheMetadataJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index c5d70a5..2844c12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for {@link CacheMetrics}.
@@ -516,4 +516,4 @@ public class VisorCacheMetrics implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheMetrics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index 23263c0..abed7db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -17,15 +17,20 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task that collect cache metrics from all nodes.
@@ -124,4 +129,4 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
             return S.toString(VisorCacheMetricsCollectorJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
index 3706650..23195e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.evictionPolicyMaxSize;
 
 /**
  * Data transfer object for near cache configuration properties.
@@ -97,4 +98,4 @@ public class VisorCacheNearConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheNearConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNodesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNodesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNodesTask.java
index 7b8bca3..955fc64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNodesTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNodesTask.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Task that returns collection of cache data nodes IDs.
@@ -71,4 +73,4 @@ public class VisorCacheNodesTask extends VisorOneNodeTask<String, Collection<UUI
             return S.toString(VisorCacheNodesJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
index 0da7e36..cbb97a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Data transfer object for cache query configuration data.
@@ -111,4 +110,4 @@ public class VisorCacheQueryConfiguration implements Serializable {
     public int sqlOnheapRowCacheSize() {
         return sqlOnheapRowCacheSize;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
index ea051e4..ffbe585 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for cache query metrics.
@@ -99,4 +98,4 @@ public class VisorCacheQueryMetrics implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheQueryMetrics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
index 0bc9ccc..d2dd32e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for cache rebalance configuration properties.
@@ -111,4 +110,4 @@ public class VisorCacheRebalanceConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheRebalanceConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
index a9cf56d..e0c94bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Pre-loads caches. Made callable just to conform common pattern.
@@ -79,4 +82,4 @@ public class VisorCacheRebalanceTask extends VisorOneNodeTask<Set<String>, Void>
             return S.toString(VisorCachesRebalanceJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
index aca7b41..9ff4dae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Reset compute grid metrics.
@@ -65,4 +66,4 @@ public class VisorCacheResetMetricsTask extends VisorOneNodeTask<String, Void> {
             return S.toString(VisorCacheResetMetricsJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
index 2aa03a2..75cd1a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
@@ -17,18 +17,25 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.internal.visor.util.VisorTaskUtils;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task that start cache or near cache with specified configuration.
@@ -152,4 +159,4 @@ public class VisorCacheStartTask extends
             return S.toString(VisorCacheStartJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
index 83d19f1..f90ddbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Task that stop specified caches on specified node.
@@ -66,4 +67,4 @@ public class VisorCacheStopTask extends VisorOneNodeTask<String, Void> {
             return S.toString(VisorCacheStopJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index ab24a3e..f2d5961 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -17,17 +17,16 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
 
 /**
  * Data transfer object for cache store configuration properties.
@@ -176,4 +175,4 @@ public class VisorCacheStoreConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheStoreConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
index e05accc..a01acb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
@@ -17,18 +17,20 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.cache.Cache;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.resources.IgniteInstanceResource;
 
 /**
  * Task for swapping backup cache entries.
@@ -97,4 +99,4 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map
             return S.toString(VisorCachesSwapBackupsJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeFieldMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeFieldMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeFieldMetadata.java
index 17e8f09..c21354b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeFieldMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeFieldMetadata.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.CacheTypeFieldMetadata;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Data transfer object for {@link CacheTypeFieldMetadata}.
@@ -83,4 +82,4 @@ public class VisorCacheTypeFieldMetadata implements Serializable {
     public String javaType() {
         return javaType;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
index 713b98a..2a00ec1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.apache.ignite.cache.CacheTypeFieldMetadata;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Data transfer object for {@link CacheTypeMetadata}.
@@ -242,4 +246,4 @@ public class VisorCacheTypeMetadata implements Serializable {
     public Map<String, LinkedHashMap<String, IgniteBiTuple<String, Boolean>>> grps() {
         return grps;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTask.java
index bf828e1..4ee025d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTask.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.visor.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cancels given tasks sessions.
@@ -86,4 +90,4 @@ public class VisorComputeCancelSessionsTask extends VisorMultiNodeTask<Map<UUID,
             return S.toString(VisorComputeCancelSessionsJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeMonitoringHolder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeMonitoringHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeMonitoringHolder.java
index 5d92df5..01d6f4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeMonitoringHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeMonitoringHolder.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.visor.compute;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.VISOR_TASK_EVTS;
 
 /**
  * Holder class to store information in node local map between data collector task executions.
@@ -118,4 +118,4 @@ public class VisorComputeMonitoringHolder {
     @Override public String toString() {
         return S.toString(VisorComputeMonitoringHolder.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeResetMetricsTask.java
index 6b6cc61..eefeb74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeResetMetricsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeResetMetricsTask.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.visor.compute;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Reset compute grid metrics task.
@@ -61,4 +62,4 @@ public class VisorComputeResetMetricsTask extends VisorOneNodeTask<Void, Void> {
             return S.toString(VisorComputeResetMetricsJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
index 62f1be7..ae66d4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
@@ -17,18 +17,21 @@
 
 package org.apache.ignite.internal.visor.compute;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.COMPUTE_MONITORING_HOLDER_KEY;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.VISOR_TASK_EVTS;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.checkExplicitTaskMonitoring;
 
 /**
  * Task to run gc on nodes.
@@ -108,4 +111,4 @@ public class VisorComputeToggleMonitoringTask extends
             return S.toString(VisorComputeToggleMonitoringJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadDumpTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadDumpTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadDumpTask.java
index 5ddd6e7..68cfdb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadDumpTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadDumpTask.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.visor.debug;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.lang.management.*;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Creates thread dump.
@@ -71,4 +73,4 @@ public class VisorThreadDumpTask extends VisorOneNodeTask<Void, IgniteBiTuple<Vi
             return S.toString(VisorDumpThreadJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
index 0bcca79..3671bcd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.visor.debug;
 
-import java.io.*;
-import java.lang.management.*;
+import java.io.Serializable;
+import java.lang.management.ThreadInfo;
 
 /**
  * Data transfer object for Visor {@link ThreadInfo}.
@@ -326,4 +326,4 @@ public class VisorThreadInfo implements Serializable {
 
         return sb.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadLockInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadLockInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadLockInfo.java
index daab2d7..13c81cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadLockInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadLockInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.visor.debug;
 
-import java.io.*;
-import java.lang.management.*;
+import java.io.Serializable;
+import java.lang.management.LockInfo;
 
 /**
  * Data transfer object for {@link LockInfo}.
@@ -70,4 +70,4 @@ public class VisorThreadLockInfo implements Serializable {
     @Override public String toString() {
         return clsName + '@' + Integer.toHexString(identityHashCode);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadMonitorInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadMonitorInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadMonitorInfo.java
index a12594e..cc68665 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadMonitorInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadMonitorInfo.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.visor.debug;
 
-import java.lang.management.*;
+import java.lang.management.MonitorInfo;
 
 /**
  * Data transfer object for {@link MonitorInfo}.
@@ -69,4 +69,4 @@ public class VisorThreadMonitorInfo extends VisorThreadLockInfo {
     public StackTraceElement stackFrame() {
         return stackFrame;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java
index 414d7c7..0eefa6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.event;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lightweight counterpart for {@link org.apache.ignite.events.DeploymentEvent}.
@@ -71,4 +70,4 @@ public class VisorGridDeploymentEvent extends VisorGridEvent {
     @Override public String toString() {
         return S.toString(VisorGridDeploymentEvent.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java
index c5c0c1a..7d970de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.event;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lightweight counterpart for {@link org.apache.ignite.events.DiscoveryEvent}.
@@ -97,4 +96,4 @@ public class VisorGridDiscoveryEvent extends VisorGridEvent {
     @Override public String toString() {
         return S.toString(VisorGridDiscoveryEvent.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
index e36b034..8a26bddc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.visor.event;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for lightweight counterpart for various {@link org.apache.ignite.events.Event}.
@@ -127,4 +126,4 @@ public class VisorGridEvent implements Serializable {
     @Override public String toString() {
         return S.toString(VisorGridEvent.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java
index b9dbb6a..92f149a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.event;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Special event for events lost situations.
@@ -39,4 +38,4 @@ public class VisorGridEventsLost extends VisorGridEvent {
             "Some Visor events were lost and Visor may show inconsistent results. " +
             "Configure your grid to disable not important events.", "");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
index 0018ab9..a1a0c04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.event;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lightweight counterpart for {@link org.apache.ignite.events.JobEvent} .
@@ -110,4 +109,4 @@ public class VisorGridJobEvent extends VisorGridEvent {
     @Override public String toString() {
         return S.toString(VisorGridJobEvent.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
index 28d3404..255d559 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.event;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lightweight counterpart for {@link org.apache.ignite.events.TaskEvent}.
@@ -110,4 +109,4 @@ public class VisorGridTaskEvent extends VisorGridEvent {
     @Override public String toString() {
         return S.toString(VisorGridTaskEvent.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlock.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlock.java
index 87b7388..f82c703 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlock.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.visor.file;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Represents block of bytes from a file, could be optionally zipped.
@@ -111,4 +110,4 @@ public class VisorFileBlock implements Serializable {
     @Override public String toString() {
         return S.toString(VisorFileBlock.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
index a71b5c5..58a25ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.visor.file;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.file.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.NoSuchFileException;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.readBlock;
 
 /**
  * Task to read file block.
@@ -122,4 +126,4 @@ public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockTask.Viso
             return S.toString(VisorFileBlockJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java
index 6353cbf..55d358c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.internal.visor.file;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.log.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.internal.visor.log.VisorLogFile;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.LOG_FILES_COUNT_LIMIT;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.matchedFiles;
 
 /**
  * Get list files matching filter.
@@ -94,4 +98,4 @@ public class VisorLatestTextFilesTask extends VisorOneNodeTask<IgniteBiTuple<Str
             return S.toString(VisorLatestTextFilesJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
index edcde6a..847975a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for {@link org.apache.ignite.IgniteFileSystem}.
@@ -109,4 +108,4 @@ public class VisorIgfs implements Serializable {
     @Override public String toString() {
         return S.toString(VisorIgfs.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
index e0ea5b3..b6d7f43 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * IGFS endpoint descriptor.
@@ -104,4 +103,4 @@ public class VisorIgfsEndpoint implements Serializable {
     @Override public String toString() {
         return S.toString(VisorIgfsEndpoint.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
index cccc03c..e2b1c6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Format IGFS instance.
@@ -67,4 +68,4 @@ public class VisorIgfsFormatTask extends VisorOneNodeTask<String, Void> {
             return S.toString(VisorIgfsFormatJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java
index 3f39fd0..47738eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.igfs.IgfsMetrics;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for {@link IgfsMetrics}.
@@ -249,4 +248,4 @@ public class VisorIgfsMetrics implements Serializable {
     @Override public String toString() {
         return S.toString(VisorIgfsMetrics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
index 173c439..06460d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Various global constants for IGFS profiler.
@@ -85,4 +85,4 @@ public class VisorIgfsProfiler {
         }
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
index 814fc50..ba805c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
@@ -17,16 +17,24 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.nio.file.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.resolveIgfsProfilerLogsDir;
 
 /**
  * Remove all IGFS profiler logs.
@@ -111,4 +119,4 @@ public class VisorIgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteB
     @Override protected VisorIgfsProfilerClearJob job(String arg) {
         return new VisorIgfsProfilerClearJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java
index bf1a75d..2ceea60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Comparator;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Visor IGFS profiler information about one file.
@@ -235,4 +234,4 @@ public class VisorIgfsProfilerEntry implements Serializable {
     @Override public String toString() {
         return S.toString(VisorIgfsProfilerEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
index f750ab3..5c5e3d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
@@ -17,20 +17,41 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-
-import java.io.*;
-import java.nio.charset.*;
-import java.nio.file.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.igfs.common.IgfsLogger.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.DELIM_FIELD;
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.HDR;
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.TYPE_CLOSE_IN;
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.TYPE_CLOSE_OUT;
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.TYPE_OPEN_IN;
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.TYPE_OPEN_OUT;
+import static org.apache.ignite.internal.igfs.common.IgfsLogger.TYPE_RANDOM_READ;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.resolveIgfsProfilerLogsDir;
 
 /**
  * Task that parse hadoop profiler logs.
@@ -516,4 +537,4 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
     @Override protected VisorIgfsProfilerJob job(String arg) {
         return new VisorIgfsProfilerJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerUniformityCounters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerUniformityCounters.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerUniformityCounters.java
index 1ce1c64..55244c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerUniformityCounters.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerUniformityCounters.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.internal.util.typedef.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import org.apache.ignite.internal.util.typedef.F;
 
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.igfs.VisorIgfsProfiler.*;
+import static org.apache.ignite.internal.visor.igfs.VisorIgfsProfiler.UNIFORMITY_BLOCKS;
+import static org.apache.ignite.internal.visor.igfs.VisorIgfsProfiler.UNIFORMITY_DFLT_BLOCK_SIZE;
 
 /**
  * Class to support uniformity calculation.
@@ -198,4 +198,4 @@ public class VisorIgfsProfilerUniformityCounters implements Serializable {
             return 1.0 - sigma;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
index cd807c2..b10cce3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-
-import java.util.*;
+import java.util.Set;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Resets IGFS metrics.
@@ -70,4 +70,4 @@ public class VisorIgfsResetMetricsTask extends VisorOneNodeTask<Set<String>, Voi
             return S.toString(VisorIgfsResetMetricsJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java
index d6673ab..62d93d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.visor.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.igfs.IgfsEx;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Task to set IGFS instance sampling state.
@@ -74,4 +77,4 @@ public class VisorIgfsSamplingStateTask extends VisorOneNodeTask<IgniteBiTuple<S
     @Override protected VisorIgfsSamplingStateJob job(IgniteBiTuple<String, Boolean> arg) {
         return new VisorIgfsSamplingStateJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogFile.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogFile.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogFile.java
index 6f0c825..211a171 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogFile.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.visor.log;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.File;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Visor log file.
@@ -84,4 +84,4 @@ public class VisorLogFile implements Serializable {
     @Override public String toString() {
         return S.toString(VisorLogFile.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchResult.java
index 02737f1..a492516 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchResult.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.log;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Result for log search operation.
@@ -153,4 +152,4 @@ public class VisorLogSearchResult implements Serializable {
     @Override public String toString() {
         return S.toString(VisorLogSearchResult.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
index 0fa5f06..b6552b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
@@ -17,22 +17,33 @@
 
 package org.apache.ignite.internal.visor.log;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.charset.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.io.GridReversedLinesFileReader;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.decode;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.matchedFiles;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.textFile;
 
 /**
  * Search text matching in logs
@@ -265,4 +276,4 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi
             return S.toString(VisorLogSearchJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorAckTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorAckTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorAckTask.java
index 22360c8..bad3f53 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorAckTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorAckTask.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.visor.misc;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ack task to run on node.
@@ -72,4 +72,4 @@ public class VisorAckTask extends VisorMultiNodeTask<String, Void, Void> {
             return S.toString(VisorAckJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java
index ce74fa2..49247be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.visor.misc;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Task for collecting latest version.
@@ -59,4 +60,4 @@ public class VisorLatestVersionTask extends VisorOneNodeTask<Void, String> {
             return S.toString(VisorLatestVersionJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorNopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorNopTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorNopTask.java
index f058b90..7c56e9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorNopTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorNopTask.java
@@ -17,13 +17,18 @@
 
 package org.apache.ignite.internal.visor.misc;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Nop task with random timeout.
@@ -89,4 +94,4 @@ public class VisorNopTask implements ComputeTask<Integer, Void> {
             return S.toString(VisorNopJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
index 76e610f..0f9e038 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.visor.misc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Task that resolve host name for specified IP address from node.
@@ -101,4 +104,4 @@ public class VisorResolveHostNameTask extends VisorOneNodeTask<Void, Map<String,
             return S.toString(VisorResolveHostNameJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
index c39e3d9..6966dbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.AtomicConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for configuration of atomic data structures.
@@ -80,4 +79,4 @@ public class VisorAtomicConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorAtomicConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 366f5f8..84095b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -17,17 +17,27 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static java.lang.System.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.System.getProperty;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_HOST;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_DISCO_ORDER;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_SHUTDOWN_HOOK;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_PROG_NAME;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.boolValue;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactObject;
 
 /**
  * Data transfer object for node basic configuration properties.
@@ -283,4 +293,4 @@ public class VisorBasicConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorBasicConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
index 8bc891e..14a8dcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for node executors configuration properties.
@@ -114,4 +114,4 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorExecutorServiceConfiguration.class, this);
     }
-}
+}
\ No newline at end of file


[53/82] [abbrv] ignite git commit: main - imports fixed

Posted by sb...@apache.org.
main - imports fixed


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

Branch: refs/heads/ignite-1093-2
Commit: e8379e9254354bd01dfef9f872ad13b5a5bcdffe
Parents: 34f98a6
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Aug 31 17:28:07 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Aug 31 17:28:07 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    | 274 ++++++++++++++-----
 .../platform/PlatformNoopProcessor.java         |   9 +-
 .../processors/platform/PlatformProcessor.java  |   7 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |  29 +-
 4 files changed, 224 insertions(+), 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
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 4fa3564..d9fef86 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
@@ -17,81 +17,205 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.internal.managers.collision.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.managers.failover.*;
-import org.apache.ignite.internal.managers.indexing.*;
-import org.apache.ignite.internal.managers.loadbalancer.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.clock.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.processors.cluster.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.processors.job.*;
-import org.apache.ignite.internal.processors.jobmetrics.*;
-import org.apache.ignite.internal.processors.nodevalidation.*;
-import org.apache.ignite.internal.processors.offheap.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.processors.port.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.processors.segmentation.*;
-import org.apache.ignite.internal.processors.service.*;
-import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import javax.management.*;
-import java.io.*;
-import java.lang.management.*;
-import java.lang.reflect.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.GridKernalState.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
-import static org.apache.ignite.lifecycle.LifecycleEventType.*;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.Constructor;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.management.JMException;
+import javax.management.ObjectName;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteAtomicReference;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteCountDownLatch;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteEvents;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.IgniteServices;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.cluster.IgniteClusterEx;
+import org.apache.ignite.internal.managers.GridManager;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
+import org.apache.ignite.internal.managers.collision.GridCollisionManager;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.failover.GridFailoverManager;
+import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
+import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessor;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
+import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
+import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
+import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor;
+import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
+import org.apache.ignite.internal.processors.hadoop.Hadoop;
+import org.apache.ignite.internal.processors.job.GridJobProcessor;
+import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
+import org.apache.ignite.internal.processors.nodevalidation.OsDiscoveryNodeValidationProcessor;
+import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
+import org.apache.ignite.internal.processors.platform.PlatformNoopProcessor;
+import org.apache.ignite.internal.processors.platform.PlatformProcessor;
+import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
+import org.apache.ignite.internal.processors.port.GridPortProcessor;
+import org.apache.ignite.internal.processors.port.GridPortRecord;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
+import org.apache.ignite.internal.processors.rest.GridRestProcessor;
+import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
+import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
+import org.apache.ignite.internal.processors.service.GridServiceProcessor;
+import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
+import org.apache.ignite.internal.processors.task.GridTaskProcessor;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.GridEnumCache;
+import org.apache.ignite.internal.util.GridTimerTask;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
+import org.apache.ignite.mxbean.IgniteMXBean;
+import org.apache.ignite.mxbean.ThreadPoolMXBean;
+import org.apache.ignite.plugin.IgnitePlugin;
+import org.apache.ignite.plugin.PluginNotFoundException;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiVersionCheckException;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_STARVATION_CHECK_INTERVAL;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER;
+import static org.apache.ignite.IgniteSystemProperties.getBoolean;
+import static org.apache.ignite.IgniteSystemProperties.snapshot;
+import static org.apache.ignite.internal.GridKernalState.DISCONNECTED;
+import static org.apache.ignite.internal.GridKernalState.STARTED;
+import static org.apache.ignite.internal.GridKernalState.STARTING;
+import static org.apache.ignite.internal.GridKernalState.STOPPED;
+import static org.apache.ignite.internal.GridKernalState.STOPPING;
+import static org.apache.ignite.internal.IgniteComponentType.IGFS;
+import static org.apache.ignite.internal.IgniteComponentType.IGFS_HELPER;
+import static org.apache.ignite.internal.IgniteComponentType.SCHEDULE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_DATE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CLIENT_MODE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CONSISTENCY_CHECK_SKIPPED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_GRID_NAME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JIT_NAME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JMX_PORT;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_ARGS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_PID;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_LANG_RUNTIME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTENT_ID;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PEER_CLASSLOADING;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PHY_RAM;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PORTABLE_PROTO_VER;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PREFIX;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_RESTART_ENABLED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_PORT_RANGE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
+import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
+import static org.apache.ignite.internal.IgniteVersionUtils.REV_HASH_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
+import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_START;
+import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_START;
 
 /**
  * Ignite kernal.

http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
----------------------------------------------------------------------
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 eadb4c7..8cba731 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
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op processor.

http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
index a22c787..a53c6b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Platform processor.

http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
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 7e11592..82da10f 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
@@ -17,19 +17,22 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.configuration.DeploymentMode.*;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  * Tests for node attributes consistency checks.


[39/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
index 1cce940..53a49c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.client.util.GridClientConsistentHash;
+import org.apache.ignite.internal.client.util.GridClientUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Affinity function for partitioned cache. This function supports the following
@@ -362,4 +365,4 @@ public class GridClientPartitionAffinity implements GridClientDataAffinity, Grid
                 ", hashId=" + hashId + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java
index d28477e..ef03af6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java
@@ -35,4 +35,4 @@ public interface GridClientPredicate<E1> {
      * @return Return value.
      */
     public boolean apply(E1 e);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java
index f64d14c..4882165 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java
@@ -23,4 +23,4 @@ package org.apache.ignite.internal.client;
 public enum GridClientProtocol {
     /** Communication via tcp binary protocol. */
     TCP
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java
index 3d32302..86b9a2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java
@@ -38,4 +38,4 @@ public interface GridClientTopologyListener {
      * @param node Left node.
      */
     public void onNodeRemoved(GridClientNode node);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java
index d787421..576317c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java
@@ -42,4 +42,4 @@ public class GridServerUnreachableException extends GridClientException {
     public GridServerUnreachableException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
index d653359..3eb7e1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.client.balancer;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Base class for balancers. Contains common direct connection handling logic.
@@ -73,4 +72,4 @@ public abstract class GridClientBalancerAdapter implements GridClientLoadBalance
     protected static Collection<GridClientNode> selectDirectNodes(Collection<? extends GridClientNode> nodes) {
         return F.viewReadOnly(nodes, F.<GridClientNode>identity(), CONNECTABLE);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
index dd5f36b..68c8af2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.client.balancer;
 
-import org.apache.ignite.internal.client.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
 
 /**
  * Interface that defines a selection logic of a server node for a particular operation.
@@ -41,4 +41,4 @@ public interface GridClientLoadBalancer {
      * @throws GridClientException If balancer can't match given nodes with current topology snapshot.
      */
     public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes) throws GridClientException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
index d5e7c34..d0a0cb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.client.balancer;
 
-import org.apache.ignite.internal.client.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import org.apache.ignite.internal.client.GridClientNode;
 
 /**
  * Simple balancer that relies on random node selection from a given collection. This implementation
@@ -72,4 +74,4 @@ public class GridClientRandomBalancer extends GridClientBalancerAdapter {
             return it.next();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
index f0320a9..158e648 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
@@ -17,11 +17,17 @@
 
 package org.apache.ignite.internal.client.balancer;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientTopologyListener;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Simple balancer that implements round-robin balancing.
@@ -108,4 +114,4 @@ public class GridClientRoundRobinBalancer extends GridClientBalancerAdapter impl
             lock.unlock();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java
index bf8e7df..2739540 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java
@@ -17,18 +17,31 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.client.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.logging.*;
-
-import static org.apache.ignite.internal.client.util.GridClientUtils.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientDataAffinity;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnection;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
+import org.apache.ignite.internal.client.impl.connection.GridConnectionIdleClosedException;
+import org.apache.ignite.internal.client.util.GridClientUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter;
+import static org.apache.ignite.internal.client.util.GridClientUtils.restAvailable;
 
 /**
  * Class contains common connection-error handling logic.
@@ -455,4 +468,4 @@ abstract class GridClientAbstractProjection<T extends GridClientAbstractProjecti
         public GridClientFuture<R> apply(GridClientConnection conn, UUID affinityNodeId)
             throws GridClientConnectionResetException, GridClientClosedException;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java
index b6dd01b..f8f3ee5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.GridClientPredicate;
 
 /**
  * AND predicate. Passes if and only if both provided filters accept the node.
@@ -49,4 +49,4 @@ class GridClientAndPredicate<T> implements GridClientPredicate<T> {
     @Override public boolean apply(T elem) {
         return first.apply(elem) && second.apply(elem);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
index 8012051..0c3b155 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
@@ -17,16 +17,24 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.client.util.GridClientUtils.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnection;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
+import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter;
 
 /**
  * Compute projection implementation.
@@ -260,4 +268,4 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
             return new GridClientComputeImpl(client, nodes, filter, balancer);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java
index 5502ed7..b97f3e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java
@@ -17,13 +17,29 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.client.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.internal.client.GridClientCacheFlag;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientData;
+import org.apache.ignite.internal.client.GridClientDataAffinity;
+import org.apache.ignite.internal.client.GridClientDataMetrics;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientFutureListener;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnection;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
+import org.apache.ignite.internal.client.util.GridClientUtils;
+import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * Data projection that serves one cache instance and handles communication errors.
@@ -386,4 +402,4 @@ public class GridClientDataImpl extends GridClientAbstractProjection<GridClientD
             return new GridClientDataImpl(cacheName, client, nodes, filter, balancer, flags, cacheMetrics);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java
index 5fb43ca..c3ea415 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.GridClientDataMetrics;
 
 /**
  * Adapter for cache metrics.
@@ -157,4 +157,4 @@ public class GridClientDataMetricsAdapter implements GridClientDataMetrics {
             ", writeTime=" + writeTime +
             ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java
index 83172a1..7459957 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-import java.util.logging.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientFutureListener;
+import org.apache.ignite.internal.client.GridClientFutureTimeoutException;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future adapter.
@@ -325,4 +329,4 @@ public class GridClientFutureAdapter<R> extends AbstractQueuedSynchronizer imple
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java
index f592528..754f6f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
 
 /**
  * Future callback will be notified, when listened future finishes (both succeed or failed).
@@ -32,4 +33,4 @@ public interface GridClientFutureCallback<R, S> {
      * @return Chained future result, if applicable, otherwise - {@code null}.
      */
     public S onComplete(GridClientFuture<R> fut) throws GridClientException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
index 43dd479..0d5c7cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java
@@ -17,24 +17,52 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.logging.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientCacheMode;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientData;
+import org.apache.ignite.internal.client.GridClientDataAffinity;
+import org.apache.ignite.internal.client.GridClientDataConfiguration;
+import org.apache.ignite.internal.client.GridClientDisconnectedException;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPartitionAffinity;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.GridClientTopologyListener;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionManager;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionManagerOsImpl;
+import org.apache.ignite.internal.client.impl.connection.GridClientTopology;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
 
 /**
  * Client implementation.
@@ -524,4 +552,4 @@ public class GridClientImpl implements GridClient {
     @Override public String toString() {
         return "GridClientImpl [id=" + id + ", closed=" + closed + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
index 9c59b84..ac0866b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.internal.client.GridClientCacheMode;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientNodeMetrics;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Client node implementation.
@@ -371,4 +378,4 @@ public class GridClientNodeImpl implements GridClientNode {
             return this;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
index feb4f22..af010aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.GridClientNodeMetrics;
 
 /**
  * Node metrics adapter.
@@ -987,4 +987,4 @@ public class GridClientNodeMetricsAdapter implements GridClientNodeMetrics {
             append("]").
             toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java
index 7fa6b4c..e1c464e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Delegating thread factory which forces all spawned thread to be daemons.
@@ -59,4 +58,4 @@ public class GridClientThreadFactory implements ThreadFactory {
 
         return thread;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
index 4e5add7..fedd15a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
@@ -17,14 +17,25 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.internal.client.GridClientCacheFlag;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientDataMetrics;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.impl.GridClientDataMetricsAdapter;
+import org.apache.ignite.internal.client.impl.GridClientFutureAdapter;
+import org.apache.ignite.internal.client.impl.GridClientFutureCallback;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Facade for all possible network communications between client and server. Introduced to hide
@@ -503,4 +514,4 @@ public abstract class GridClientConnection {
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java
index 94e5840..6c78c57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java
@@ -29,4 +29,4 @@ enum GridClientConnectionCloseReason {
 
     /** Client is closed and connection also shouldn't be used for new requests. */
     CLIENT_CLOSED
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java
index fed7059..447b5b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.internal.client.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.internal.client.GridClientAuthenticationException;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Common interface for client connection managers.
@@ -68,4 +71,4 @@ public interface GridClientConnectionManager {
      *      (and receiving responses for all pending requests), otherwise it will return immediately.
      */
     public void stop(boolean waitCompletion);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index e8d29b4..f1a9af1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -17,31 +17,58 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.client.util.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.nio.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.logger.java.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.logging.*;
-
-import static java.util.logging.Level.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientHandshakeException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.apache.ignite.internal.client.impl.GridClientFutureAdapter;
+import org.apache.ignite.internal.client.impl.GridClientThreadFactory;
+import org.apache.ignite.internal.client.util.GridClientStripedLock;
+import org.apache.ignite.internal.client.util.GridClientUtils;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestParser;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.java.JavaLogger;
+import org.apache.ignite.plugin.security.SecurityCredentials;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.logging.Level.INFO;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
+import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CLIENT_CLOSED;
+import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
 
 /**
  * Cached connections manager.
@@ -641,4 +668,4 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
             ses.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java
index 6ffd50d..9ed4bdf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.internal.client.*;
-
-import javax.net.ssl.*;
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.UUID;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
 
 /**
  * Open source version of connection manager.
@@ -45,4 +46,4 @@ public class GridClientConnectionManagerOsImpl extends GridClientConnectionManag
     @Override protected void init0() throws GridClientException {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java
index ed51547..6dac0f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.GridClientException;
 
 /**
  * This exception is thrown when ongoing packet should be sent, but network connection is broken.
@@ -45,4 +45,4 @@ public class GridClientConnectionResetException extends GridClientException {
     GridClientConnectionResetException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index d247e05..eee2858 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -17,34 +17,81 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.jdk.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.nio.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.logging.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.internal.client.GridClientCacheFlag.*;
-import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*;
-import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*;
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.channels.SocketChannel;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.GridClientAuthenticationException;
+import org.apache.ignite.internal.client.GridClientCacheFlag;
+import org.apache.ignite.internal.client.GridClientCacheMode;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientDataMetrics;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.impl.GridClientFutureAdapter;
+import org.apache.ignite.internal.client.impl.GridClientFutureCallback;
+import org.apache.ignite.internal.client.impl.GridClientNodeImpl;
+import org.apache.ignite.internal.client.impl.GridClientNodeMetricsAdapter;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientAuthenticationRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeMetricsBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES;
+import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CONN_IDLE;
+import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.GET_ALL;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.METRICS;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PREPEND;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PUT_ALL;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.REPLACE;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV_ALL;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER;
 
 /**
  * This class performs request to grid over tcp protocol. Serialization is performed with marshaller
@@ -1065,4 +1112,4 @@ public class GridClientNioTcpConnection extends GridClientConnection {
             return "TcpClientFuture [state=" + authRetry + ", forward=" + forward + ", message=" + pendingMsg + "]";
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
----------------------------------------------------------------------
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 a15cb65..effd5b3 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
@@ -17,19 +17,36 @@
 
 package org.apache.ignite.internal.client.impl.connection;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.client.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-import java.util.logging.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.logging.Logger;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientDisconnectedException;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridClientTopologyListener;
+import org.apache.ignite.internal.client.impl.GridClientNodeImpl;
+import org.apache.ignite.internal.client.impl.GridClientThreadFactory;
+import org.apache.ignite.internal.client.util.GridClientUtils;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
 
 /**
  * Client topology cache.
@@ -447,4 +464,4 @@ public class GridClientTopology {
             return node;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java
index d7fa87a..68e41b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java
@@ -33,4 +33,4 @@ public class GridConnectionIdleClosedException extends GridClientConnectionReset
     GridConnectionIdleClosedException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
index c981805..ac91ba7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.client.marshaller;
 
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
 
 /**
  * Marshaller for binary protocol messages.
@@ -42,4 +42,4 @@ public interface GridClientMarshaller {
      * @throws IOException If unmarshalling failed.
      */
     public <T> T unmarshal(byte[] bytes) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
index a3c3621..87bc7aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.client.marshaller.jdk;
 
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.util.io.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
 
 /**
  * Simple marshaller that utilize JDK serialization features.
@@ -65,4 +69,4 @@ public class GridClientJdkMarshaller implements GridClientMarshaller {
             throw new IOException("Failed to unmarshal target object: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index 0d99d75..4bc1dac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal.client.marshaller.optimized;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.MarshallerContextAdapter;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.plugin.PluginProvider;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} to
@@ -136,4 +136,4 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
             throw new UnsupportedOperationException();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java
index b895903..03fe35e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.router.impl.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This factory is responsible for router lifecycle management.
@@ -123,4 +126,4 @@ public final class GridRouterFactory {
             router.stop();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java
index 74909c7..6d775f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.router;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * TCP router interface.
@@ -71,4 +71,4 @@ public interface GridTcpRouter {
      * @return Router configuration.
      */
     public GridTcpRouterConfiguration configuration();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
index 711333c..191f4ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.Socket;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.security.SecurityCredentialsProvider;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines runtime configuration for TCP router.
@@ -303,4 +305,4 @@ public class GridTcpRouterConfiguration {
     @Override public String toString() {
         return S.toString(GridTcpRouterConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java
index 479fd8c..8a45f8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.mxbean.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * MBean interface for TCP router.
@@ -85,4 +84,4 @@ public interface GridTcpRouterMBean {
      */
     @MXBeanDescription("Number of responses returned by this router.")
     public long getSendCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java
index 0521f9f..f97877a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java
@@ -17,17 +17,33 @@
 
 package org.apache.ignite.internal.client.router.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.client.router.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.client.util.GridClientUtils.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientData;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridClientTopologyListener;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.apache.ignite.internal.client.impl.GridClientFutureAdapter;
+import org.apache.ignite.internal.client.impl.GridClientImpl;
+import org.apache.ignite.internal.client.impl.GridClientNodeImpl;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnection;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionManager;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
+import org.apache.ignite.internal.client.impl.connection.GridClientTopology;
+import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter;
+import static org.apache.ignite.internal.client.util.GridClientUtils.restAvailable;
 
 /**
  * A {@link GridClient} router implementation.
@@ -197,4 +213,4 @@ public class GridRouterClientImpl implements GridClient {
     @Override public void close() {
         clientImpl.close();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
index 41d4d28..ac1ca62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
@@ -17,20 +17,22 @@
 
 package org.apache.ignite.internal.client.router.impl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.router.*;
-import org.apache.ignite.internal.util.spring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import java.util.logging.Handler;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration;
+import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lifecycle.LifecycleAware;
+
+import static org.apache.ignite.internal.IgniteComponentType.SPRING;
+import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
 
 /**
  * Loader class for router.
@@ -166,4 +168,4 @@ public class GridRouterCommandLineStartup {
             }
         });
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
index 7b1cd8b..06a4929 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
@@ -17,25 +17,37 @@
 
 package org.apache.ignite.internal.client.router.impl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.router.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.nio.ssl.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.logger.java.*;
-import org.jetbrains.annotations.*;
-
-import javax.management.*;
-import javax.net.ssl.*;
-import java.lang.management.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteOrder;
+import java.util.Collection;
+import java.util.UUID;
+import javax.management.JMException;
+import javax.management.ObjectName;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.router.GridTcpRouter;
+import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration;
+import org.apache.ignite.internal.client.router.GridTcpRouterMBean;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioParser;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.logger.java.JavaLogger;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper class for router process.
@@ -345,4 +357,4 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif
 
         return id.equals(that.id);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
index 1775b21..02b63ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -17,19 +17,32 @@
 
 package org.apache.ignite.internal.client.router.impl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.jdk.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientFutureListener;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER_ID;
 
 /**
  * Nio listener for the router. Extracts necessary meta information from messages
@@ -200,4 +213,4 @@ public abstract class GridTcpRouterNioListenerAdapter implements GridNioServerLi
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java
index 61e6bd6..b906cb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.router.impl;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteLogger;
 
 /**
  * Router NIO listener.
@@ -35,4 +35,4 @@ class GridTcpRouterNioListenerOsImpl extends GridTcpRouterNioListenerAdapter {
     @Override protected void init() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
index 5111ffc..83a6869 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite.internal.client.router.impl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.nio.*;
-
-import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestParser;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG;
 
 /**
  *
@@ -112,4 +116,4 @@ class GridTcpRouterNioParser extends GridTcpRestParser {
     public long getSendCount() {
         return sndCnt;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
index ed52218..b651ae3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
@@ -17,14 +17,23 @@
 
 package org.apache.ignite.internal.client.ssl;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.configuration.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.security.*;
-import java.security.cert.*;
-import java.util.*;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * Basic ssl context factory that provides ssl context configuration with specified key
@@ -438,4 +447,4 @@ public class GridSslBasicContextFactory implements GridSslContextFactory {
             return CERTS;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
index 34a13cf..4ee4503 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.client.ssl;
 
-import javax.cache.configuration.*;
-import javax.net.ssl.*;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
 
 /**
  * This interface provides creation of SSL context both for server and client use.
@@ -36,4 +37,4 @@ public interface GridSslContextFactory {
      * @throws SSLException If SSL context could not be created.
      */
     public SSLContext createSslContext() throws SSLException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
index 6e2b73b..8134906 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
@@ -17,12 +17,23 @@
 
 package org.apache.ignite.internal.client.util;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Random;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Controls key to node affinity using consistent hash algorithm. This class is thread-safe
@@ -437,4 +448,4 @@ public class GridClientConsistentHash<N> {
 
         return sb.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java
index 30a4baa..426449f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.client.util;
 
-import java.util.concurrent.locks.*;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * This is an utility class for 'splitting' locking of some
@@ -132,4 +133,4 @@ public class GridClientStripedLock {
     public void unlock(Object o) {
         getLock(o).unlock();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java
index 237959e..d79ff1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java
@@ -17,13 +17,19 @@
 
 package org.apache.ignite.internal.client.util;
 
-import org.apache.ignite.internal.client.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.logging.*;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Java client utils.
@@ -168,4 +174,4 @@ public abstract class GridClientUtils {
 
         return i < 0 ? 0 : i;
     }
-}
+}
\ No newline at end of file


[78/82] [abbrv] ignite git commit: Improving platform interfaces.

Posted by sb...@apache.org.
Improving platform interfaces.


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

Branch: refs/heads/ignite-1093-2
Commit: 9a5575886d667eae74871262976fd7356b0d355d
Parents: 32579d4
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 12:55:49 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 12:55:49 2015 +0300

----------------------------------------------------------------------
 .../CacheContinuousQueryFilterEx.java           | 31 --------------------
 .../continuous/CacheContinuousQueryHandler.java |  5 ++--
 .../processors/platform/PlatformContext.java    |  4 +--
 .../cache/query/PlatformContinuousQuery.java    |  6 ++--
 .../query/PlatformContinuousQueryFilter.java    | 30 +++++++++++++++++++
 .../PlatformContinuousQueryRemoteFilter.java    | 20 ++++++-------
 6 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
deleted file mode 100644
index c17433c..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.query.continuous;
-
-
-import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
-
-/**
- * Extended continuous query filter.
- */
-public interface CacheContinuousQueryFilterEx<K, V> extends CacheEntryEventSerializableFilter<K, V> {
-    /**
-     * Callback for query unregister event.
-     */
-    public void onQueryUnregister();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index be3cdbd..df6b4b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager;
 import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
 import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter;
 import org.apache.ignite.internal.util.typedef.C1;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -278,8 +279,8 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
             }
 
             @Override public void onUnregister() {
-                if (rmtFilter instanceof CacheContinuousQueryFilterEx)
-                    ((CacheContinuousQueryFilterEx)rmtFilter).onQueryUnregister();
+                if (rmtFilter instanceof PlatformContinuousQueryFilter)
+                    ((PlatformContinuousQueryFilter)rmtFilter).onQueryUnregister();
             }
 
             @Override public boolean oldValueRequired() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index 1febf07..218ae6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -24,10 +24,10 @@ import org.apache.ignite.events.Event;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.portable.PortableRawReaderEx;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
 import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
 import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessor;
 import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery;
+import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter;
 import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
 import org.apache.ignite.internal.processors.platform.cluster.PlatformClusterNodeFilter;
 import org.apache.ignite.internal.processors.platform.compute.PlatformJob;
@@ -166,7 +166,7 @@ public interface PlatformContext {
      * @param filter Native filter.
      * @return Filter.
      */
-    public CacheContinuousQueryFilterEx createContinuousQueryFilter(Object filter);
+    public PlatformContinuousQueryFilter createContinuousQueryFilter(Object filter);
 
     /**
      * Create remote message filter.

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
index b7cd3c2..227af89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal.processors.platform.cache.query;
 
-import javax.cache.event.CacheEntryUpdatedListener;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.cache.query.Query;
 import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
 import org.apache.ignite.internal.processors.platform.PlatformTarget;
 
+import javax.cache.event.CacheEntryUpdatedListener;
+
 /**
  * Platform continuous query.
  */
-public interface PlatformContinuousQuery extends CacheEntryUpdatedListener, CacheContinuousQueryFilterEx {
+public interface PlatformContinuousQuery extends CacheEntryUpdatedListener, PlatformContinuousQueryFilter {
     /**
      * Start continuous query execution.
      *

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java
new file mode 100644
index 0000000..61fa137
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.cache.query;
+
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+
+/**
+ * Platform continuous query filter.
+ */
+public interface PlatformContinuousQueryFilter extends CacheEntryEventSerializableFilter {
+    /**
+     * Callback for query unregister event.
+     */
+    public void onQueryUnregister();
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java
index e89cae9..71aa38c 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java
@@ -17,17 +17,8 @@
 
 package org.apache.ignite.internal.processors.platform.cache.query;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.cache.event.CacheEntryEvent;
-import javax.cache.event.CacheEntryListenerException;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
 import org.apache.ignite.internal.processors.platform.PlatformContext;
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
 import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
@@ -35,10 +26,19 @@ import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.resources.IgniteInstanceResource;
 
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryListenerException;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
 /**
  * Continuous query filter deployed on remote nodes.
  */
-public class PlatformContinuousQueryRemoteFilter implements CacheContinuousQueryFilterEx, Externalizable {
+public class PlatformContinuousQueryRemoteFilter implements PlatformContinuousQueryFilter, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 


[08/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
index 4bd912f..75e8bb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.loadbalancing.weightedrandom;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management MBean for {@link WeightedRandomLoadBalancingSpi} SPI.
@@ -42,4 +42,4 @@ public interface WeightedRandomLoadBalancingSpiMBean extends IgniteSpiManagement
      */
     @MXBeanDescription("Weight of this node.")
     public int getNodeWeight();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapContext.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapContext.java
index 187aaa9..374f5f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapContext.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.swapspace;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Context for swap operations.
@@ -44,4 +44,4 @@ public class SwapContext {
     @Override public String toString() {
         return S.toString(SwapContext.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapKey.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapKey.java
index a21024b..fb22be2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapKey.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.spi.swapspace;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility wrapper class that represents swap key.
@@ -121,4 +122,4 @@ public class SwapKey {
     @Override public String toString() {
         return S.toString(SwapKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
index 8c788c8..7e49324 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.spi.swapspace;
 
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides a mechanism in grid for storing data on disk. Ignite cache uses swap space to overflow
@@ -218,4 +222,4 @@ public interface SwapSpaceSpi extends IgniteSpi {
      */
     @Nullable public IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator(@Nullable String spaceName,
         int part) throws IgniteSpiException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java
index cb61a94..85f356f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.swapspace;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Swap space SPI eviction listener.
@@ -32,4 +32,4 @@ public interface SwapSpaceSpiListener {
      * @param valBytes Value bytes of affected entry. Not {@code null} only for evict notifications.
      */
     public void onSwapEvent(int evtType, @Nullable String spaceName, @Nullable byte[] keyBytes, @Nullable byte[] valBytes);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapArray.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapArray.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapArray.java
index 2f6b910..bab8649 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapArray.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapArray.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.swapspace.file;
 
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Growing array.
@@ -186,4 +185,4 @@ class FileSwapArray<X> {
             arr.lazySet(idx, x);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
index 000782a..19c7987 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
@@ -17,27 +17,64 @@
 
 package org.apache.ignite.spi.swapspace.file;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousCloseException;
+import java.nio.channels.ClosedByInterruptException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.FileChannel;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.GridAtomicInitializer;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.swapspace.SwapContext;
+import org.apache.ignite.spi.swapspace.SwapKey;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpiListener;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_CLEARED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_READ;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_REMOVED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_STORED;
 
 /**
  * File-based swap space SPI implementation which holds keys in memory. This SPI is used by default.
@@ -1866,4 +1903,4 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi,
             };
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
index 4c4623b..f06020c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.swapspace.file;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link FileSwapSpaceSpi}.
@@ -64,4 +64,4 @@ public interface FileSwapSpaceSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Read pool size.")
     public int getReadStripesNumber();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java
index 4f675b2..13622d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java
@@ -17,16 +17,27 @@
 
 package org.apache.ignite.spi.swapspace.noop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.GridEmptyCloseableIterator;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.spi.swapspace.SwapContext;
+import org.apache.ignite.spi.swapspace.SwapKey;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpiListener;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation of {@link org.apache.ignite.spi.swapspace.SwapSpaceSpi}. Exists for testing and benchmarking purposes.
@@ -136,4 +147,4 @@ public class NoopSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi {
     @Override public String toString() {
         return S.toString(NoopSwapSpaceSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/ssl/SslContextFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ssl/SslContextFactory.java b/modules/core/src/main/java/org/apache/ignite/ssl/SslContextFactory.java
index d52dcf3..06edd70 100644
--- a/modules/core/src/main/java/org/apache/ignite/ssl/SslContextFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/ssl/SslContextFactory.java
@@ -17,15 +17,24 @@
 
 package org.apache.ignite.ssl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.configuration.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.security.*;
-import java.security.cert.*;
-import java.util.*;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * This SSL context factory that provides ssl context configuration with specified key
@@ -455,4 +464,4 @@ public class SslContextFactory implements Factory<SSLContext> {
             throw new IgniteException(e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
index 2418c71..270a5c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
@@ -17,21 +17,34 @@
 
 package org.apache.ignite.startup;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.logger.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.logger.NullLogger;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 
 /**
  * Basic warm-up closure which warm-ups cache operations.
@@ -556,4 +569,4 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
             cache.replace(key, key, key);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
index 22f5000..b6fe276 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
@@ -17,16 +17,35 @@
 
 package org.apache.ignite.startup.cmdline;
 
-import javax.imageio.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import javax.imageio.ImageIO;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
 
 /**
  * About dialog.
@@ -329,4 +348,4 @@ public class AboutDialog extends JDialog {
             }
         });
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
index c12d51b..4780ad5 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.startup.cmdline;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * Generates a random number and prints it to the console.
@@ -31,4 +31,4 @@ public class CommandLineRandomNumberGenerator {
     public static void main(String[] args) {
         System.out.println(UUID.randomUUID());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 5b39069..043d651 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -17,27 +17,40 @@
 
 package org.apache.ignite.startup.cmdline;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.swing.*;
-import java.awt.*;
-import java.io.*;
-import java.lang.reflect.*;
+import java.awt.Image;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.*;
-import java.text.*;
-import java.util.*;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
+import java.util.Locale;
+import java.util.concurrent.CountDownLatch;
+import javax.swing.ImageIcon;
+import org.apache.ignite.IgniteState;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.IgnitionListener;
+import org.apache.ignite.internal.util.GridConfigurationFinder;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteState.STOPPED;
+import static org.apache.ignite.IgniteState.STOPPED_ON_SEGMENTATION;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_PROG_NAME;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_RESTART_CODE;
+import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
+import static org.apache.ignite.internal.IgniteVersionUtils.RELEASE_DATE_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
 
 /**
  * This class defines command-line Ignite startup. This startup can be used to start Ignite
@@ -337,4 +350,4 @@ public final class CommandLineStartup {
         else
             System.exit(0);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
index ae0c587..be758fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.startup.cmdline;
 
-import java.io.*;
-import java.util.*;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This class is a workaround for a versatile problems with passing arguments to the Ignite Windows batch launcher
@@ -232,4 +233,4 @@ public class CommandLineTransformer {
     private boolean checkJVMOptionIsSupported(String jvmOpt) {
         return !(jvmOpt.contains("-XX:OnError") || jvmOpt.contains("-XX:OnOutOfMemoryError"));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/package-info.java b/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
index 7c5467f..45a87dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Contains Ignite runtime startup classes.
  */
-package org.apache.ignite.startup;
+package org.apache.ignite.startup;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
index 0c4e2d1..97edcbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.stream;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteDataStreamer;
 
 /**
  * Convenience adapter for streamers. Adapters are optional components for

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/StreamReceiver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamReceiver.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamReceiver.java
index a3d9dfb..c5f2f12 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamReceiver.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamReceiver.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.stream;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
 
 /**
  * Updates cache with batch of entries. Usually it is enough to configure {@link IgniteDataStreamer#allowOverwrite(boolean)}
@@ -39,4 +41,4 @@ public interface StreamReceiver<K, V> extends Serializable {
      * @throws org.apache.ignite.IgniteException If failed.
      */
     public void receive(IgniteCache<K, V> cache, Collection<Map.Entry<K, V>> entries) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
----------------------------------------------------------------------
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 3f22299..f0f41bf 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
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.stream;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-
-import javax.cache.processor.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheEntryProcessor;
 
 /**
  * Convenience adapter to transform update existing values in streaming cache
@@ -50,4 +53,4 @@ public abstract class StreamTransformer<K, V> implements StreamReceiver<K, V>, E
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/StreamTupleExtractor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamTupleExtractor.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamTupleExtractor.java
index d2a4ede..b6150ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamTupleExtractor.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamTupleExtractor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.stream;
 
-import java.util.*;
+import java.util.Map;
 
 /**
  * Stream tuple extractor to convert messages to Ignite key-value tuples.
@@ -30,4 +30,4 @@ public interface StreamTupleExtractor<T, K, V> {
      * @return Key-value tuple.
      */
     public Map.Entry<K, V> extract(T msg);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java
----------------------------------------------------------------------
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 a87ac94..69f664f 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
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.stream;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.lang.IgniteBiInClosure;
 
 /**
  * Convenience adapter to visit every key-value tuple in the stream. Note, that the visitor
@@ -50,4 +51,4 @@ public abstract class StreamVisitor<K, V> implements StreamReceiver<K, V>, Ignit
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/package-info.java b/modules/core/src/main/java/org/apache/ignite/stream/package-info.java
index 6451697..5469271 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Contains Ignite Streamer classes.
  */
-package org.apache.ignite.stream;
+package org.apache.ignite.stream;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketMessageConverter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketMessageConverter.java b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketMessageConverter.java
index 8161d86..03e82e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketMessageConverter.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketMessageConverter.java
@@ -28,4 +28,4 @@ public interface SocketMessageConverter<T> {
      * @return Converted object.
      */
     public T convert(byte[] msg);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
index 07ce77e..0d27af9 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
@@ -17,17 +17,28 @@
 
 package org.apache.ignite.stream.socket;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.stream.*;
-
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.nio.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteOrder;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.nio.GridBufferedParser;
+import org.apache.ignite.internal.util.nio.GridDelimitedParser;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioParser;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.stream.StreamAdapter;
+import org.apache.ignite.stream.StreamTupleExtractor;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Server that receives data from TCP socket, converts it to key-value pairs using {@link StreamTupleExtractor} and
@@ -215,4 +226,4 @@ public class SocketStreamer<T, K, V> extends StreamAdapter<T, K, V> {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java
----------------------------------------------------------------------
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 761dba6..35882b9 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
@@ -17,10 +17,18 @@
 
 package org.apache.ignite.thread;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * An {@link ExecutorService} that executes submitted tasks using pooled grid threads.
@@ -221,4 +229,4 @@ public class IgniteStripedThreadPoolExecutor implements ExecutorService {
     @Override public String toString() {
         return S.toString(IgniteStripedThreadPoolExecutor.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
----------------------------------------------------------------------
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 a956e30..6ea77ae 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
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.thread;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.worker.GridWorker;
 
 /**
  * This class adds some necessary plumbing on top of the {@link Thread} class.
@@ -105,4 +104,4 @@ public class IgniteThread extends Thread {
     @Override public String toString() {
         return S.toString(IgniteThread.class, this, "name", getName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java
index 57cdb49..cd0a9cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.thread;
 
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ThreadFactory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * This class provides implementation of {@link ThreadFactory} factory
@@ -58,4 +57,4 @@ public class IgniteThreadFactory implements ThreadFactory {
     @Override public Thread newThread(@NotNull Runnable r) {
         return new IgniteThread(gridName, threadName, r);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
index e0ba3d1..0af422f 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java
@@ -17,9 +17,14 @@
 
 package org.apache.ignite.thread;
 
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * An {@link ExecutorService} that executes submitted tasks using pooled grid threads.
@@ -247,4 +252,4 @@ public class IgniteThreadPoolExecutor extends ThreadPoolExecutor {
             hnd == null ? new AbortPolicy() : hnd
         );
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
index 256dcb4..a6e960d 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Grid cache transaction. Cache transactions have a default 2PC (two-phase-commit) behavior and
@@ -241,4 +243,4 @@ public interface Transaction extends AutoCloseable, IgniteAsyncSupport {
      */
     @IgniteAsyncSupported
     public void rollback() throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionConcurrency.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionConcurrency.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionConcurrency.java
index 64265a1..5b2aff1 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionConcurrency.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionConcurrency.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction concurrency control. See {@link Transaction} for more information
@@ -42,4 +42,4 @@ public enum TransactionConcurrency {
     @Nullable public static TransactionConcurrency fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionHeuristicException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionHeuristicException.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionHeuristicException.java
index fa82cf9..b3cc77c 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionHeuristicException.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionHeuristicException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown whenever grid transaction enters an unknown state.
@@ -48,4 +48,4 @@ public class TransactionHeuristicException extends IgniteException {
     public TransactionHeuristicException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionIsolation.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionIsolation.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionIsolation.java
index 1bc7f12..d7671f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionIsolation.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionIsolation.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines different cache transaction isolation levels. See {@link Transaction}
@@ -46,4 +46,4 @@ public enum TransactionIsolation {
     public static TransactionIsolation fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionMetrics.java
----------------------------------------------------------------------
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 0fd8f55..a5af51e 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Transaction metrics, shared across all caches.
@@ -50,4 +50,4 @@ public interface TransactionMetrics extends Serializable {
      * @return Number of transaction rollbacks.
      */
     public int txRollbacks();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionOptimisticException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionOptimisticException.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionOptimisticException.java
index 4dd9e12..7b8ad8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionOptimisticException.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionOptimisticException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown whenever grid transactions fail optimistically.
@@ -44,4 +44,4 @@ public class TransactionOptimisticException extends IgniteException {
     public TransactionOptimisticException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionRollbackException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionRollbackException.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionRollbackException.java
index c551328..d60087b 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionRollbackException.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionRollbackException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown whenever grid transactions has been automatically rolled back.
@@ -44,4 +44,4 @@ public class TransactionRollbackException extends IgniteException {
     public TransactionRollbackException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionState.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionState.java
index 5cacbf5..1980242 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionState.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionState.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache transaction state.
@@ -62,4 +62,4 @@ public enum TransactionState {
     @Nullable public static TransactionState fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/transactions/TransactionTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionTimeoutException.java
index 019c9dc..970672e 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionTimeoutException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown whenever grid transactions time out.
@@ -44,4 +44,4 @@ public class TransactionTimeoutException extends IgniteException {
     public TransactionTimeoutException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java b/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
index 764868d..66c66f3 100644
--- a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
+++ b/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
@@ -16,7 +16,11 @@
 
 package org.jetbrains.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * An element annotated with NotNull claims <code>null</code> value is <em>forbidden</em>
@@ -31,4 +35,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
 public @interface NotNull {
     String value() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
index 0b60ff7..d93f12e 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
@@ -15,10 +15,20 @@
 
 package org.jsr166;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
 
 /**
  * A hash table supporting full concurrency of retrievals and
@@ -3795,4 +3805,4 @@ public class ConcurrentHashMap8<K, V>
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
index 9c8c2db..75db13c 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
@@ -15,12 +15,18 @@
 
 package org.jsr166;
 
-import sun.misc.*;
-
-import java.lang.reflect.*;
-import java.security.*;
-import java.util.*;
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 import java.util.Queue;
+import sun.misc.Unsafe;
 
 
 /**
@@ -1729,4 +1735,4 @@ public class ConcurrentLinkedDeque8<E>
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
index 1de7cc1..5b7381e 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
@@ -11,11 +11,27 @@
 
 package org.jsr166;
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Deque;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q_OPTIMIZED_RMV;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q;
 
 /**
  * A hash table supporting full concurrency of retrievals and
@@ -2147,4 +2163,4 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
          */
         PER_SEGMENT_Q_OPTIMIZED_RMV
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/jsr166/LongAdder8.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/LongAdder8.java b/modules/core/src/main/java/org/jsr166/LongAdder8.java
index 79ea32e..2535cf4 100644
--- a/modules/core/src/main/java/org/jsr166/LongAdder8.java
+++ b/modules/core/src/main/java/org/jsr166/LongAdder8.java
@@ -14,8 +14,10 @@
 
 package org.jsr166;
 
-import java.io.*;
-import java.util.concurrent.atomic.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * One or more variables that together maintain an initially zero
@@ -206,4 +208,4 @@ public class LongAdder8 extends Striped64_8 implements Serializable {
         base = s.readLong();
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/jsr166/Striped64_8.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/Striped64_8.java b/modules/core/src/main/java/org/jsr166/Striped64_8.java
index 7281334..6f2f4f6 100644
--- a/modules/core/src/main/java/org/jsr166/Striped64_8.java
+++ b/modules/core/src/main/java/org/jsr166/Striped64_8.java
@@ -14,7 +14,7 @@
 
 package org.jsr166;
 
-import java.util.*;
+import java.util.Random;
 
 /**
  * A package-local class holding common representation and mechanics
@@ -347,4 +347,4 @@ abstract class Striped64_8 extends Number {
         }
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 212eb23..50ba241 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.fair.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Tests affinity function with different number of backups.
@@ -101,4 +103,4 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
index 4c27d50..2485cbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite;
 
-import junit.framework.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.io.*;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.apache.ignite.internal.util.typedef.X;
 
 /**
  *
@@ -139,4 +138,4 @@ public class GridSuppressedExceptionSelfTest extends TestCase {
         else
             generateException(calls - 1, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
index 2dc5faa..de09e06 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
@@ -17,14 +17,24 @@
 
 package org.apache.ignite;
 
-import org.apache.commons.io.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static junit.framework.Assert.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.util.Arrays;
+import org.apache.commons.io.IOUtils;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.Nullable;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
 
 /**
  * IO test utilities.
@@ -195,4 +205,4 @@ public final class GridTestIoUtils {
     private GridTestIoUtils() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
----------------------------------------------------------------------
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 018d2c5..a4dbe53 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * Test job.
@@ -47,4 +47,4 @@ public class GridTestJob extends ComputeJobAdapter {
 
         return argument(0);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestJobContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestJobContext.java b/modules/core/src/test/java/org/apache/ignite/GridTestJobContext.java
index cb8c187..2ad9e61 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestJobContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestJobContext.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test job context.
@@ -90,4 +90,4 @@ public class GridTestJobContext implements ComputeJobContext {
     @Override public void callcc() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestJobResult.java b/modules/core/src/test/java/org/apache/ignite/GridTestJobResult.java
index 74c18e8..cdba72b 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestJobResult.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestJobResult.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobResult;
 
 /**
  * Test job result.
@@ -92,4 +93,4 @@ public class GridTestJobResult implements ComputeJobResult {
     /** {@inheritDoc} */ @Override public ClusterNode getNode() { return node; }
 
     /** {@inheritDoc} */ @Override public ComputeJobContext getJobContext() { return jobCtx; }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/GridTestNodeStartup.java
index 5b43c88..386db54 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestNodeStartup.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import org.apache.ignite.internal.util.typedef.G;
 
 /**
  * Starts test node.
@@ -46,4 +45,4 @@ public class GridTestNodeStartup {
             G.stopAll(false);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
index f79dc6e..1e4bbc9 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P2;
 
 /**
  * Starts test node.
@@ -54,4 +54,4 @@ public class GridTestStoreNodeStartup {
             G.stopAll(false);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
----------------------------------------------------------------------
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 08a0994..dbe34c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * Test task.
@@ -50,4 +53,4 @@ public class GridTestTask extends ComputeTaskSplitAdapter<Object, Object> {
 
         return results;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/GridTestTaskSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestTaskSession.java b/modules/core/src/test/java/org/apache/ignite/GridTestTaskSession.java
index d2439a5..618cdbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestTaskSession.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestTaskSession.java
@@ -17,11 +17,19 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionAttributeListener;
+import org.apache.ignite.compute.ComputeTaskSessionScope;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test task session.
@@ -230,4 +238,4 @@ public class GridTestTaskSession implements ComputeTaskSession {
 
         return buf.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index 3679cdd..3d76268 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.fair.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
 
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests for {@link GridAffinityProcessor.CacheAffinityProxy}.
@@ -312,4 +318,4 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest {
     private Collection<ClusterNode> nodes() {
         return grid(0).cluster().nodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java
index 7078dde..63436ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.MarshallerContextTestImpl;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Base externalizable test class.
@@ -46,4 +48,4 @@ public class IgniteExternalizableAbstractTest extends GridCommonAbstractTest {
 
         return marshallers;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
index 4d91347..c9671fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.startup.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.startup.BasicWarmupClosure;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  *
@@ -79,4 +80,4 @@ public class IgniteWarmupClosureSelfTest extends GridCommonAbstractTest {
     public void testWarmupClosure() throws Exception {
         startGrid(1);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
index da27fb2..888904b 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java
@@ -17,21 +17,23 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.fair.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  *
@@ -189,4 +191,4 @@ public class IgniteClientNodeAffinityTest extends GridCommonAbstractTest {
             return true;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionNodesSelfTest.java
index b000b8d..cf57b66 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionNodesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionNodesSelfTest.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.cache.affinity.fair;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.TreeSet;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Tests partition fair affinity in real grid.
@@ -239,4 +242,4 @@ public class GridFairAffinityFunctionNodesSelfTest extends GridCommonAbstractTes
 
         throw new IllegalStateException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
index dcf4508..e746b42 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridFairAffinityFunctionSelfTest.java
@@ -17,14 +17,22 @@
 
 package org.apache.ignite.cache.affinity.fair;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.affinity.GridAffinityFunctionContextImpl;
+import org.apache.ignite.testframework.GridTestNode;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  *
@@ -259,4 +267,4 @@ public class GridFairAffinityFunctionSelfTest extends GridCommonAbstractTest {
     private static int deviation(int val, int ideal) {
         return Math.round(Math.abs(((float)val - ideal) / ideal * 100));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
index e51be58..eb1c455 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
@@ -17,17 +17,18 @@
 
 package org.apache.ignite.cache.affinity.fair;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  *
@@ -93,4 +94,4 @@ public class IgniteFairAffinityDynamicCacheSelfTest extends GridCommonAbstractTe
 
         destFut.get(2000L);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
index 8e53f05..010f1da 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
@@ -17,21 +17,25 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
-import java.io.*;
-import java.sql.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.configuration.Factory;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
 
 /**
  * Tests for store session listeners.
@@ -330,4 +334,4 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
      * @return Session listener factory.
      */
     protected abstract Factory<CacheStoreSessionListener> sessionListenerFactory();
-}
+}
\ No newline at end of file


[24/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index 31f4f24..3e1afc0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -17,25 +17,37 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.internal.util.typedef.internal.CU.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache sequence implementation.
@@ -575,4 +587,4 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
     @Override public String toString() {
         return S.toString(GridCacheAtomicSequenceImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceValue.java
index e6d6ceb..dd1a1d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceValue.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Sequence value.
@@ -81,4 +83,4 @@ public final class GridCacheAtomicSequenceValue implements GridCacheInternal, Ex
     @Override public String toString() {
         return S.toString(GridCacheAtomicSequenceValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedEx.java
index eea2204..6e111a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedEx.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteAtomicStamped;
 
 /**
  * Atomic stamped managed by cache ({@code 'Ex'} stands for external).
@@ -29,4 +29,4 @@ public interface GridCacheAtomicStampedEx<T, S> extends GridCacheRemovable, Igni
      * @return Atomic stamped key.
      */
     public GridCacheInternalKey key();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index d2dedeb..dff32eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -17,23 +17,31 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.internal.util.typedef.internal.CU.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+
+import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache atomic stamped implementation.
@@ -403,4 +411,4 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
     @Override public String toString() {
         return GridToStringBuilder.toString(GridCacheAtomicStampedImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
index f852597..e06ee2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Atomic stamped value.
@@ -119,4 +121,4 @@ public final class GridCacheAtomicStampedValue<T, S> implements GridCacheInterna
     @Override public String toString() {
         return GridToStringBuilder.toString(GridCacheAtomicStampedValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchEx.java
index 20bb2e4..ad0d279 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchEx.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCountDownLatch;
 
 /**
  * Grid cache count down latch ({@code 'Ex'} stands for external).
@@ -36,4 +36,4 @@ public interface GridCacheCountDownLatchEx extends IgniteCountDownLatch, GridCac
      * @param cnt New count.
      */
     public void onUpdate(int cnt);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
index 95b970a..cdd5f90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
@@ -17,22 +17,32 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.internal.util.typedef.internal.CU.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache count down latch implementation.
@@ -398,4 +408,4 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchValue.java
index dd7dad2..17a11af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchValue.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Count down latch value.
@@ -112,4 +114,4 @@ public final class GridCacheCountDownLatchValue implements GridCacheInternal, Ex
     @Override public String toString() {
         return S.toString(GridCacheCountDownLatchValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKey.java
index a06ca01..b7783c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
 
 /**
  * Key is used for caching data structure.
@@ -28,4 +28,4 @@ public interface GridCacheInternalKey extends GridCacheInternal {
      * @return Name of cache data structure.
      */
     public String name();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java
index fdf6464..ff07754 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Key is used for caching cache data structures.
@@ -86,4 +89,4 @@ public class GridCacheInternalKeyImpl implements GridCacheInternalKey, Externali
     @Override public String toString() {
         return S.toString(GridCacheInternalKeyImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
index 9fd7356..0e4aebc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
@@ -17,21 +17,38 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * Common code for {@link IgniteQueue} implementation.
@@ -1034,4 +1051,4 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T> imp
     @Override public String toString() {
         return S.toString(GridCacheQueueAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
index 4e51821..499e44f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Queue header.
@@ -196,4 +200,4 @@ public class GridCacheQueueHeader implements GridCacheInternal, Externalizable {
     @Override public String toString() {
         return S.toString(GridCacheQueueHeader.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeaderKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeaderKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeaderKey.java
index 1a9b9fd..0118b15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeaderKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeaderKey.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Queue header key.
@@ -85,4 +88,4 @@ public class GridCacheQueueHeaderKey implements Externalizable, GridCacheInterna
     @Override public String toString() {
         return S.toString(GridCacheQueueHeaderKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
index 2b1d106..c4cb7b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Queue item key.
@@ -118,4 +121,4 @@ class GridCacheQueueItemKey implements Externalizable, GridCacheInternal {
     @Override public String toString() {
         return S.toString(GridCacheQueueItemKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
index 8172dcf..f1fbe5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
@@ -17,17 +17,26 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheGateway;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache queue proxy.
@@ -768,4 +777,4 @@ public class GridCacheQueueProxy<T> implements IgniteQueue<T>, Externalizable {
     @Override public String toString() {
         return delegate.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheRemovable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheRemovable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheRemovable.java
index dd4f2cc..e222e57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheRemovable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheRemovable.java
@@ -32,4 +32,4 @@ public interface GridCacheRemovable {
      *
      */
     public void needCheckNotRemoved();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
index d91aa60..c650b21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Cache set header.
@@ -82,4 +85,4 @@ public class GridCacheSetHeader implements GridCacheInternal, Externalizable {
     @Override public String toString() {
         return S.toString(GridCacheSetHeader.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeaderKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeaderKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeaderKey.java
index fd82e67..f26dbca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeaderKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeaderKey.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Set header key.
@@ -85,4 +88,4 @@ public class GridCacheSetHeaderKey implements Externalizable, GridCacheInternal
     @Override public String toString() {
         return S.toString(GridCacheSetHeaderKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 6d920fd..62eab61 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
@@ -17,24 +17,43 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheIteratorConverter;
+import org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryAdapter;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SET;
 
 /**
  * Cache set implementation.
@@ -603,4 +622,4 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite
             setName = U.readString(in);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
index 390b6df..d025dce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Set item key.
@@ -106,4 +109,4 @@ public class GridCacheSetItemKey implements GridCacheInternal, Externalizable {
     @Override public String toString() {
         return S.toString(GridCacheSetItemKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
index 90c26f0..9c47e1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheGateway;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Cache set proxy.
@@ -604,4 +612,4 @@ public class GridCacheSetProxy<T> implements IgniteSet<T>, Externalizable {
     @Override public String toString() {
         return delegate.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
index 7ae5974..e8b2cc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Predicate for query over {@link IgniteSet} items.
@@ -113,4 +118,4 @@ public class GridSetQueryPredicate<K, V> implements IgniteBiPredicate<K, V>, Ext
     @Override public String toString() {
         return S.toString(GridSetQueryPredicate.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
index 1304326..94cbfbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * {@link org.apache.ignite.IgniteQueue} implementation using transactional cache.
@@ -237,4 +241,4 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
             throw U.convertException(e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrType.java
index ac1c19c..a3c0001 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrType.java
@@ -35,4 +35,4 @@ public enum GridDrType {
 
     /** Replication during preload. */
     DR_PRELOAD
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
index e5bbe39..0cec1fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
@@ -17,18 +17,32 @@
 
 package org.apache.ignite.internal.processors.dr;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.stream.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheProxyImpl;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrExpirationInfo;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerCacheUpdaters;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.stream.StreamReceiver;
 
 /**
  * Data center replication cache receiver for data streamer.
@@ -90,4 +104,4 @@ public class IgniteDrDataStreamerCacheUpdater implements StreamReceiver<KeyCache
             throw U.convertException(e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/Hadoop.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/Hadoop.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/Hadoop.java
index 9efc4a9..61bfec9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/Hadoop.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/Hadoop.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.hadoop.counter.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.HadoopConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Hadoop facade providing access to Ignite Hadoop features.
@@ -85,4 +85,4 @@ public interface Hadoop {
      * @throws IgniteCheckedException If failed.
      */
     public boolean kill(HadoopJobId jobId) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopFileBlock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopFileBlock.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopFileBlock.java
index 223e572..bc665eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopFileBlock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopFileBlock.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.net.URI;
+import java.util.Arrays;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Hadoop file block.
@@ -159,4 +161,4 @@ public class HadoopFileBlock extends HadoopInputSplit {
     public String toString() {
         return S.toString(HadoopFileBlock.class, this, "hosts", Arrays.toString(hosts));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopInputSplit.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopInputSplit.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopInputSplit.java
index 0c94012..998cb61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopInputSplit.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopInputSplit.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import java.io.*;
+import java.io.Externalizable;
 
 /**
  * Abstract fragment of an input data source.
@@ -51,4 +51,4 @@ public abstract class HadoopInputSplit implements Externalizable {
      * @return Hash code of the object.
      */
     @Override public abstract int hashCode();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJob.java
index 5fd6c81..2f6f6a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJob.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Hadoop job.
@@ -99,4 +99,4 @@ public interface HadoopJob {
      * Cleans up the job staging directory.
      */
     public void cleanupStagingDirectory();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
index b0593a8..8c61fab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Job ID.
@@ -100,4 +102,4 @@ public class HadoopJobId implements GridCacheInternal, Externalizable {
     @Override public String toString() {
         return nodeId + "_" + jobId;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
index d3735d5..eda8e97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Compact job description.
@@ -82,4 +82,4 @@ public interface HadoopJobInfo extends Serializable {
      * @return User name.
      */
     public String user();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobPhase.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobPhase.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobPhase.java
index 8c932bb..623ddda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobPhase.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobPhase.java
@@ -35,4 +35,4 @@ public enum HadoopJobPhase {
 
     /** Job has finished execution. */
     PHASE_COMPLETE
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
index 1a58624..b3fa4a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Enumeration of optional properties supported by Ignite for Apache Hadoop.
@@ -135,4 +135,4 @@ public enum HadoopJobProperty {
 
         return res == null ? dflt : Boolean.parseBoolean(res);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobStatus.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobStatus.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobStatus.java
index 752556d..a9a247a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobStatus.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobStatus.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Hadoop job status.
@@ -204,4 +207,4 @@ public class HadoopJobStatus implements Externalizable {
         failed = in.readBoolean();
         ver = in.readLong();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
index 3da2fb1..aadc2bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Map-reduce job execution plan.
@@ -77,4 +77,4 @@ public interface HadoopMapReducePlan extends Serializable {
      * @return Node ID.
      */
     public UUID nodeForReducer(int reducer);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
index ab885fe..185994f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Map-reduce execution planner.
@@ -37,4 +36,4 @@ public interface HadoopMapReducePlanner {
      */
     public HadoopMapReducePlan preparePlan(HadoopJob job, Collection<ClusterNode> top,
         @Nullable HadoopMapReducePlan oldPlan) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java
index 3b0f536..72b5050 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.hadoop.counter.*;
-import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.HadoopConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
 
 /**
  * Hadoop processor.
@@ -73,4 +74,4 @@ public class HadoopNoopProcessor extends HadoopProcessorAdapter {
     @Override public boolean kill(HadoopJobId jobId) throws IgniteCheckedException {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopPartitioner.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopPartitioner.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopPartitioner.java
index ec94f81..feb5f64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopPartitioner.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopPartitioner.java
@@ -30,4 +30,4 @@ public interface HadoopPartitioner {
      * @return Partition.
      */
     public int partition(Object key, Object val, int parts);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessorAdapter.java
index 44ff8be..3d381c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessorAdapter.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.hadoop.counter.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.HadoopConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
 
 /**
  * Hadoop processor.
@@ -93,4 +94,4 @@ public abstract class HadoopProcessorAdapter extends GridProcessorAdapter {
      * @throws IgniteCheckedException If failed.
      */
     public abstract boolean kill(HadoopJobId jobId) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSerialization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSerialization.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSerialization.java
index aab803b..69cfe36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSerialization.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopSerialization.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Hadoop serialization. Not thread safe object, must be created for each thread or correctly synchronized.
@@ -51,4 +51,4 @@ public interface HadoopSerialization extends AutoCloseable {
      * @throws IgniteCheckedException If failed.
      */
     @Override public void close() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTask.java
index 3ce83ae..bbee626 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTask.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Hadoop task.
@@ -69,4 +68,4 @@ public abstract class HadoopTask {
      * Interrupts task execution.
      */
     public abstract void cancel();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
index 3d2ee17..ecb9f26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.hadoop.counter.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Comparator;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounter;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
 
 /**
  * Task context.
@@ -199,4 +199,4 @@ public abstract class HadoopTaskContext {
      * @throws IgniteCheckedException On any error in callable.
      */
     public abstract <T> T runAsJobOwner(Callable<T> c) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInfo.java
index eb82cb4..b76fb85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInfo.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task info.
@@ -150,4 +152,4 @@ public class HadoopTaskInfo implements Externalizable {
     @Override public String toString() {
         return S.toString(HadoopTaskInfo.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInput.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInput.java
index ad6446f..3850d94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskInput.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Task input.
@@ -52,4 +51,4 @@ public interface HadoopTaskInput extends AutoCloseable {
      * @throws IgniteCheckedException If failed.
      */
     @Override public void close() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
index 41d9847..784b585 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Task output.
@@ -37,4 +37,4 @@ public interface HadoopTaskOutput extends AutoCloseable {
      * @throws IgniteCheckedException If failed.
      */
     @Override public void close() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
index a88e189..cf5c47e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.hadoop;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
 * Task type.
@@ -53,4 +53,4 @@ public enum HadoopTaskType {
     @Nullable public static HadoopTaskType fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounter.java
index 918c3bc..d3f920d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounter.java
@@ -41,4 +41,4 @@ public interface HadoopCounter {
      * @param cntr Counter to merge into this counter.
      */
     public void merge(HadoopCounter cntr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
index f21a1e6..6c033b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.hadoop.counter;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.hadoop.HadoopJob;
 
 /**
  * The object that writes some system counters to some storage for each running job. This operation is a part of
@@ -33,4 +33,4 @@ public interface HadoopCounterWriter {
      * @throws IgniteCheckedException If failed.
      */
     public void write(HadoopJob job, HadoopCounters cntrs) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounters.java
index 706ba77..dfe77a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounters.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounters.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.hadoop.counter;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * Counters store.
@@ -46,4 +46,4 @@ public interface HadoopCounters {
      * @param other Counters to merge with.
      */
     void merge(HadoopCounters other);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
index b551b7b..f4a8fad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Block write request acknowledgement message.
@@ -189,4 +189,4 @@ public class IgfsAckMessage extends IgfsCommunicationMessage {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
index 8099985..8653f90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsMetrics;
+import org.apache.ignite.igfs.IgfsOutputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathSummary;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.igfs.mapreduce.IgfsTask;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.internal.AsyncSupportAdapter;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Igfs supporting asynchronous operations.
@@ -314,4 +322,4 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFileSystem> impleme
     @Override public IgfsSecondaryFileSystem asSecondary() {
         return igfs.asSecondary();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
index 8e4dbbb..af9485e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * IGFS attributes.
@@ -183,4 +187,4 @@ public class IgfsAttributes implements Externalizable {
                 pathModes.put(U.readString(in), IgfsMode.fromOrdinal(in.readByte()));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
index efb84d4..a16e60b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
@@ -17,15 +17,21 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * File's binary data block key.
@@ -257,4 +263,4 @@ public final class IgfsBlockKey implements Message, Externalizable, Comparable<I
     @Override public String toString() {
         return S.toString(IgfsBlockKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockLocationImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockLocationImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockLocationImpl.java
index bbea11b..0ec31ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockLocationImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockLocationImpl.java
@@ -17,16 +17,22 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * File block location in the grid.
@@ -255,4 +261,4 @@ public class IgfsBlockLocationImpl implements IgfsBlockLocation, Externalizable
         this.names = names;
         this.hosts = hosts;
     }
-}
+}
\ No newline at end of file


[37/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 2acfd2b..079015c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -17,37 +17,115 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.portable.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.query.continuous.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.clock.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
-import org.apache.ignite.internal.processors.rest.handlers.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.collision.jobstealing.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.jsr166.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.GridJobCancelRequest;
+import org.apache.ignite.internal.GridJobExecuteRequest;
+import org.apache.ignite.internal.GridJobExecuteResponse;
+import org.apache.ignite.internal.GridJobSiblingsRequest;
+import org.apache.ignite.internal.GridJobSiblingsResponse;
+import org.apache.ignite.internal.GridTaskCancelRequest;
+import org.apache.ignite.internal.GridTaskSessionRequest;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentRequest;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentResponse;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage;
+import org.apache.ignite.internal.portable.PortableObjectImpl;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicateContainsValue;
+import org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate;
+import org.apache.ignite.internal.processors.cache.CacheEvictionEntry;
+import org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult;
+import org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEvictionRequest;
+import org.apache.ignite.internal.processors.cache.GridCacheEvictionResponse;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryResponse;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicDeferredUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.CacheVersionedValue;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearUnlockRequest;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequest;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponse;
+import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.transactions.TxEntryValueHolder;
+import org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage;
+import org.apache.ignite.internal.processors.clock.GridClockDeltaVersion;
+import org.apache.ignite.internal.processors.continuous.GridContinuousMessage;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse;
+import org.apache.ignite.internal.processors.igfs.IgfsAckMessage;
+import org.apache.ignite.internal.processors.igfs.IgfsBlockKey;
+import org.apache.ignite.internal.processors.igfs.IgfsBlocksMessage;
+import org.apache.ignite.internal.processors.igfs.IgfsDeleteMessage;
+import org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange;
+import org.apache.ignite.internal.processors.igfs.IgfsFragmentizerRequest;
+import org.apache.ignite.internal.processors.igfs.IgfsFragmentizerResponse;
+import org.apache.ignite.internal.processors.igfs.IgfsSyncMessage;
+import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest;
+import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse;
+import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest;
+import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse;
+import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryRequest;
+import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRequest;
+import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponse;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.spi.collision.jobstealing.JobStealingRequest;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Message factory implementation.
@@ -644,4 +722,4 @@ public class GridIoMessageFactory implements MessageFactory {
 
         CUSTOM.put(type, c);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
index b091d44..57622c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
@@ -51,4 +51,4 @@ public class GridIoPolicy {
     public static boolean isReservedGridIoPolicy(byte key) {
         return key >= 0 && key <= 31;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
index dff4197..50c34a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
@@ -17,18 +17,23 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * User message wrapper.
@@ -348,4 +353,4 @@ public class GridIoUserMessage implements Message {
     @Override public String toString() {
         return S.toString(GridIoUserMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
index f8cd78f..2d33a65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Special version of bi-predicate for messaging with initialize/close callbacks.
@@ -35,4 +35,4 @@ public interface GridLifecycleAwareMessageFilter<K, V> extends IgniteBiPredicate
      * Closes the filter.
      */
     public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridMessageListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridMessageListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridMessageListener.java
index 18aaee7..3993591 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridMessageListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridMessageListener.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import java.util.*;
+import java.util.EventListener;
+import java.util.UUID;
 
 /**
  * Listener for messages received from remote nodes.
@@ -31,4 +32,4 @@ public interface GridMessageListener extends EventListener {
      * @param msg Message received.
      */
     public void onMessage(UUID nodeId, Object msg);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
index 3d50520..f5aafb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
@@ -17,24 +17,36 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicStampedReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Represents single class deployment.
@@ -768,4 +780,4 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl
 
         return S.toString(GridDeployment.class, this, "undeployed", undeployed, "usage", stamp[0]);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
index 168216c..292f16e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
@@ -17,20 +17,30 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.GridBoundedLinkedHashSet;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Class loader that is able to resolve task subclasses and resources
@@ -798,4 +808,4 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf
             return S.toString(GridDeploymentClassLoader.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
index 3b886a5..833ceba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
@@ -17,26 +17,34 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.managers.communication.GridIoPolicy;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.GridBusyLock;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteNotPeerDeployable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_CLASSLOAD;
 
 /**
  * Communication helper class. Provides request and response sending methods.
@@ -482,4 +490,4 @@ class GridDeploymentCommunication {
             ctx.io().removeMessageListener(resTopic, resLsnr);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
index f211b76..b14fcce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfo.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Deployment info.
@@ -55,4 +55,4 @@ public interface GridDeploymentInfo {
      * @return Participant map for SHARED mode.
      */
     public Map<UUID, IgniteUuid> participants();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index 28ad0aa..203cf7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -17,16 +17,23 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Deployment info bean.
@@ -272,4 +279,4 @@ public class GridDeploymentInfoBean implements Message, GridDeploymentInfo, Exte
     @Override public String toString() {
         return S.toString(GridDeploymentInfoBean.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
index 6a15087..420eea8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
@@ -17,26 +17,43 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.deployment.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.events.DeploymentEvent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.util.GridAnnotationsCache;
+import org.apache.ignite.internal.util.GridClassLoaderCache;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.deployment.DeploymentListener;
+import org.apache.ignite.spi.deployment.DeploymentResource;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOY_FAILED;
+import static org.apache.ignite.events.EventType.EVT_CLASS_UNDEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOY_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED;
 
 /**
  * Storage for local deployments.
@@ -555,4 +572,4 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter {
             undeploy(ldr);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
index 75fb41e..a2da75c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
@@ -17,23 +17,33 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.deployment.protocol.gg.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.deployment.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.configuration.DeploymentMode.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.managers.deployment.protocol.gg.GridProtocolHandler;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.spi.deployment.IgnoreIfPeerClassLoadingDisabled;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.ISOLATED;
+import static org.apache.ignite.configuration.DeploymentMode.PRIVATE;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  * Deployment manager.
@@ -651,4 +661,4 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
             return S.toString(LocalDeployment.class, this, super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMetadata.java
index 2ce58ea..57e9e1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMetadata.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Deployment metadata.
@@ -288,4 +289,4 @@ class GridDeploymentMetadata {
     @Override public String toString() {
         return S.toString(GridDeploymentMetadata.class, this, "seqNum", clsLdrId != null ? clsLdrId.localId() : "n/a");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
index 52c8b0c..6ca74eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -17,22 +17,37 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.deployment.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.events.DeploymentEvent;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.GridAnnotationsCache;
+import org.apache.ignite.internal.util.GridClassLoaderCache;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+
+import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_CLASS_UNDEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED;
 
 /**
  * Deployment storage for {@link org.apache.ignite.configuration.DeploymentMode#PRIVATE} and
@@ -512,4 +527,4 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
             return S.toString(IsolatedDeployment.class, this, super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index 459fed6..6f9e968 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -17,27 +17,48 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.deployment.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.configuration.DeploymentMode.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.events.DeploymentEvent;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.GridAnnotationsCache;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.GridClassLoaderCache;
+import org.apache.ignite.internal.util.GridStripedLock;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
+import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_CLASS_UNDEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED;
 
 /**
  * Deployment storage for {@link org.apache.ignite.configuration.DeploymentMode#SHARED} and
@@ -1276,4 +1297,4 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
             return S.toString(SharedDeployment.class, this, "super", super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
index 1eec2c3..5ebf7b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Deployment request.
@@ -269,4 +273,4 @@ public class GridDeploymentRequest implements Message {
     @Override public String toString() {
         return S.toString(GridDeploymentRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
index f91bf27..a4ac280 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Grid deployment response containing requested resource bytes.
@@ -191,4 +192,4 @@ public class GridDeploymentResponse implements Message {
     @Override public String toString() {
         return S.toString(GridDeploymentResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStore.java
index 825689e..07e1e22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStore.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface for all deployment stores.
@@ -95,4 +96,4 @@ public interface GridDeploymentStore {
      */
     public void addParticipants(Map<UUID, IgniteUuid> allParticipants,
         Map<UUID, IgniteUuid> addedParticipants);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
index a7424a2..c2690b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.deployment.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Field;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Adapter for all store implementations.
@@ -155,4 +155,4 @@ abstract class GridDeploymentStoreAdapter implements GridDeploymentStore {
     @Override public String toString() {
         return S.toString(GridDeploymentStoreAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
index df5cc70..4a04cf5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.managers.deployment.protocol.gg;
 
-import org.apache.ignite.internal.managers.deployment.*;
-
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
 
 /**
  * Custom stream protocol handler implementation.
@@ -51,4 +52,4 @@ public class GridProtocolHandler extends URLStreamHandler {
     @Override protected URLConnection openConnection(URL url) throws IOException {
         return new GridUrlConnection(url, mgr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridUrlConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridUrlConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridUrlConnection.java
index 0230343..363f5c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridUrlConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridUrlConnection.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.managers.deployment.protocol.gg;
 
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Connection implementation for custom protocol.
@@ -71,4 +73,4 @@ public class GridUrlConnection extends URLConnection {
     @Override public InputStream getInputStream() throws IOException {
         return in;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
index 2005d4e..ab143fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Listener interface.
@@ -28,4 +28,4 @@ public interface CustomEventListener<T extends DiscoveryCustomMessage> {
      * @param msg Message.
      */
     public void onCustomEvent(ClusterNode snd, T msg);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
index 23f8bda..8f56248 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.spi.discovery.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -60,4 +60,4 @@ class CustomMessageWrapper implements DiscoverySpiCustomMessage {
     @Override public String toString() {
         return delegate.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
index 401486d..2ff40bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -51,4 +50,4 @@ public interface DiscoveryCustomMessage extends Serializable {
      * @return {@code true} if message can be modified during listener notification. Changes will be send to next nodes.
      */
     public boolean isMutable();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index a7363af..51d2911 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -17,48 +17,117 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.events.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.jobmetrics.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.lang.management.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.zip.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
-import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.*;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadMXBean;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.zip.CRC32;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridNodeOrderComparator;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.jobmetrics.GridJobMetrics;
+import org.apache.ignite.internal.processors.security.SecurityContext;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridTuple5;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.security.SecurityCredentials;
+import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange;
+import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport;
+import org.apache.ignite.spi.discovery.DiscoverySpiListener;
+import org.apache.ignite.spi.discovery.DiscoverySpiNodeAuthenticator;
+import org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_NODE_SEGMENTED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PEER_CLASSLOADING;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER;
+import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.NOOP;
 
 /**
  * Discovery SPI manager.
@@ -2833,4 +2902,4 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
             return near != null && !near;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryTopologySnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryTopologySnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryTopologySnapshot.java
index fd2a079..46d1dc5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryTopologySnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryTopologySnapshot.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Topology snapshot managed by discovery manager.
@@ -71,4 +70,4 @@ public class GridDiscoveryTopologySnapshot {
     @Override public String toString() {
         return S.toString(GridDiscoveryTopologySnapshot.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
index b4d1236..8f7f15e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * This class represents runtime information available for current VM.
@@ -213,4 +213,4 @@ public interface GridLocalMetrics extends Serializable {
      * @return The current number of live daemon threads.
      */
     public int getDaemonThreadCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index ae7049c..7b8c759 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -17,35 +17,61 @@
 
 package org.apache.ignite.internal.managers.eventstorage;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.events.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTopic;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.platform.PlatformAwareEventFilter;
+import org.apache.ignite.internal.processors.platform.PlatformLocalEventListener;
+import org.apache.ignite.internal.util.GridConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.GPR;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.eventstorage.EventStorageSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVTS_ALL;
+import static org.apache.ignite.events.EventType.EVTS_DISCOVERY_ALL;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.internal.GridTopic.TOPIC_EVENT;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
 
 /**
  * Grid event storage SPI manager.
@@ -1175,4 +1201,4 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
             return lsnr.hashCode();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
index dc80832..44ede9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal.managers.eventstorage;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Event storage message.
@@ -434,4 +440,4 @@ public class GridEventStorageMessage implements Message {
     @Override public String toString() {
         return S.toString(GridEventStorageMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
index 137b7b3..655cfcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.managers.eventstorage;
 
-import org.apache.ignite.events.*;
-
-import java.util.*;
+import java.util.EventListener;
+import org.apache.ignite.events.Event;
 
 /**
  * Listener for asynchronous local node grid events. You can subscribe for local node grid
@@ -36,4 +35,4 @@ public interface GridLocalEventListener extends EventListener {
      * @param evt local grid event.
      */
     public void onEvent(Event evt);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverContextImpl.java
index c2b104e..3985df7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverContextImpl.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.internal.managers.failover;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.loadbalancer.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.failover.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * GridFailoverContext implementation.
@@ -102,4 +102,4 @@ public class GridFailoverContextImpl implements FailoverContext {
     @Override public String toString() {
         return S.toString(GridFailoverContextImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverManager.java
index dffc965..fa22b62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/GridFailoverManager.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal.managers.failover;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.spi.failover.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.spi.failover.FailoverSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid failover spi manager.
@@ -70,4 +70,4 @@ public class GridFailoverManager extends GridManagerAdapter<FailoverSpi> {
         return getSpi(taskSes.getFailoverSpi()).failover(new GridFailoverContextImpl(taskSes, jobRes,
             ctx.loadBalancing(), affKey, affCacheName), top);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
index f1561bd..379f2b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.managers.indexing;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.indexing.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.SkipDaemon;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.util.GridEmptyCloseableIterator;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.indexing.IndexingQueryFilter;
+import org.apache.ignite.spi.indexing.IndexingSpi;
 
 /**
  * Manages cache indexing.
@@ -217,4 +221,4 @@ public class GridIndexingManager extends GridManagerAdapter<IndexingSpi> {
             busyLock.leaveBusy();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerAdapter.java
index d86a160..3b5f2bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerAdapter.java
@@ -17,9 +17,13 @@
 
 package org.apache.ignite.internal.managers.loadbalancer;
 
-import org.apache.ignite.compute.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import org.apache.ignite.compute.ComputeLoadBalancer;
 
 /**
  * This adapter allows for graceful exception when load balancer gets marshalled.
@@ -47,4 +51,4 @@ public abstract class GridLoadBalancerAdapter implements ComputeLoadBalancer, Ex
     protected Object readResolve() throws ObjectStreamException {
         throw new InvalidObjectException("Load balancer cannot be used from remote node.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerManager.java
index cd5de33..631168b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/GridLoadBalancerManager.java
@@ -17,17 +17,20 @@
 
 package org.apache.ignite.internal.managers.loadbalancer;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Load balancing manager.
@@ -99,4 +102,4 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
             }
         };
     }
-}
+}
\ No newline at end of file


[03/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
index bc6b443..3d5407a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
@@ -17,20 +17,26 @@
 
 package org.apache.ignite.internal.processors;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
-import java.io.*;
+import java.io.Serializable;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
 
 /**
  *
@@ -151,4 +157,4 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends GridCommonAbstractTe
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 7da3728..a39d796 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -17,19 +17,23 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Random;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests for {@link GridAffinityProcessor}.
@@ -185,4 +189,4 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
 
         assertTrue(diff < 25000);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
index a55eb26..fe82bca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
 
 /**
  * Tests affinity processor with rendezvous affinity function.
@@ -28,4 +28,4 @@ public class GridAffinityProcessorRendezvousSelfTest extends GridAffinityProcess
     @Override protected AffinityFunction affinityFunction() {
         return new RendezvousAffinityFunction();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index befd8c7..78d16f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -17,24 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.compute.ComputeTaskCancelledException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Test for {@link IgniteCompute#affinityCall(String, Object, IgniteCallable)} and
@@ -171,4 +175,4 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
index 44b27be..213a8de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
@@ -17,20 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.configuration.*;
-import javax.cache.processor.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import javax.cache.configuration.Factory;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
 
 /**
  * Tests for cache client without store.
@@ -225,4 +228,4 @@ public class CacheClientStoreSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
index a930d35..1133800 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Test for remove operation.
@@ -109,4 +110,4 @@ public class CacheDhtLocalPartitionAfterRemoveSelfTest extends GridCommonAbstrac
             return key.equals(((TestKey)obj).key);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
index 372c859..494ca52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Cache future self test.

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
index 5859bec..7a7aabe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Job tries to get cache during topology change.
@@ -107,4 +108,4 @@ public class CacheGetFromJobTest extends GridCacheAbstractSelfTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
index 5093af5..c0075ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
@@ -17,19 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  * Test for cluster wide cache metrics.
@@ -249,4 +252,4 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
index 4f20694..ce1c0f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePeekMode.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CachePeekMode.ONHEAP;
 
 /**
  *
@@ -137,4 +138,4 @@ public abstract class CacheNearUpdateTopologyChangeAbstractTest extends IgniteCa
 
         assertEquals((Object)2, nearCache.localPeek(key, ONHEAP));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
index f4d7607..f92560c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
@@ -17,18 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.local.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicOffHeapCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedOffHeapCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearOffHeapCacheEntry;
+import org.apache.ignite.internal.processors.cache.local.GridLocalCacheEntry;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * Cache map entry self test.
@@ -170,4 +180,4 @@ public class CacheOffheapMapEntrySelfTest extends GridCacheAbstractSelfTest {
             jcache.destroy();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
index 3ac7c3c..847a710 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  * Test for read through store.
@@ -29,4 +29,4 @@ public class CacheReadThroughAtomicRestartSelfTest extends CacheReadThroughResta
     @Override protected CacheAtomicityMode atomicityMode() {
         return ATOMIC;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalAtomicRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalAtomicRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalAtomicRestartSelfTest.java
index f0892ef..b9f5de7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalAtomicRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalAtomicRestartSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  * Test for read through store.
@@ -29,4 +29,4 @@ public class CacheReadThroughLocalAtomicRestartSelfTest extends CacheReadThrough
     @Override protected CacheAtomicityMode atomicityMode() {
         return ATOMIC;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalRestartSelfTest.java
index 7561edf..58fa8d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughLocalRestartSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheMode;
 
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
 
 /**
  * Test for read through store.
@@ -29,4 +29,4 @@ public class CacheReadThroughLocalRestartSelfTest extends CacheReadThroughRestar
     @Override protected CacheMode cacheMode() {
         return LOCAL;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedAtomicRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedAtomicRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedAtomicRestartSelfTest.java
index 0e179ff..73cceac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedAtomicRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedAtomicRestartSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  * Test for read through store.
@@ -29,4 +29,4 @@ public class CacheReadThroughReplicatedAtomicRestartSelfTest extends CacheReadTh
     @Override protected CacheAtomicityMode atomicityMode() {
         return ATOMIC;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedRestartSelfTest.java
index 5f1419c..45fafd1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughReplicatedRestartSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheMode;
 
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * Test for read through store.
@@ -29,4 +29,4 @@ public class CacheReadThroughReplicatedRestartSelfTest extends CacheReadThroughR
     @Override protected CacheMode cacheMode() {
         return REPLICATED;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
index 7d0cd4c..c606a2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
@@ -17,16 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Test for read through store.
@@ -130,4 +136,4 @@ public class CacheReadThroughRestartSelfTest extends GridCacheAbstractSelfTest {
             assertNotNull("Null value for key: " + key, cache.get(key));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
index 1d4d2f4..9aaef2f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Test remove all method.
@@ -78,4 +77,4 @@ public class CacheRemoveAllSelfTest extends GridCacheAbstractSelfTest {
                 0, locCache.localSize());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 17f0db7..29828af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -17,29 +17,33 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.*;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
 import javax.cache.CacheManager;
-import javax.cache.configuration.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import javax.cache.Caching;
+import javax.cache.configuration.MutableConfiguration;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Checks stop and destroy methods behavior.
@@ -769,4 +773,4 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
index 79a0293..0f16862 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
@@ -17,33 +17,41 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import javax.cache.integration.CacheLoaderException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.processors.cache.store.CacheLocalStore;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_GRID_NAME;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -302,4 +310,4 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
index 2d52933..44cd37e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
@@ -17,8 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
 
 /**
  *
@@ -166,4 +168,4 @@ public abstract class CacheStoreUsageMultinodeDynamicStartAbstractTest extends C
                 cache.destroy();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAtomicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAtomicTest.java
index 884dedd..71e6749 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAtomicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAtomicTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  *
@@ -29,4 +29,4 @@ public class CacheStoreUsageMultinodeDynamicStartAtomicTest extends CacheStoreUs
     @Override protected CacheAtomicityMode atomicityMode() {
         return ATOMIC;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartTxTest.java
index 825b450..4511fc5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartTxTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  *
@@ -29,4 +29,4 @@ public class CacheStoreUsageMultinodeDynamicStartTxTest extends CacheStoreUsageM
     @Override protected CacheAtomicityMode atomicityMode() {
         return TRANSACTIONAL;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAbstractTest.java
index c00d003..e16f16e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAbstractTest.java
@@ -17,13 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.transactions.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-
 /**
  *
  */
@@ -155,4 +148,4 @@ public abstract class CacheStoreUsageMultinodeStaticStartAbstractTest extends Ca
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAtomicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAtomicTest.java
index 6908aaa..54d51f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAtomicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartAtomicTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  *
@@ -29,4 +29,4 @@ public class CacheStoreUsageMultinodeStaticStartAtomicTest extends CacheStoreUsa
     @Override protected CacheAtomicityMode atomicityMode() {
         return ATOMIC;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartTxTest.java
index b42fd44..2f11fc8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeStaticStartTxTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  *
@@ -29,4 +29,4 @@ public class CacheStoreUsageMultinodeStaticStartTxTest extends CacheStoreUsageMu
     @Override protected CacheAtomicityMode atomicityMode() {
         return TRANSACTIONAL;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
index e5e6d72..1495a2b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
@@ -17,28 +17,41 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.fair.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -531,4 +544,4 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest {
             return old;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
index 18e7ca4..10189ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Base class for various tests for byte array values.
@@ -80,4 +80,4 @@ public abstract class GridCacheAbstractByteArrayValuesSelfTest extends GridCommo
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 3c74674..e55803a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -17,23 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CachePartialUpdateException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
 
 /**
  * Failover tests for cache.
@@ -369,4 +375,4 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
     private IgniteCache<String,Integer> cache(Ignite g) {
         return g.cache(null);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
index fb8ac74..353386b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 
 /**
  *
@@ -107,4 +110,4 @@ public abstract class GridCacheAbstractFailoverTxSelfTest extends GridCacheAbstr
     public void testPessimisticSerializableTxTopologyChange() throws Exception {
         testTopologyChange(PESSIMISTIC, SERIALIZABLE);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 41c2288..bfafe69 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -17,18 +17,27 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import com.google.common.collect.*;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import com.google.common.collect.ImmutableSet;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.CAX;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Multithreaded cache API tests.
@@ -348,4 +357,4 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
         return cacheAsync.<Boolean>future().get();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index f9a9e33..faebcfe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -17,46 +17,96 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import com.google.common.collect.*;
-import junit.framework.*;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.swapspace.inmemory.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePeekMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import javax.cache.Cache;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.expiry.TouchedExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import javax.cache.processor.MutableEntry;
+import junit.framework.AssertionFailedError;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
+import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.PA;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.swapspace.inmemory.GridTestSwapSpaceSpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CachePeekMode.ALL;
+import static org.apache.ignite.cache.CachePeekMode.BACKUP;
+import static org.apache.ignite.cache.CachePeekMode.OFFHEAP;
+import static org.apache.ignite.cache.CachePeekMode.ONHEAP;
+import static org.apache.ignite.cache.CachePeekMode.PRIMARY;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_SWAPPED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNSWAPPED;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
 
 /**
  * Full API cache test.
@@ -5123,4 +5173,4 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         /** */
         ONE_BY_ONE
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
index b6cf3dd..85e3d65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.CAX;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Tests for cache iterators.
@@ -142,4 +142,4 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
         }, 3, "iterator-thread");
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
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 157ba93..a8d025c 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
@@ -17,34 +17,49 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import com.google.common.collect.*;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import com.google.common.collect.Lists;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import javax.cache.expiry.CreatedExpiryPolicy;
+import javax.cache.expiry.Duration;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.processors.cache.store.CacheLocalStore;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  *
@@ -436,4 +451,4 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
             map.clear();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
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 bb1732e..4c04df0 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
@@ -17,21 +17,31 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.expiry.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.expiry.TouchedExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.transactions.Transaction;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * Cache metrics test.
@@ -933,4 +943,4 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
         assertEquals(0, entry.ttl());
         assertEquals(0, entry.expireTime());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 2b6a6b0..31488e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -17,23 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
 
 /**
  * Tests that removes are not lost when topology changes.
@@ -346,4 +355,4 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
 
         return ThreadLocalRandom.current().nextInt(min, max);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 4cd208d..f8fc3ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -17,34 +17,46 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.R1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Abstract class for cache tests.
@@ -548,4 +560,4 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
             return cacheStore();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
index cc96548..14d0be2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.transactions.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
 
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests value read inside transaction.
@@ -133,4 +137,4 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT
     @Override protected int gridCount() {
         return 1;
     }
-}
+}
\ No newline at end of file


[04/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index 610bec7..48039a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -17,21 +17,24 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
@@ -191,4 +194,4 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
index 14882ff..c74daca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
@@ -17,18 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.GridClosureCallMode.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
 
 /**
  *
@@ -100,4 +99,4 @@ public class IgniteComputeTopologyExceptionTest extends GridCommonAbstractTest {
             log.info("Expected exception: " + e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
index 1e14194..57f03b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
@@ -17,14 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Grid distributed executor test.
@@ -310,4 +317,4 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
             assert ignite != null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
index b55bb30..052ea95 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
@@ -17,18 +17,35 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.GridTestClassLoader;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  *
@@ -473,4 +490,4 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstract
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
index 415e7ec..ce45dc2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
 
 /**
  *
@@ -38,4 +38,4 @@ public class IgniteInternalCacheRemoveTest extends GridCacheAbstractSelfTest {
         assert jcache().remove("key", 1);
         assert !jcache().remove("key", 1);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
index a392245..760313b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
@@ -17,28 +17,31 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.event.CacheEntryListenerException;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteState;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.ContinuousQuery;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.event.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  *
@@ -185,4 +188,4 @@ public class IgniteSlowClientDetectionSelfTest extends GridCommonAbstractTest {
             System.out.println(">>>> Received update: " + iterable);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
index 4ed112d..04eb8ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
@@ -17,37 +17,37 @@
 
 package org.apache.ignite.internal.managers;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.internal.managers.collision.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.managers.failover.*;
-import org.apache.ignite.internal.managers.loadbalancer.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.sharedfs.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.spi.collision.fifoqueue.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.deployment.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.apache.ignite.spi.eventstorage.memory.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.testframework.junits.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
+import org.apache.ignite.internal.managers.collision.GridCollisionManager;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.failover.GridFailoverManager;
+import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.eventstorage.EventStorageSpi;
+import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
+import org.apache.ignite.testframework.junits.GridTestKernalContext;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Managers stop test.
@@ -222,4 +222,4 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest {
 
         mgr.stop(true);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
index e0a62e1..f2357db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridNoopManagerSelfTest.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.managers;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.testframework.GridStringLogger;
+import org.apache.ignite.testframework.junits.GridTestKernalContext;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Tests manager with {@link org.apache.ignite.spi.IgniteSpiNoop} SPI's.
@@ -93,4 +96,4 @@ public class GridNoopManagerSelfTest extends GridCommonAbstractTest {
     private static class NoopSpi extends Spi {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index e6c8889..1e30712 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -17,34 +17,53 @@
 
 package org.apache.ignite.internal.managers.checkpoint;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.checkpoint.cache.*;
-import org.apache.ignite.spi.checkpoint.jdbc.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.hsqldb.jdbc.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.compute.ComputeTaskSessionScope.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.CheckpointEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.lang.GridAbsClosureX;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.mxbean.IgniteMXBean;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.checkpoint.cache.CacheCheckpointSpi;
+import org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.hsqldb.jdbc.jdbcDataSource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.compute.ComputeTaskSessionScope.GLOBAL_SCOPE;
+import static org.apache.ignite.compute.ComputeTaskSessionScope.SESSION_SCOPE;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_LOADED;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_REMOVED;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_SAVED;
 
 /**
  *
@@ -755,4 +774,4 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
             throw new IgniteException(e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerSelfTest.java
index 653eb6e..414d05c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.managers.checkpoint;
 
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  *
@@ -65,4 +65,4 @@ public class GridCheckpointManagerSelfTest extends GridCheckpointManagerAbstract
     public void testMultiNodeDatabaseBased() throws Exception {
         doMultiNodeTest("jdbc");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index 0a6c0b4..1359a6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -17,25 +17,34 @@
 
 package org.apache.ignite.internal.managers.checkpoint;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.spi.checkpoint.cache.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.apache.ignite.spi.checkpoint.cache.CacheCheckpointSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Checkpoint tests.
@@ -229,4 +238,4 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationManagerListenersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationManagerListenersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationManagerListenersSelfTest.java
index 453e845..7613543 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationManagerListenersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationManagerListenersSelfTest.java
@@ -17,14 +17,22 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P2;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Grid communication manager self test.
@@ -155,4 +163,4 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 40931d8..6f762f3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -17,21 +17,24 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.util.typedef.CO;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Send message test.
@@ -165,4 +168,4 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
             return 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index eb1fd88..cdd119c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -17,28 +17,35 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.commons.collections.*;
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.mockito.*;
-
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTopic;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.testframework.GridTestNode;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.GridTestKernalContext;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mockito;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.argThat;
 import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
  * Test for {@link GridIoManager}.
@@ -245,4 +252,4 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
             return 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
index 62f5d41..247f16e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.deployment.*;
-import org.apache.ignite.testframework.junits.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.deployment.DeploymentListener;
+import org.apache.ignite.spi.deployment.DeploymentResource;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.testframework.junits.GridTestKernalContext;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Grid deployment manager stop test.
@@ -103,4 +106,4 @@ public class GridDeploymentManagerStopSelfTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @Override public void onClientReconnected(boolean clusterRestarted) { /* No-op. */ }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 728be6b..20c5b93 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -17,27 +17,28 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests message count for different deployment scenarios.
@@ -209,4 +210,4 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
             return dep;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridTestDeployment.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridTestDeployment.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridTestDeployment.java
index 57253ca..3bb5a20 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridTestDeployment.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridTestDeployment.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.managers.deployment;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Test class deployment.
@@ -36,4 +36,4 @@ public class GridTestDeployment extends GridDeployment {
         String userVer, String sampleClsName, boolean loc) {
         super(depMode, clsLdr, clsLdrId, userVer, sampleClsName, loc);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 6e199b8..e35333b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -17,26 +17,33 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  *
@@ -282,4 +289,4 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
             G.stop(g.name(), false);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
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 e76c615..144d5cf 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
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import static org.apache.ignite.configuration.DeploymentMode.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  * Tests for node attributes consistency checks.
@@ -186,4 +189,4 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA
     public static class ClientDiscovery extends GridDiscoveryManagerAttributesSelfTest {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
index 65aec49..7912ee1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -17,18 +17,21 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
@@ -208,4 +211,4 @@ public abstract class GridDiscoveryManagerSelfTest extends GridCommonAbstractTes
     public static class ClientDiscovery extends GridDiscoveryManagerSelfTest {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
----------------------------------------------------------------------
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 2ec4dec..58992af 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
@@ -17,21 +17,21 @@
 
 package org.apache.ignite.internal.managers.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.testframework.junits.logger.*;
-import org.apache.log4j.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger;
+import org.apache.log4j.Level;
 
 /**
  *
@@ -286,4 +286,4 @@ public class IgniteTopologyPrintFormatSelfTest extends GridCommonAbstractTest {
             logs.clear();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
index f0544e3..07aabb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.managers.events;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import static org.apache.ignite.events.EventType.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventAdapter;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteFutureTimeoutException;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.events.EventType.EVTS_ALL;
 
 /**
  * Tests for {@link GridEventStorageManager}.
@@ -122,4 +126,4 @@ public class GridEventStorageManagerSelfTest extends GridCommonAbstractTest {
             info("Caught expected exception: " + e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceCustomLocalValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceCustomLocalValue.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceCustomLocalValue.java
index 586a4ff..fd27c0a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceCustomLocalValue.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceCustomLocalValue.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.managers.swapspace;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  */
@@ -83,4 +82,4 @@ public class GridSwapSpaceCustomLocalValue implements Serializable {
     @Override public String toString() {
         return S.toString(GridSwapSpaceCustomLocalValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
index 043311e..7d7f0ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
@@ -17,21 +17,27 @@
 
 package org.apache.ignite.internal.managers.swapspace;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.SwapSpaceEvent;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.swapspace.SwapKey;
+import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.events.EventType.EVTS_SWAPSPACE;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_CLEARED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_READ;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_REMOVED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_STORED;
 
 /**
  * Tests for {@link GridSwapSpaceManager}.
@@ -161,4 +167,4 @@ public class GridSwapSpaceManagerSelfTest extends GridCommonAbstractTest {
 
         assert clearCnt.await(10, SECONDS) : "Count: " + clearCnt.getCount();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java
index 00705dc..59084db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java
@@ -17,26 +17,29 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Test for portable object affinity key.
@@ -212,4 +215,4 @@ public class GridPortableAffinityKeySelfTest extends GridCommonAbstractTest {
             this.affKey = affKey;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
index 1a41a4d..488361c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
@@ -17,26 +17,49 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.portable.mutabletest.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import com.google.common.collect.*;
-import org.junit.*;
-
-import java.lang.reflect.*;
-import java.sql.*;
-import java.util.*;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.lang.reflect.Field;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.*;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.portable.mutabletest.GridPortableMarshalerAwareTestClass;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.processors.cache.portable.IgnitePortablesImpl;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
+
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.Address;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.AddressBook;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.Company;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectAllTypes;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectArrayList;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectContainer;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectEnum;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectInner;
+import static org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectOuter;
 
 /**
  *
@@ -998,4 +1021,4 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         return new PortableBuilderImpl(processor.portableContext(), processor.typeId(aCls.getName()),
             aCls.getSimpleName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
index 6ffa3dd..3ba0a92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
@@ -17,21 +17,34 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.*;
-import sun.misc.*;
-
-import java.math.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectAllTypes;
+import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectContainer;
+import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectInner;
+import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectOuter;
+import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.TestObjectPlainPortable;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import sun.misc.Unsafe;
 
 /**
  * Portable builder test.
@@ -1004,4 +1017,4 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
             this.i = i;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsAdditionalSelfTest.java
index 71f670d..2fce1a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsAdditionalSelfTest.java
@@ -25,4 +25,4 @@ public class GridPortableBuilderStringAsCharsAdditionalSelfTest extends GridPort
     @Override protected boolean useUtf8() {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsSelfTest.java
index 4ba9dfa..5c53233 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderStringAsCharsSelfTest.java
@@ -25,4 +25,4 @@ public class GridPortableBuilderStringAsCharsSelfTest extends GridPortableBuilde
     @Override protected boolean useUtf8() {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
index 0cb6197..08dba92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.MarshallerContextAdapter;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  *
@@ -125,4 +125,4 @@ public class GridPortableMarshallerCtxDisabledSelfTest extends GridCommonAbstrac
         /** */
         private TestEnum[] enumArr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
index b9edd1d..11e316a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
@@ -17,29 +17,57 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jsr166.*;
-import sun.misc.*;
-
-import java.lang.reflect.*;
-import java.math.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetSocketAddress;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.*;
-import static org.junit.Assert.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerContextTestImpl;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableInvalidClassException;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.portable.PortableRawReader;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.apache.ignite.portable.PortableReader;
+import org.apache.ignite.portable.PortableSerializer;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.portable.PortableWriter;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jsr166.ConcurrentHashMap8;
+import sun.misc.Unsafe;
+
+import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.THREAD_LOCAL_ALLOC;
+import static org.junit.Assert.assertArrayEquals;
 
 /**
  * Portable marshaller tests.
@@ -3685,4 +3713,4 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
             rawValArr = rawReader.readDecimalArray();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java
index 47db42b..d329818 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataDisabledSelfTest.java
@@ -16,13 +16,16 @@
  */
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Arrays;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableReader;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.portable.PortableWriter;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test for disabled meta data.
@@ -215,4 +218,4 @@ public class GridPortableMetaDataDisabledSelfTest extends GridCommonAbstractTest
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
index e5ca91e..f6d7627 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
@@ -17,14 +17,23 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.math.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.apache.ignite.portable.PortableReader;
+import org.apache.ignite.portable.PortableWriter;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Portable meta data test.
@@ -340,4 +349,4 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
index 7e873f3..95dfbe8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerContextTestImpl;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Wildcards test.
@@ -477,4 +479,4 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
 
         assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableMarshalerAwareTestClass.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableMarshalerAwareTestClass.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableMarshalerAwareTestClass.java
index 0b1ecff..3244331 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableMarshalerAwareTestClass.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableMarshalerAwareTestClass.java
@@ -17,9 +17,14 @@
 
 package org.apache.ignite.internal.portable.mutabletest;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.testframework.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableRawReader;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.apache.ignite.portable.PortableReader;
+import org.apache.ignite.portable.PortableWriter;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -59,4 +64,4 @@ public class GridPortableMarshalerAwareTestClass implements PortableMarshalAware
     @Override public String toString() {
         return S.toString(GridPortableMarshalerAwareTestClass.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
index 8407495..ce97a8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/mutabletest/GridPortableTestClasses.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.internal.portable.mutabletest;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.portable.*;
-
-import com.google.common.base.*;
-
-import java.io.*;
-import java.util.*;
+import com.google.common.base.Throwables;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.portable.PortableObject;
 
 /**
  *
@@ -422,4 +429,4 @@ public class GridPortableTestClasses {
         }
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass1.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass1.java
index fa5b047..05a8c33 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass1.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass1.java
@@ -25,4 +25,4 @@ public class GridPortableTestClass1 {
     private static class InnerClass {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass2.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass2.java
index 52131a9..ba69991 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass2.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/test/GridPortableTestClass2.java
@@ -21,4 +21,4 @@ package org.apache.ignite.internal.portable.test;
  */
 public class GridPortableTestClass2 {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/portable/test/subpackage/GridPortableTestClass3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/test/subpackage/GridPortableTestClass3.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/test/subpackage/GridPortableTestClass3.java
index f620ea7..cf3aa2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/test/subpackage/GridPortableTestClass3.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/test/subpackage/GridPortableTestClass3.java
@@ -21,4 +21,4 @@ package org.apache.ignite.internal.portable.test.subpackage;
  */
 public class GridPortableTestClass3 {
     // No-op.
-}
+}
\ No newline at end of file


[51/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
master - imports


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

Branch: refs/heads/ignite-1093-2
Commit: 90e9555cde95535249d997d55933255283cf26e2
Parents: 5819434
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Aug 31 17:21:28 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Aug 31 17:23:54 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/schema/CacheConfig.java   |   9 +-
 .../java/org/apache/ignite/schema/Demo.java     |  22 +-
 .../java/org/apache/ignite/schema/DemoNode.java |   5 +-
 .../java/org/apache/ignite/schema/Person.java   |   1 -
 .../org/apache/ignite/schema/PersonKey.java     |   1 -
 .../ignite/examples/ExampleNodeStartup.java     |   5 +-
 .../apache/ignite/examples/ExamplesUtils.java   |  11 +-
 .../computegrid/ComputeAsyncExample.java        |  16 +-
 .../computegrid/ComputeBroadcastExample.java    |  16 +-
 .../computegrid/ComputeCallableExample.java     |  14 +-
 .../computegrid/ComputeClosureExample.java      |  14 +-
 .../ComputeContinuousMapperExample.java         |  32 ++-
 .../ComputeFibonacciContinuationExample.java    |  32 ++-
 .../computegrid/ComputeReducerExample.java      |  16 +-
 .../computegrid/ComputeRunnableExample.java     |  11 +-
 .../computegrid/ComputeTaskMapExample.java      |  23 +-
 .../computegrid/ComputeTaskSplitExample.java    |  20 +-
 .../cluster/ClusterGroupExample.java            |  16 +-
 .../computegrid/cluster/package-info.java       |   2 +-
 .../failover/ComputeFailoverExample.java        |  23 +-
 .../failover/ComputeFailoverNodeStartup.java    |  17 +-
 .../computegrid/failover/package-info.java      |   2 +-
 .../examples/computegrid/montecarlo/Credit.java |   4 +-
 .../montecarlo/CreditRiskExample.java           |  16 +-
 .../montecarlo/CreditRiskManager.java           |   5 +-
 .../computegrid/montecarlo/package-info.java    |   2 +-
 .../examples/computegrid/package-info.java      |   2 +-
 .../examples/datagrid/CacheAffinityExample.java |  20 +-
 .../examples/datagrid/CacheApiExample.java      |  15 +-
 .../examples/datagrid/CacheAsyncApiExample.java |  16 +-
 .../datagrid/CacheContinuousQueryExample.java   |  22 +-
 .../datagrid/CacheDataStreamerExample.java      |  11 +-
 .../examples/datagrid/CacheEventsExample.java   |  21 +-
 .../examples/datagrid/CachePutGetExample.java   |  13 +-
 .../examples/datagrid/CacheQueryExample.java    |  33 ++-
 .../datagrid/CacheTransactionExample.java       |  25 +-
 .../hibernate/HibernateL2CacheExample.java      |  35 ++-
 .../examples/datagrid/hibernate/Post.java       |  10 +-
 .../examples/datagrid/hibernate/User.java       |  13 +-
 .../datagrid/hibernate/package-info.java        |   2 +-
 .../ignite/examples/datagrid/package-info.java  |   2 +-
 .../starschema/CacheStarSchemaExample.java      |  26 +-
 .../datagrid/starschema/DimProduct.java         |   6 +-
 .../examples/datagrid/starschema/DimStore.java  |   6 +-
 .../datagrid/starschema/FactPurchase.java       |   6 +-
 .../datagrid/starschema/package-info.java       |   2 +-
 .../ignite/examples/datagrid/store/Person.java  |   3 +-
 .../store/auto/CacheAutoStoreExample.java       |  18 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |  16 +-
 .../datagrid/store/auto/CacheConfig.java        |  27 +-
 .../datagrid/store/auto/DbH2ServerStartup.java  |  15 +-
 .../datagrid/store/auto/package-info.java       |   2 +-
 .../store/dummy/CacheDummyPersonStore.java      |  24 +-
 .../store/dummy/CacheDummyStoreExample.java     |  25 +-
 .../datagrid/store/dummy/package-info.java      |   2 +-
 .../hibernate/CacheHibernatePersonStore.java    |  22 +-
 .../hibernate/CacheHibernateStoreExample.java   |  30 +-
 .../datagrid/store/hibernate/package-info.java  |   2 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |  29 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |  30 +-
 .../datagrid/store/jdbc/package-info.java       |   2 +-
 .../examples/datagrid/store/package-info.java   |   2 +-
 .../store/spring/CacheSpringPersonStore.java    |  31 +-
 .../store/spring/CacheSpringStoreExample.java   |  30 +-
 .../datagrid/store/spring/package-info.java     |   2 +-
 .../datastructures/IgniteAtomicLongExample.java |  13 +-
 .../IgniteAtomicReferenceExample.java           |  13 +-
 .../IgniteAtomicSequenceExample.java            |  10 +-
 .../IgniteAtomicStampedExample.java             |  13 +-
 .../IgniteCountDownLatchExample.java            |  13 +-
 .../IgniteExecutorServiceExample.java           |  13 +-
 .../datastructures/IgniteQueueExample.java      |  18 +-
 .../datastructures/IgniteSetExample.java        |  22 +-
 .../examples/datastructures/package-info.java   |   2 +-
 .../ignite/examples/events/EventsExample.java   |  25 +-
 .../ignite/examples/events/package-info.java    |   2 +-
 .../ignite/examples/igfs/IgfsExample.java       |  20 +-
 .../examples/igfs/IgfsMapReduceExample.java     |  35 ++-
 .../ignite/examples/igfs/IgfsNodeStartup.java   |   5 +-
 .../ignite/examples/igfs/package-info.java      |   2 +-
 .../examples/messaging/MessagingExample.java    |  21 +-
 .../messaging/MessagingPingPongExample.java     |  18 +-
 .../MessagingPingPongListenActorExample.java    |  20 +-
 .../ignite/examples/messaging/package-info.java |   2 +-
 .../client/memcache/MemcacheRestExample.java    |  17 +-
 .../MemcacheRestExampleNodeStartup.java         |  28 +-
 .../misc/client/memcache/package-info.java      |   2 +-
 .../examples/misc/client/package-info.java      |   2 +-
 .../misc/deployment/DeploymentExample.java      |  25 +-
 .../examples/misc/deployment/package-info.java  |   2 +-
 .../misc/lifecycle/LifecycleExample.java        |  16 +-
 .../examples/misc/lifecycle/package-info.java   |   2 +-
 .../ignite/examples/misc/package-info.java      |   2 +-
 .../misc/schedule/ComputeScheduleExample.java   |  15 +-
 .../examples/misc/schedule/package-info.java    |   2 +-
 .../misc/springbean/SpringBeanExample.java      |  13 +-
 .../examples/misc/springbean/package-info.java  |   2 +-
 .../apache/ignite/examples/package-info.java    |   2 +-
 .../examples/servicegrid/ServicesExample.java   |  16 +-
 .../examples/servicegrid/SimpleMapService.java  |   2 +-
 .../servicegrid/SimpleMapServiceImpl.java       |  12 +-
 .../examples/servicegrid/package-info.java      |   2 +-
 .../streaming/StreamTransformerExample.java     |  22 +-
 .../streaming/StreamVisitorExample.java         |  25 +-
 .../ignite/examples/streaming/package-info.java |   2 +-
 .../streaming/wordcount/CacheConfig.java        |  14 +-
 .../streaming/wordcount/QueryWords.java         |  16 +-
 .../streaming/wordcount/StreamWords.java        |  17 +-
 .../streaming/wordcount/package-info.java       |   2 +-
 .../socket/WordsSocketStreamerClient.java       |  19 +-
 .../socket/WordsSocketStreamerServer.java       |  30 +-
 .../wordcount/socket/package-info.java          |   2 +-
 .../java8/cluster/ClusterGroupExample.java      |  12 +-
 .../examples/java8/cluster/package-info.java    |   2 +-
 .../java8/computegrid/ComputeAsyncExample.java  |  16 +-
 .../computegrid/ComputeBroadcastExample.java    |  11 +-
 .../computegrid/ComputeCallableExample.java     |  14 +-
 .../computegrid/ComputeClosureExample.java      |  12 +-
 .../computegrid/ComputeRunnableExample.java     |  13 +-
 .../java8/computegrid/package-info.java         |   2 +-
 .../java8/datagrid/CacheAffinityExample.java    |  11 +-
 .../java8/datagrid/CacheApiExample.java         |  16 +-
 .../java8/datagrid/CacheAsyncApiExample.java    |  19 +-
 .../examples/java8/datagrid/package-info.java   |   2 +-
 .../IgniteExecutorServiceExample.java           |  13 +-
 .../java8/datastructures/package-info.java      |   2 +-
 .../examples/java8/events/EventsExample.java    |  25 +-
 .../examples/java8/events/package-info.java     |   2 +-
 .../java8/messaging/MessagingExample.java       |   8 +-
 .../messaging/MessagingPingPongExample.java     |  14 +-
 .../examples/java8/messaging/package-info.java  |   2 +-
 .../misc/schedule/ComputeScheduleExample.java   |  10 +-
 .../java8/misc/schedule/package-info.java       |   2 +-
 .../ignite/examples/java8/package-info.java     |   2 +-
 .../streaming/StreamTransformerExample.java     |  20 +-
 .../java8/streaming/StreamVisitorExample.java   |  24 +-
 .../examples/java8/streaming/package-info.java  |   2 +-
 .../BasicExamplesMultiNodeSelfTest.java         |   2 +-
 .../ignite/examples/BasicExamplesSelfTest.java  |  14 +-
 .../CacheExamplesMultiNodeSelfTest.java         |   2 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |  24 +-
 .../examples/CheckpointExamplesSelfTest.java    |   7 +-
 .../examples/ClusterGroupExampleSelfTest.java   |   6 +-
 .../ContinuationExamplesMultiNodeSelfTest.java  |   2 +-
 .../examples/ContinuationExamplesSelfTest.java  |   6 +-
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |   2 +-
 .../ContinuousMapperExamplesSelfTest.java       |   6 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/DeploymentExamplesSelfTest.java    |   6 +-
 .../EventsExamplesMultiNodeSelfTest.java        |   2 +-
 .../ignite/examples/EventsExamplesSelfTest.java |   6 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   4 +-
 .../HibernateL2CacheExampleSelfTest.java        |   6 +-
 .../ignite/examples/IgfsExamplesSelfTest.java   |   8 +-
 .../examples/LifecycleExamplesSelfTest.java     |   6 +-
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |   4 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |   7 +-
 .../examples/MessagingExamplesSelfTest.java     |   8 +-
 .../MonteCarloExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   6 +-
 .../examples/SpringBeanExamplesSelfTest.java    |   6 +-
 .../examples/TaskExamplesMultiNodeSelfTest.java |   2 +-
 .../ignite/examples/TaskExamplesSelfTest.java   |   7 +-
 .../testsuites/IgniteExamplesSelfTestSuite.java |  35 ++-
 .../BasicExamplesMultiNodeSelfTest.java         |   2 +-
 .../java8/examples/BasicExamplesSelfTest.java   |   3 +-
 .../CacheExamplesMultiNodeSelfTest.java         |   2 +-
 .../java8/examples/CacheExamplesSelfTest.java   |   4 +-
 .../examples/CheckpointExamplesSelfTest.java    |   3 +-
 .../examples/ClusterGroupExampleSelfTest.java   |   4 +-
 .../ContinuationExamplesMultiNodeSelfTest.java  |   2 +-
 .../examples/ContinuationExamplesSelfTest.java  |   3 +-
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |   2 +-
 .../ContinuousMapperExamplesSelfTest.java       |   4 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/DeploymentExamplesSelfTest.java    |   3 +-
 .../EventsExamplesMultiNodeSelfTest.java        |   2 +-
 .../java8/examples/EventsExamplesSelfTest.java  |   3 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   2 +-
 .../HibernateL2CacheExampleSelfTest.java        |   3 +-
 .../java8/examples/IgfsExamplesSelfTest.java    |   3 +-
 .../examples/LifecycleExamplesSelfTest.java     |   3 +-
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |   2 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |   3 +-
 .../examples/MessagingExamplesSelfTest.java     |   3 +-
 .../MonteCarloExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   3 +-
 .../examples/SpringBeanExamplesSelfTest.java    |   3 +-
 .../examples/TaskExamplesMultiNodeSelfTest.java |   2 +-
 .../java8/examples/TaskExamplesSelfTest.java    |   3 +-
 .../IgniteExamplesJ8SelfTestSuite.java          |   6 +-
 .../aop/aspectj/GridifyAspectJAspect.java       |  32 ++-
 .../aspectj/GridifySetToSetAspectJAspect.java   |  34 ++-
 .../aspectj/GridifySetToValueAspectJAspect.java |  34 ++-
 .../aop/spring/GridifySetToSetSpringAspect.java |  30 +-
 .../spring/GridifySetToValueSpringAspect.java   |  30 +-
 .../gridify/aop/spring/GridifySpringAspect.java |  28 +-
 .../aop/spring/GridifySpringEnhancer.java       |   6 +-
 .../aop/spring/GridifySpringPointcut.java       |  13 +-
 .../apache/ignite/gridify/AbstractAopTest.java  |  35 +--
 .../apache/ignite/gridify/BasicAopSelfTest.java |  21 +-
 .../ignite/gridify/GridifySetToSetTarget.java   |  17 +-
 .../gridify/GridifySetToSetTargetInterface.java |  11 +-
 .../ignite/gridify/GridifySetToValueTarget.java |  14 +-
 .../GridifySetToValueTargetInterface.java       |  10 +-
 .../GridifySetToXXXNonSpringAopSelfTest.java    |  13 +-
 .../GridifySetToXXXSpringAopSelfTest.java       |  15 +-
 .../ignite/gridify/NonSpringAopSelfTest.java    |   4 +-
 .../ignite/gridify/SpringAopSelfTest.java       |   6 +-
 .../apache/ignite/gridify/TestAopTarget.java    |  10 +-
 .../ignite/gridify/TestAopTargetInterface.java  |   7 +-
 .../ignite/gridify/TestGridifyException.java    |   2 +-
 .../apache/ignite/gridify/TestGridifyJob.java   |  11 +-
 .../apache/ignite/gridify/TestGridifyTask.java  |  14 +-
 .../gridify/hierarchy/GridifyHierarchyTest.java |   4 +-
 .../ignite/gridify/hierarchy/SuperTarget.java   |   4 +-
 .../apache/ignite/gridify/hierarchy/Target.java |   2 +-
 .../optimized/OptimizedMarshallerAopTest.java   |  20 +-
 .../apache/ignite/p2p/P2PGridifySelfTest.java   |  22 +-
 .../testsuites/IgniteAopSelfTestSuite.java      |  16 +-
 .../singlesplit/SingleSplitTestJobTarget.java   |   8 +-
 .../direct/singlesplit/SingleSplitTestTask.java |  22 +-
 .../singlesplit/SingleSplitsLoadTest.java       |  29 +-
 .../gridify/GridifyLoadTestJobTarget.java       |   4 +-
 .../loadtests/gridify/GridifyLoadTestTask.java  |  18 +-
 .../gridify/GridifySingleSplitLoadTest.java     |  31 +-
 .../org/test/gridify/ExternalAopTarget.java     |  10 +-
 .../test/gridify/ExternalGridifyException.java  |   2 +-
 .../org/test/gridify/ExternalGridifyTask.java   |  20 +-
 .../gridify/ExternalNonSpringAopSelfTest.java   |  17 +-
 .../spi/checkpoint/s3/S3CheckpointData.java     |   9 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |  58 ++--
 .../spi/checkpoint/s3/S3CheckpointSpiMBean.java |   6 +-
 .../ignite/spi/checkpoint/s3/S3TimeData.java    |   4 +-
 .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java |  46 +--
 .../s3/S3CheckpointManagerSelfTest.java         |  11 +-
 .../s3/S3CheckpointSpiConfigSelfTest.java       |   5 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |  32 ++-
 .../s3/S3CheckpointSpiStartStopSelfTest.java    |  11 +-
 .../s3/S3SessionCheckpointSelfTest.java         |  12 +-
 .../s3/TcpDiscoveryS3IpFinderSelfTest.java      |  16 +-
 .../ignite/testsuites/IgniteS3TestSuite.java    |  12 +-
 .../internal/TaskEventSubjectIdSelfTest.java    |  53 ++--
 .../ClientAbstractMultiThreadedSelfTest.java    |  62 ++--
 .../client/ClientDefaultCacheSelfTest.java      |  35 ++-
 .../internal/client/ClientGetAffinityTask.java  |  19 +-
 .../ignite/internal/client/ClientHttpTask.java  |  19 +-
 .../internal/client/ClientNodeStartup.java      |   9 +-
 .../client/ClientReconnectionSelfTest.java      |  16 +-
 .../internal/client/ClientSslNodeStartup.java   |   9 +-
 .../internal/client/ClientStartNodeTask.java    |  38 ++-
 .../internal/client/ClientStopNodeTask.java     |  26 +-
 .../internal/client/ClientStringLengthTask.java |  16 +-
 .../client/ClientTcpMultiThreadedSelfTest.java  |   4 +-
 .../ClientTcpSslAuthenticationSelfTest.java     |  30 +-
 .../ClientTcpSslMultiThreadedSelfTest.java      |   6 +-
 .../ignite/internal/client/ClientTcpTask.java   |  16 +-
 ...skExecutionAfterTopologyRestartSelfTest.java |  10 +-
 .../internal/client/ClientTestRestServer.java   |  43 ++-
 .../ignite/internal/client/HashMapStore.java    |  12 +-
 .../ignite/internal/client/SleepTestTask.java   |  16 +-
 .../client/TaskSingleJobSplitAdapter.java       |  14 +-
 .../client/impl/ClientCacheFlagsCodecTest.java  |  19 +-
 .../client/impl/ClientComputeImplSelfTest.java  |  16 +-
 .../client/impl/ClientDataImplSelfTest.java     |  11 +-
 .../impl/ClientFutureAdapterSelfTest.java       |  14 +-
 .../ClientPropertiesConfigurationSelfTest.java  |  41 ++-
 .../ClientAbstractConnectivitySelfTest.java     |  35 ++-
 .../ClientAbstractMultiNodeSelfTest.java        | 100 ++++---
 .../integration/ClientAbstractSelfTest.java     |  86 ++++--
 .../integration/ClientPreferDirectSelfTest.java |  43 ++-
 .../ClientTcpConnectivitySelfTest.java          |  15 +-
 .../ClientTcpDirectMultiNodeSelfTest.java       |  11 +-
 .../integration/ClientTcpDirectSelfTest.java    |  11 +-
 .../integration/ClientTcpMultiNodeSelfTest.java |   4 +-
 .../client/integration/ClientTcpSelfTest.java   |   6 +-
 .../ClientTcpSslDirectMultiNodeSelfTest.java    |  15 +-
 .../integration/ClientTcpSslDirectSelfTest.java |  13 +-
 .../ClientTcpSslMultiNodeSelfTest.java          |   8 +-
 .../integration/ClientTcpSslSelfTest.java       |   8 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |  22 +-
 .../client/router/ClientFailedInitSelfTest.java |  50 ++--
 .../client/router/RouterFactorySelfTest.java    |  23 +-
 .../router/TcpRouterAbstractSelfTest.java       |  22 +-
 .../router/TcpRouterMultiNodeSelfTest.java      |  23 +-
 .../client/router/TcpRouterSelfTest.java        |   4 +-
 .../client/router/TcpSslRouterSelfTest.java     |   8 +-
 .../client/suite/IgniteClientTestSuite.java     |  50 +++-
 .../client/util/ClientByteUtilsTest.java        |  24 +-
 .../util/ClientConsistentHashSelfTest.java      |  19 +-
 .../client/util/ClientJavaHasherSelfTest.java   |   9 +-
 .../rest/AbstractRestProcessorSelfTest.java     |  16 +-
 .../rest/ClientMemcachedProtocolSelfTest.java   |  27 +-
 .../JettyRestProcessorAbstractSelfTest.java     |  44 +--
 .../rest/JettyRestProcessorSignedSelfTest.java  |  16 +-
 .../JettyRestProcessorUnsignedSelfTest.java     |   2 +-
 .../rest/MemcacheRestProcessorTest.java         |  15 +-
 .../rest/RestBinaryProtocolSelfTest.java        |  52 ++--
 .../rest/RestMemcacheProtocolSelfTest.java      |  29 +-
 .../rest/RestProcessorMultiStartSelfTest.java   |   7 +-
 .../rest/RestProcessorStartSelfTest.java        |  34 ++-
 .../processors/rest/RestProcessorTest.java      |  30 +-
 .../rest/TaskCommandHandlerSelfTest.java        |  59 ++--
 .../processors/rest/TestBinaryClient.java       |  64 +++--
 .../processors/rest/TestMemcacheClient.java     |  34 ++-
 .../internal/processors/rest/TestTask1.java     |  16 +-
 .../internal/processors/rest/TestTask2.java     |  16 +-
 .../rest/protocols/tcp/MockNioSession.java      |  15 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |  43 +--
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |  37 +--
 .../ignite/jdbc/JdbcConnectionSelfTest.java     |  25 +-
 .../ignite/jdbc/JdbcEmptyCacheSelfTest.java     |  25 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |  31 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |  45 +--
 .../jdbc/JdbcPreparedStatementSelfTest.java     |  53 ++--
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |  47 ++--
 .../ignite/jdbc/JdbcStatementSelfTest.java      |  34 ++-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |  13 +-
 .../loadtests/client/ClientCacheBenchmark.java  |  28 +-
 .../client/ClientMarshallerBenchmarkTest.java   |  27 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |   8 +-
 .../cloud/TcpDiscoveryCloudIpFinder.java        |  57 ++--
 .../TcpDiscoveryCloudIpFinderSelfTest.java      |  15 +-
 .../ignite/testsuites/IgniteCloudTestSuite.java |   9 +-
 .../ignite/codegen/MessageCodeGenerator.java    |  49 +++-
 .../src/main/java/org/apache/ignite/Ignite.java |  28 +-
 .../org/apache/ignite/IgniteAtomicLong.java     |   4 +-
 .../apache/ignite/IgniteAtomicReference.java    |   4 +-
 .../org/apache/ignite/IgniteAtomicSequence.java |   4 +-
 .../org/apache/ignite/IgniteAtomicStamped.java  |   7 +-
 .../ignite/IgniteAuthenticationException.java   |   2 +-
 .../java/org/apache/ignite/IgniteCache.java     |  65 +++--
 .../apache/ignite/IgniteCheckedException.java   |   6 +-
 .../IgniteClientDisconnectedException.java      |   6 +-
 .../java/org/apache/ignite/IgniteCluster.java   |  23 +-
 .../java/org/apache/ignite/IgniteCompute.java   |  33 ++-
 .../org/apache/ignite/IgniteCountDownLatch.java |   6 +-
 .../org/apache/ignite/IgniteDataStreamer.java   |  15 +-
 .../ignite/IgniteDeploymentException.java       |   4 +-
 .../java/org/apache/ignite/IgniteEvents.java    |  18 +-
 .../java/org/apache/ignite/IgniteException.java |   6 +-
 .../org/apache/ignite/IgniteFileSystem.java     |  25 +-
 .../ignite/IgniteIllegalStateException.java     |   6 +-
 .../ignite/IgniteInterruptedException.java      |   2 +-
 .../org/apache/ignite/IgniteJdbcDriver.java     |  18 +-
 .../java/org/apache/ignite/IgniteLogger.java    |   6 +-
 .../java/org/apache/ignite/IgniteMessaging.java |  17 +-
 .../java/org/apache/ignite/IgnitePortables.java |  26 +-
 .../java/org/apache/ignite/IgniteQueue.java     |  10 +-
 .../java/org/apache/ignite/IgniteScheduler.java |  13 +-
 .../java/org/apache/ignite/IgniteServices.java  |  20 +-
 .../main/java/org/apache/ignite/IgniteSet.java  |   8 +-
 .../java/org/apache/ignite/IgniteState.java     |   6 +-
 .../apache/ignite/IgniteSystemProperties.java   |  11 +-
 .../org/apache/ignite/IgniteTransactions.java   |  12 +-
 .../main/java/org/apache/ignite/Ignition.java   |  22 +-
 .../org/apache/ignite/IgnitionListener.java     |   7 +-
 .../CacheAtomicUpdateTimeoutException.java      |   4 +-
 .../ignite/cache/CacheAtomicWriteOrderMode.java |   4 +-
 .../apache/ignite/cache/CacheAtomicityMode.java |   6 +-
 .../org/apache/ignite/cache/CacheEntry.java     |  11 +-
 .../CacheEntryEventSerializableFilter.java      |   6 +-
 .../ignite/cache/CacheEntryProcessor.java       |   6 +-
 .../ignite/cache/CacheExistsException.java      |   7 +-
 .../apache/ignite/cache/CacheInterceptor.java   |  15 +-
 .../ignite/cache/CacheInterceptorAdapter.java   |   9 +-
 .../org/apache/ignite/cache/CacheManager.java   |  55 ++--
 .../apache/ignite/cache/CacheMemoryMode.java    |   4 +-
 .../org/apache/ignite/cache/CacheMetrics.java   |  10 +-
 .../java/org/apache/ignite/cache/CacheMode.java |   8 +-
 .../cache/CachePartialUpdateException.java      |   9 +-
 .../org/apache/ignite/cache/CachePeekMode.java  |   6 +-
 .../apache/ignite/cache/CacheRebalanceMode.java |   6 +-
 .../cache/CacheServerNotFoundException.java     |   4 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |   7 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |  19 +-
 .../cache/CacheWriteSynchronizationMode.java    |   6 +-
 .../apache/ignite/cache/CachingProvider.java    |  30 +-
 .../apache/ignite/cache/affinity/Affinity.java  |  10 +-
 .../affinity/AffinityCentralizedFunction.java   |   7 +-
 .../ignite/cache/affinity/AffinityFunction.java |  10 +-
 .../cache/affinity/AffinityFunctionContext.java |  13 +-
 .../ignite/cache/affinity/AffinityKey.java      |  15 +-
 .../cache/affinity/AffinityKeyMapped.java       |  10 +-
 .../cache/affinity/AffinityKeyMapper.java       |   4 +-
 .../AffinityNodeAddressHashResolver.java        |  11 +-
 .../affinity/AffinityNodeHashResolver.java      |   9 +-
 .../affinity/AffinityNodeIdHashResolver.java    |  11 +-
 .../ignite/cache/affinity/AffinityUuid.java     |   6 +-
 .../affinity/fair/FairAffinityFunction.java     |  34 ++-
 .../rendezvous/RendezvousAffinityFunction.java  |  49 +++-
 .../ignite/cache/eviction/EvictableEntry.java   |   7 +-
 .../ignite/cache/eviction/EvictionFilter.java   |   7 +-
 .../ignite/cache/eviction/EvictionPolicy.java   |  10 +-
 .../cache/eviction/fifo/FifoEvictionPolicy.java |  27 +-
 .../eviction/fifo/FifoEvictionPolicyMBean.java  |   4 +-
 .../cache/eviction/igfs/IgfsEvictionFilter.java |   9 +-
 .../igfs/IgfsPerBlockLruEvictionPolicy.java     |  35 ++-
 .../IgfsPerBlockLruEvictionPolicyMXBean.java    |   9 +-
 .../cache/eviction/lru/LruEvictionPolicy.java   |  27 +-
 .../eviction/lru/LruEvictionPolicyMBean.java    |   4 +-
 .../eviction/random/RandomEvictionPolicy.java   |  24 +-
 .../random/RandomEvictionPolicyMBean.java       |   4 +-
 .../eviction/sorted/SortedEvictionPolicy.java   |  36 ++-
 .../sorted/SortedEvictionPolicyMBean.java       |   4 +-
 .../ignite/cache/query/ContinuousQuery.java     |  11 +-
 .../org/apache/ignite/cache/query/Query.java    |   9 +-
 .../apache/ignite/cache/query/QueryCursor.java  |   4 +-
 .../apache/ignite/cache/query/QueryMetrics.java |   4 +-
 .../apache/ignite/cache/query/ScanQuery.java    |  13 +-
 .../org/apache/ignite/cache/query/SpiQuery.java |  13 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |  12 +-
 .../org/apache/ignite/cache/query/SqlQuery.java |  14 +-
 .../apache/ignite/cache/query/TextQuery.java    |  12 +-
 .../query/annotations/QueryGroupIndex.java      |   7 +-
 .../cache/query/annotations/QuerySqlField.java  |  11 +-
 .../query/annotations/QuerySqlFunction.java     |   8 +-
 .../cache/query/annotations/QueryTextField.java |  11 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |  36 ++-
 .../apache/ignite/cache/store/CacheStore.java   |  20 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |  12 +-
 .../ignite/cache/store/CacheStoreSession.java   |  11 +-
 .../cache/store/CacheStoreSessionListener.java  |  12 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |  83 ++++--
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |  57 ++--
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |  22 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |  31 +-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |  21 +-
 .../jdbc/CacheJdbcStoreSessionListener.java     |  22 +-
 .../store/jdbc/dialect/BasicJdbcDialect.java    |  10 +-
 .../cache/store/jdbc/dialect/DB2Dialect.java    |   8 +-
 .../cache/store/jdbc/dialect/H2Dialect.java     |   7 +-
 .../cache/store/jdbc/dialect/JdbcDialect.java   |   6 +-
 .../cache/store/jdbc/dialect/MySQLDialect.java  |   8 +-
 .../cache/store/jdbc/dialect/OracleDialect.java |   8 +-
 .../store/jdbc/dialect/SQLServerDialect.java    |   8 +-
 .../org/apache/ignite/cluster/ClusterGroup.java |  17 +-
 .../cluster/ClusterGroupEmptyException.java     |   4 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |   6 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |  20 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |   4 +-
 .../cluster/ClusterTopologyException.java       |   8 +-
 .../ComputeExecutionRejectedException.java      |   6 +-
 .../org/apache/ignite/compute/ComputeJob.java   |  10 +-
 .../ignite/compute/ComputeJobAdapter.java       |   9 +-
 .../ignite/compute/ComputeJobAfterSend.java     |   8 +-
 .../compute/ComputeJobBeforeFailover.java       |   8 +-
 .../ignite/compute/ComputeJobContext.java       |  10 +-
 .../ignite/compute/ComputeJobContinuation.java  |   4 +-
 .../compute/ComputeJobContinuationAdapter.java  |   6 +-
 .../compute/ComputeJobFailoverException.java    |  12 +-
 .../compute/ComputeJobMasterLeaveAware.java     |   4 +-
 .../apache/ignite/compute/ComputeJobResult.java |  10 +-
 .../ignite/compute/ComputeJobResultPolicy.java  |   7 +-
 .../ignite/compute/ComputeJobSibling.java       |   9 +-
 .../ignite/compute/ComputeLoadBalancer.java     |  12 +-
 .../org/apache/ignite/compute/ComputeTask.java  |  14 +-
 .../ignite/compute/ComputeTaskAdapter.java      |   9 +-
 .../compute/ComputeTaskCancelledException.java  |   6 +-
 .../compute/ComputeTaskContinuousMapper.java    |  11 +-
 .../ignite/compute/ComputeTaskFuture.java       |  10 +-
 .../ignite/compute/ComputeTaskMapAsync.java     |  10 +-
 .../apache/ignite/compute/ComputeTaskName.java  |   8 +-
 .../compute/ComputeTaskNoResultCache.java       |  10 +-
 .../ignite/compute/ComputeTaskSession.java      |  15 +-
 .../ComputeTaskSessionAttributeListener.java    |   4 +-
 .../compute/ComputeTaskSessionFullSupport.java  |  10 +-
 .../ignite/compute/ComputeTaskSessionScope.java |   4 +-
 .../apache/ignite/compute/ComputeTaskSpis.java  |   8 +-
 .../ignite/compute/ComputeTaskSplitAdapter.java |  17 +-
 .../compute/ComputeTaskTimeoutException.java    |   6 +-
 .../compute/ComputeUserUndeclaredException.java |   6 +-
 .../apache/ignite/compute/gridify/Gridify.java  |  15 +-
 .../ignite/compute/gridify/GridifyArgument.java |   4 +-
 .../ignite/compute/gridify/GridifyInput.java    |   8 +-
 .../compute/gridify/GridifyInterceptor.java     |   7 +-
 .../compute/gridify/GridifyNodeFilter.java      |   8 +-
 .../gridify/GridifyRuntimeException.java        |   4 +-
 .../ignite/compute/gridify/GridifySetToSet.java |  10 +-
 .../compute/gridify/GridifySetToValue.java      |  10 +-
 .../compute/gridify/GridifyTaskAdapter.java     |   7 +-
 .../gridify/GridifyTaskSplitAdapter.java        |   7 +-
 .../gridify/aop/GridifyArgumentAdapter.java     |   7 +-
 .../gridify/aop/GridifyDefaultRangeTask.java    |  46 ++-
 .../compute/gridify/aop/GridifyDefaultTask.java |  27 +-
 .../aop/GridifySetToSetAbstractAspect.java      |  27 +-
 .../aop/GridifySetToValueAbstractAspect.java    |  29 +-
 .../ignite/configuration/AddressResolver.java   |   9 +-
 .../configuration/AtomicConfiguration.java      |  10 +-
 .../configuration/CacheConfiguration.java       |  51 ++--
 .../configuration/CollectionConfiguration.java  |  23 +-
 .../configuration/ConnectorConfiguration.java   |  18 +-
 .../ConnectorMessageInterceptor.java            |   4 +-
 .../ignite/configuration/DeploymentMode.java    |   4 +-
 .../configuration/FileSystemConfiguration.java  |  17 +-
 .../configuration/HadoopConfiguration.java      |   6 +-
 .../configuration/IgniteConfiguration.java      | 106 +++----
 .../configuration/IgniteReflectionFactory.java  |  16 +-
 .../configuration/NearCacheConfiguration.java   |  13 +-
 .../configuration/PlatformConfiguration.java    |   2 +-
 .../ignite/configuration/TopologyValidator.java |   9 +-
 .../configuration/TransactionConfiguration.java |   9 +-
 .../org/apache/ignite/events/CacheEvent.java    |  18 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |  18 +-
 .../ignite/events/CacheQueryReadEvent.java      |  18 +-
 .../ignite/events/CacheRebalancingEvent.java    |   8 +-
 .../apache/ignite/events/CheckpointEvent.java   |   7 +-
 .../apache/ignite/events/DeploymentEvent.java   |   7 +-
 .../apache/ignite/events/DiscoveryEvent.java    |  12 +-
 .../java/org/apache/ignite/events/Event.java    |  11 +-
 .../org/apache/ignite/events/EventAdapter.java  |  12 +-
 .../apache/ignite/events/EventLocalOrder.java   |   4 +-
 .../org/apache/ignite/events/EventType.java     |   9 +-
 .../org/apache/ignite/events/IgfsEvent.java     |  19 +-
 .../java/org/apache/ignite/events/JobEvent.java |  12 +-
 .../apache/ignite/events/SwapSpaceEvent.java    |   9 +-
 .../org/apache/ignite/events/TaskEvent.java     |  14 +-
 .../apache/ignite/igfs/IgfsBlockLocation.java   |   5 +-
 .../IgfsConcurrentModificationException.java    |   4 +-
 .../ignite/igfs/IgfsCorruptedFileException.java |   4 +-
 .../igfs/IgfsDirectoryNotEmptyException.java    |   4 +-
 .../org/apache/ignite/igfs/IgfsException.java   |   6 +-
 .../java/org/apache/ignite/igfs/IgfsFile.java   |   7 +-
 .../igfs/IgfsGroupDataBlocksKeyMapper.java      |   9 +-
 .../org/apache/ignite/igfs/IgfsInputStream.java |   5 +-
 .../igfs/IgfsInvalidHdfsVersionException.java   |   4 +-
 .../ignite/igfs/IgfsInvalidPathException.java   |   4 +-
 .../igfs/IgfsIpcEndpointConfiguration.java      |  10 +-
 .../apache/ignite/igfs/IgfsIpcEndpointType.java |   2 +-
 .../org/apache/ignite/igfs/IgfsMetrics.java     |   2 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |   4 +-
 .../ignite/igfs/IgfsOutOfSpaceException.java    |   4 +-
 .../apache/ignite/igfs/IgfsOutputStream.java    |   6 +-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |  23 +-
 .../igfs/IgfsPathAlreadyExistsException.java    |   5 +-
 .../igfs/IgfsPathIsDirectoryException.java      |   4 +-
 .../igfs/IgfsPathIsNotDirectoryException.java   |   4 +-
 .../ignite/igfs/IgfsPathNotFoundException.java  |   4 +-
 .../org/apache/ignite/igfs/IgfsPathSummary.java |  10 +-
 .../org/apache/ignite/igfs/IgfsUserContext.java |  11 +-
 .../ignite/igfs/mapreduce/IgfsFileRange.java    |   6 +-
 .../mapreduce/IgfsInputStreamJobAdapter.java    |  12 +-
 .../apache/ignite/igfs/mapreduce/IgfsJob.java   |  10 +-
 .../ignite/igfs/mapreduce/IgfsJobAdapter.java   |   2 +-
 .../igfs/mapreduce/IgfsRangeInputStream.java    |  12 +-
 .../igfs/mapreduce/IgfsRecordResolver.java      |  13 +-
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |  32 ++-
 .../ignite/igfs/mapreduce/IgfsTaskArgs.java     |   7 +-
 .../igfs/mapreduce/IgfsTaskNoReduceAdapter.java |   7 +-
 .../IgfsByteDelimiterRecordResolver.java        |  31 +-
 .../records/IgfsFixedLengthRecordResolver.java  |  18 +-
 .../records/IgfsNewLineRecordResolver.java      |   7 +-
 .../IgfsStringDelimiterRecordResolver.java      |  11 +-
 .../igfs/secondary/IgfsSecondaryFileSystem.java |  15 +-
 ...fsSecondaryFileSystemPositionedReadable.java |   5 +-
 .../ignite/internal/AsyncSupportAdapter.java    |   9 +-
 .../ClusterLocalNodeMetricsMXBeanImpl.java      |   8 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |  24 +-
 .../internal/ComputeTaskInternalFuture.java     |  35 ++-
 .../ignite/internal/GridCachePluginContext.java |  13 +-
 .../ignite/internal/GridClosureCallMode.java    |   4 +-
 .../apache/ignite/internal/GridComponent.java   |  17 +-
 .../apache/ignite/internal/GridDiagnostic.java  |  20 +-
 .../ignite/internal/GridDirectCollection.java   |  10 +-
 .../apache/ignite/internal/GridDirectMap.java   |   7 +-
 .../ignite/internal/GridDirectTransient.java    |   7 +-
 .../internal/GridEventConsumeHandler.java       |  54 ++--
 .../ignite/internal/GridInternalException.java  |   9 +-
 .../ignite/internal/GridInternalWrapper.java    |   2 +-
 .../ignite/internal/GridJobCancelRequest.java   |  17 +-
 .../ignite/internal/GridJobContextImpl.java     |  35 ++-
 .../ignite/internal/GridJobExecuteRequest.java  |  32 ++-
 .../ignite/internal/GridJobExecuteResponse.java |  24 +-
 .../ignite/internal/GridJobResultImpl.java      |  19 +-
 .../ignite/internal/GridJobSessionImpl.java     |  24 +-
 .../ignite/internal/GridJobSiblingImpl.java     |  30 +-
 .../ignite/internal/GridJobSiblingsRequest.java |  15 +-
 .../internal/GridJobSiblingsResponse.java       |  23 +-
 .../ignite/internal/GridKernalContext.java      |  96 ++++---
 .../ignite/internal/GridKernalContextImpl.java  | 133 +++++----
 .../ignite/internal/GridKernalGateway.java      |   7 +-
 .../ignite/internal/GridKernalGatewayImpl.java  |  23 +-
 .../apache/ignite/internal/GridKernalState.java |   4 +-
 .../apache/ignite/internal/GridLoggerProxy.java |  31 +-
 .../internal/GridMessageListenHandler.java      |  27 +-
 .../internal/GridNodeOrderComparator.java       |   9 +-
 .../internal/GridPerformanceSuggestions.java    |  18 +-
 .../ignite/internal/GridPluginComponent.java    |  20 +-
 .../ignite/internal/GridPluginContext.java      |  18 +-
 .../ignite/internal/GridProxyListener.java      |   4 +-
 .../ignite/internal/GridTaskCancelRequest.java  |  15 +-
 .../ignite/internal/GridTaskNameHashKey.java    |  10 +-
 .../ignite/internal/GridTaskSessionImpl.java    |  36 ++-
 .../internal/GridTaskSessionInternal.java       |  11 +-
 .../ignite/internal/GridTaskSessionRequest.java |  17 +-
 .../org/apache/ignite/internal/GridTopic.java   |  20 +-
 .../ignite/internal/GridUpdateNotifier.java     |  52 ++--
 ...gniteClientDisconnectedCheckedException.java |   6 +-
 .../internal/IgniteCodeGeneratingFail.java      |   7 +-
 .../ignite/internal/IgniteComponentType.java    |  13 +-
 .../ignite/internal/IgniteComputeImpl.java      |  52 ++--
 .../IgniteDeploymentCheckedException.java       |   6 +-
 .../ignite/internal/IgniteEventsImpl.java       |  32 ++-
 .../org/apache/ignite/internal/IgniteEx.java    |  22 +-
 .../IgniteFutureCancelledCheckedException.java  |   6 +-
 .../IgniteFutureTimeoutCheckedException.java    |   6 +-
 .../ignite/internal/IgniteInternalFuture.java   |  11 +-
 .../IgniteInterruptedCheckedException.java      |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    | 273 +++++++++++++-----
 .../ignite/internal/IgniteMessagingImpl.java    |  31 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   2 +-
 .../ignite/internal/IgniteProperties.java       |   7 +-
 .../ignite/internal/IgniteSchedulerImpl.java    |  21 +-
 .../ignite/internal/IgniteServicesImpl.java     |  28 +-
 .../ignite/internal/IgniteTransactionsEx.java   |  11 +-
 .../ignite/internal/IgniteVersionUtils.java     |   9 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 161 +++++++----
 .../ignite/internal/IgnitionMXBeanAdapter.java  |   7 +-
 .../internal/MarshallerContextAdapter.java      |  34 ++-
 .../ignite/internal/MarshallerContextImpl.java  |  31 +-
 .../org/apache/ignite/internal/SkipDaemon.java  |   7 +-
 .../internal/ThreadPoolMXBeanAdapter.java       |  13 +-
 .../ignite/internal/client/GridClient.java      |   5 +-
 .../GridClientAuthenticationException.java      |   2 +-
 .../internal/client/GridClientCacheFlag.java    |   4 +-
 .../internal/client/GridClientCacheMode.java    |   2 +-
 .../client/GridClientClosedException.java       |   2 +-
 .../internal/client/GridClientCompute.java      |  11 +-
 .../client/GridClientConfiguration.java         |  35 ++-
 .../ignite/internal/client/GridClientData.java  |   7 +-
 .../internal/client/GridClientDataAffinity.java |   4 +-
 .../client/GridClientDataConfiguration.java     |   5 +-
 .../internal/client/GridClientDataMetrics.java  |   4 +-
 .../client/GridClientDisconnectedException.java |   2 +-
 .../internal/client/GridClientException.java    |   6 +-
 .../internal/client/GridClientFactory.java      |  13 +-
 .../internal/client/GridClientFuture.java       |   4 +-
 .../client/GridClientFutureListener.java        |   2 +-
 .../GridClientFutureTimeoutException.java       |   2 +-
 .../client/GridClientHandshakeException.java    |   2 +-
 .../ignite/internal/client/GridClientNode.java  |  12 +-
 .../internal/client/GridClientNodeMetrics.java  |   4 +-
 .../client/GridClientPartitionAffinity.java     |  15 +-
 .../internal/client/GridClientPredicate.java    |   2 +-
 .../internal/client/GridClientProtocol.java     |   2 +-
 .../client/GridClientTopologyListener.java      |   2 +-
 .../client/GridServerUnreachableException.java  |   2 +-
 .../balancer/GridClientBalancerAdapter.java     |  11 +-
 .../client/balancer/GridClientLoadBalancer.java |   8 +-
 .../balancer/GridClientRandomBalancer.java      |  10 +-
 .../balancer/GridClientRoundRobinBalancer.java  |  18 +-
 .../impl/GridClientAbstractProjection.java      |  39 ++-
 .../client/impl/GridClientAndPredicate.java     |   4 +-
 .../client/impl/GridClientComputeImpl.java      |  30 +-
 .../client/impl/GridClientDataImpl.java         |  32 ++-
 .../impl/GridClientDataMetricsAdapter.java      |   4 +-
 .../client/impl/GridClientFutureAdapter.java    |  20 +-
 .../client/impl/GridClientFutureCallback.java   |   5 +-
 .../internal/client/impl/GridClientImpl.java    |  66 +++--
 .../client/impl/GridClientNodeImpl.java         |  23 +-
 .../impl/GridClientNodeMetricsAdapter.java      |   4 +-
 .../client/impl/GridClientThreadFactory.java    |   9 +-
 .../impl/connection/GridClientConnection.java   |  29 +-
 .../GridClientConnectionCloseReason.java        |   2 +-
 .../connection/GridClientConnectionManager.java |  15 +-
 .../GridClientConnectionManagerAdapter.java     |  79 ++++--
 .../GridClientConnectionManagerOsImpl.java      |  13 +-
 .../GridClientConnectionResetException.java     |   4 +-
 .../connection/GridClientNioTcpConnection.java  | 105 +++++--
 .../impl/connection/GridClientTopology.java     |  45 ++-
 .../GridConnectionIdleClosedException.java      |   2 +-
 .../client/marshaller/GridClientMarshaller.java |   6 +-
 .../marshaller/jdk/GridClientJdkMarshaller.java |  16 +-
 .../GridClientOptimizedMarshaller.java          |  24 +-
 .../client/router/GridRouterFactory.java        |  17 +-
 .../internal/client/router/GridTcpRouter.java   |   4 +-
 .../router/GridTcpRouterConfiguration.java      |  22 +-
 .../client/router/GridTcpRouterMBean.java       |   7 +-
 .../router/impl/GridRouterClientImpl.java       |  40 ++-
 .../impl/GridRouterCommandLineStartup.java      |  32 ++-
 .../client/router/impl/GridTcpRouterImpl.java   |  52 ++--
 .../impl/GridTcpRouterNioListenerAdapter.java   |  41 ++-
 .../impl/GridTcpRouterNioListenerOsImpl.java    |   4 +-
 .../router/impl/GridTcpRouterNioParser.java     |  28 +-
 .../client/ssl/GridSslBasicContextFactory.java  |  27 +-
 .../client/ssl/GridSslContextFactory.java       |   7 +-
 .../client/util/GridClientConsistentHash.java   |  25 +-
 .../client/util/GridClientStripedLock.java      |   5 +-
 .../internal/client/util/GridClientUtils.java   |  22 +-
 .../client/util/GridConcurrentHashSet.java      |   9 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  60 ++--
 .../ClusterGroupEmptyCheckedException.java      |   4 +-
 .../ignite/internal/cluster/ClusterGroupEx.java |  10 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |  21 +-
 .../cluster/ClusterStartNodeResultImpl.java     |   4 +-
 .../ClusterTopologyCheckedException.java        |   8 +-
 .../ClusterTopologyServerNotFoundException.java |   2 +-
 .../cluster/IgniteClusterAsyncImpl.java         |  34 ++-
 .../internal/cluster/IgniteClusterEx.java       |   4 +-
 .../internal/cluster/IgniteClusterImpl.java     |  70 +++--
 .../ignite/internal/cluster/IgniteKillTask.java |  24 +-
 .../ComputeTaskCancelledCheckedException.java   |   6 +-
 .../ComputeTaskTimeoutCheckedException.java     |   6 +-
 .../internal/direct/DirectByteBufferStream.java |  32 ++-
 .../internal/direct/DirectMessageReader.java    |  20 +-
 .../internal/direct/DirectMessageWriter.java    |  18 +-
 .../direct/DirectMessageWriterState.java        |   4 +-
 .../internal/events/DiscoveryCustomEvent.java   |  11 +-
 .../internal/executor/GridExecutorService.java  |  47 +++-
 .../igfs/common/IgfsControlResponse.java        |  42 ++-
 .../igfs/common/IgfsDataInputStream.java        |   7 +-
 .../igfs/common/IgfsDataOutputStream.java       |   8 +-
 .../igfs/common/IgfsHandshakeRequest.java       |   6 +-
 .../internal/igfs/common/IgfsIpcCommand.java    |   5 +-
 .../ignite/internal/igfs/common/IgfsLogger.java |  34 ++-
 .../internal/igfs/common/IgfsMarshaller.java    |  26 +-
 .../internal/igfs/common/IgfsMessage.java       |   2 +-
 .../igfs/common/IgfsPathControlRequest.java     |  13 +-
 .../internal/igfs/common/IgfsStatusRequest.java |   4 +-
 .../igfs/common/IgfsStreamControlRequest.java   |   6 +-
 .../ignite/internal/jdbc/JdbcConnection.java    |  47 +++-
 .../internal/jdbc/JdbcConnectionInfo.java       |   2 +-
 .../internal/jdbc/JdbcDatabaseMetadata.java     |  30 +-
 .../internal/jdbc/JdbcPreparedStatement.java    |  27 +-
 .../ignite/internal/jdbc/JdbcResultSet.java     |  38 ++-
 .../internal/jdbc/JdbcResultSetMetadata.java    |   7 +-
 .../ignite/internal/jdbc/JdbcStatement.java     |  25 +-
 .../apache/ignite/internal/jdbc/JdbcUtils.java  |  37 ++-
 .../ignite/internal/managers/GridManager.java   |   6 +-
 .../internal/managers/GridManagerAdapter.java   |  69 +++--
 .../checkpoint/GridCheckpointManager.java       |  65 +++--
 .../checkpoint/GridCheckpointRequest.java       |  15 +-
 .../GridCollisionJobContextAdapter.java         |  11 +-
 .../collision/GridCollisionManager.java         |  23 +-
 .../communication/GridDisconnectListener.java   |   4 +-
 .../managers/communication/GridIoManager.java   | 118 +++++---
 .../managers/communication/GridIoMessage.java   |  17 +-
 .../communication/GridIoMessageFactory.java     | 142 +++++++---
 .../managers/communication/GridIoPolicy.java    |   2 +-
 .../communication/GridIoUserMessage.java        |  31 +-
 .../GridLifecycleAwareMessageFilter.java        |   6 +-
 .../communication/GridMessageListener.java      |   5 +-
 .../managers/deployment/GridDeployment.java     |  50 ++--
 .../deployment/GridDeploymentClassLoader.java   |  40 ++-
 .../deployment/GridDeploymentCommunication.java |  50 ++--
 .../managers/deployment/GridDeploymentInfo.java |  10 +-
 .../deployment/GridDeploymentInfoBean.java      |  29 +-
 .../deployment/GridDeploymentLocalStore.java    |  59 ++--
 .../deployment/GridDeploymentManager.java       |  46 +--
 .../deployment/GridDeploymentMetadata.java      |  17 +-
 .../GridDeploymentPerLoaderStore.java           |  49 ++--
 .../GridDeploymentPerVersionStore.java          |  65 +++--
 .../deployment/GridDeploymentRequest.java       |  24 +-
 .../deployment/GridDeploymentResponse.java      |  15 +-
 .../deployment/GridDeploymentStore.java         |  13 +-
 .../deployment/GridDeploymentStoreAdapter.java  |  20 +-
 .../protocol/gg/GridProtocolHandler.java        |  11 +-
 .../protocol/gg/GridUrlConnection.java          |  14 +-
 .../managers/discovery/CustomEventListener.java |   4 +-
 .../discovery/CustomMessageWrapper.java         |   6 +-
 .../discovery/DiscoveryCustomMessage.java       |  11 +-
 .../discovery/GridDiscoveryManager.java         | 155 +++++++---
 .../GridDiscoveryTopologySnapshot.java          |  11 +-
 .../managers/discovery/GridLocalMetrics.java    |   4 +-
 .../eventstorage/GridEventStorageManager.java   |  86 ++++--
 .../eventstorage/GridEventStorageMessage.java   |  30 +-
 .../eventstorage/GridLocalEventListener.java    |   7 +-
 .../failover/GridFailoverContextImpl.java       |  22 +-
 .../managers/failover/GridFailoverManager.java  |  20 +-
 .../managers/indexing/GridIndexingManager.java  |  22 +-
 .../loadbalancer/GridLoadBalancerAdapter.java   |  12 +-
 .../loadbalancer/GridLoadBalancerManager.java   |  27 +-
 .../swapspace/GridSwapSpaceManager.java         |  46 +--
 .../internal/mxbean/IgniteStandardMXBean.java   |  21 +-
 .../portable/GridPortableMarshaller.java        |  10 +-
 .../portable/PortableAbstractLazyValue.java     |   2 +-
 .../internal/portable/PortableBuilderEnum.java  |   6 +-
 .../internal/portable/PortableBuilderImpl.java  |  34 ++-
 .../portable/PortableBuilderReader.java         |  15 +-
 .../PortableBuilderSerializationAware.java      |   2 +-
 .../portable/PortableBuilderSerializer.java     |  11 +-
 .../portable/PortableClassDescriptor.java       |  43 +--
 .../internal/portable/PortableContext.java      |  74 +++--
 .../portable/PortableEnumArrayLazyValue.java    |   7 +-
 .../portable/PortableLazyArrayList.java         |   7 +-
 .../portable/PortableLazyLinkedList.java        |   9 +-
 .../internal/portable/PortableLazyMap.java      |  12 +-
 .../internal/portable/PortableLazyMapEntry.java |   4 +-
 .../internal/portable/PortableLazySet.java      |   8 +-
 .../internal/portable/PortableLazyValue.java    |   2 +-
 .../portable/PortableMetaDataCollector.java     |  23 +-
 .../portable/PortableMetaDataHandler.java       |   5 +-
 .../internal/portable/PortableMetaDataImpl.java |  28 +-
 .../portable/PortableObjectArrayLazyValue.java  |   6 +-
 .../internal/portable/PortableObjectEx.java     |  21 +-
 .../internal/portable/PortableObjectImpl.java   |  36 ++-
 .../portable/PortableObjectOffheapImpl.java     |  33 ++-
 .../portable/PortablePlainLazyValue.java        |   2 +-
 .../portable/PortablePlainPortableObject.java   |   4 +-
 .../internal/portable/PortablePrimitives.java   |  10 +-
 .../internal/portable/PortableRawReaderEx.java  |   8 +-
 .../internal/portable/PortableRawWriterEx.java  |  10 +-
 .../portable/PortableReaderContext.java         |  13 +-
 .../internal/portable/PortableReaderExImpl.java | 109 +++++--
 .../PortableThreadLocalMemoryAllocator.java     |  11 +-
 .../ignite/internal/portable/PortableUtils.java |  65 ++++-
 .../portable/PortableValueWithType.java         |   6 +-
 .../internal/portable/PortableWriterExImpl.java |  81 ++++--
 .../streams/PortableAbstractInputStream.java    |   4 +-
 .../streams/PortableAbstractOutputStream.java   |   2 +-
 .../streams/PortableAbstractStream.java         |  10 +-
 .../streams/PortableHeapInputStream.java        |   4 +-
 .../streams/PortableHeapOutputStream.java       |   5 +-
 .../portable/streams/PortableInputStream.java   |   2 +-
 .../streams/PortableMemoryAllocator.java        |   2 +-
 .../streams/PortableOffheapInputStream.java     |   2 +-
 .../streams/PortableOffheapOutputStream.java    |   2 +-
 .../portable/streams/PortableOutputStream.java  |   2 +-
 .../streams/PortableSimpleMemoryAllocator.java  |   7 +-
 .../portable/streams/PortableStream.java        |   2 +-
 .../internal/processors/GridProcessor.java      |   6 +-
 .../processors/GridProcessorAdapter.java        |  23 +-
 .../affinity/AffinityTopologyVersion.java       |  16 +-
 .../affinity/GridAffinityAssignment.java        |  17 +-
 .../affinity/GridAffinityAssignmentCache.java   |  47 ++--
 .../GridAffinityFunctionContextImpl.java        |  14 +-
 .../affinity/GridAffinityMessage.java           |  21 +-
 .../affinity/GridAffinityProcessor.java         |  80 ++++--
 .../processors/affinity/GridAffinityUtils.java  |  41 +--
 ...acheAtomicUpdateTimeoutCheckedException.java |   4 +-
 .../processors/cache/CacheEntryImpl.java        |  14 +-
 .../processors/cache/CacheEntryImpl0.java       |  11 +-
 .../processors/cache/CacheEntryImplEx.java      |  13 +-
 .../cache/CacheEntryInfoCollection.java         |  15 +-
 .../processors/cache/CacheEntryPredicate.java   |   8 +-
 .../cache/CacheEntryPredicateAdapter.java       |  13 +-
 .../cache/CacheEntryPredicateContainsValue.java |  17 +-
 .../cache/CacheEntryPredicateHasValue.java      |   2 +-
 .../cache/CacheEntryPredicateNoValue.java       |   2 +-
 .../cache/CacheEntrySerializablePredicate.java  |  14 +-
 .../cache/CacheEvictableEntryImpl.java          |  23 +-
 .../processors/cache/CacheEvictionEntry.java    |  15 +-
 .../cache/CacheInvokeDirectResult.java          |  22 +-
 .../processors/cache/CacheInvokeEntry.java      |  14 +-
 .../processors/cache/CacheInvokeResult.java     |  17 +-
 .../cache/CacheIteratorConverter.java           |   2 +-
 .../processors/cache/CacheLazyEntry.java        |  12 +-
 .../processors/cache/CacheLockImpl.java         |  21 +-
 .../processors/cache/CacheMetricsImpl.java      |  19 +-
 .../cache/CacheMetricsMXBeanImpl.java           |   6 +-
 .../processors/cache/CacheMetricsSnapshot.java  |  14 +-
 .../internal/processors/cache/CacheObject.java  |   8 +-
 .../processors/cache/CacheObjectAdapter.java    |  19 +-
 .../cache/CacheObjectByteArrayImpl.java         |  22 +-
 .../processors/cache/CacheObjectContext.java    |  11 +-
 .../processors/cache/CacheObjectImpl.java       |   7 +-
 .../processors/cache/CacheOperationContext.java |  15 +-
 .../cache/CacheOsConflictResolutionManager.java |   8 +-
 .../CachePartialUpdateCheckedException.java     |  11 +-
 .../processors/cache/CachePeekModes.java        |   4 +-
 .../cache/CacheStoreBalancingWrapper.java       |  30 +-
 .../cache/CacheStorePartialUpdateException.java |   7 +-
 .../internal/processors/cache/CacheType.java    |   5 +-
 .../cache/CacheWeakQueryIteratorsHolder.java    |  21 +-
 .../cache/DynamicCacheChangeBatch.java          |  17 +-
 .../cache/DynamicCacheChangeRequest.java        |  16 +-
 .../cache/DynamicCacheDescriptor.java           |  20 +-
 .../processors/cache/GridCacheAdapter.java      | 185 ++++++++----
 .../cache/GridCacheAffinityManager.java         |  31 +-
 .../processors/cache/GridCacheAtomicFuture.java |   9 +-
 .../cache/GridCacheAtomicVersionComparator.java |   4 +-
 .../processors/cache/GridCacheAttributes.java   |  30 +-
 .../cache/GridCacheBatchSwapEntry.java          |  11 +-
 .../cache/GridCacheClearAllRunnable.java        |  18 +-
 .../cache/GridCacheConcurrentMap.java           |  60 ++--
 .../processors/cache/GridCacheContext.java      | 142 ++++++----
 .../GridCacheDefaultAffinityKeyMapper.java      |  29 +-
 .../cache/GridCacheDeploymentManager.java       |  68 +++--
 .../processors/cache/GridCacheEntryEx.java      |  34 +--
 .../processors/cache/GridCacheEntryInfo.java    |  20 +-
 .../GridCacheEntryInfoCollectSwapListener.java  |  10 +-
 .../processors/cache/GridCacheEntrySet.java     |  22 +-
 .../processors/cache/GridCacheEventManager.java |  30 +-
 .../cache/GridCacheEvictionManager.java         | 121 +++++---
 .../cache/GridCacheEvictionRequest.java         |  28 +-
 .../cache/GridCacheEvictionResponse.java        |  22 +-
 .../cache/GridCacheExplicitLockSpan.java        |  28 +-
 .../cache/GridCacheFilterFailedException.java   |   4 +-
 .../processors/cache/GridCacheFuture.java       |  14 +-
 .../processors/cache/GridCacheGateway.java      |  24 +-
 .../cache/GridCacheIndexUpdateException.java    |   6 +-
 .../processors/cache/GridCacheInternal.java     |   2 +-
 .../processors/cache/GridCacheIoManager.java    |  80 ++++--
 .../processors/cache/GridCacheIterator.java     |  14 +-
 .../processors/cache/GridCacheKeySet.java       |  18 +-
 .../cache/GridCacheLoaderWriterStore.java       |  22 +-
 .../GridCacheLoaderWriterStoreFactory.java      |  12 +-
 .../processors/cache/GridCacheLogger.java       |  23 +-
 .../processors/cache/GridCacheManager.java      |   6 +-
 .../cache/GridCacheManagerAdapter.java          |  12 +-
 .../processors/cache/GridCacheMapEntry.java     |  85 ++++--
 .../cache/GridCacheMapEntryFactory.java         |   6 +-
 .../processors/cache/GridCacheMessage.java      |  37 ++-
 .../cache/GridCacheMultiTxFuture.java           |  25 +-
 .../processors/cache/GridCacheMvcc.java         |  32 ++-
 .../processors/cache/GridCacheMvccCallback.java |   4 +-
 .../cache/GridCacheMvccCandidate.java           |  47 +++-
 .../processors/cache/GridCacheMvccFuture.java   |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  78 +++--
 .../cache/GridCacheOffheapSwapEntry.java        |  15 +-
 .../GridCachePartitionExchangeManager.java      | 105 ++++---
 .../processors/cache/GridCachePreloader.java    |  18 +-
 .../cache/GridCachePreloaderAdapter.java        |  23 +-
 .../processors/cache/GridCacheProcessor.java    | 186 ++++++++----
 .../processors/cache/GridCacheProxyImpl.java    |  54 ++--
 .../processors/cache/GridCacheReturn.java       |  35 ++-
 .../cache/GridCacheSharedContext.java           |  60 ++--
 .../cache/GridCacheSharedManager.java           |   6 +-
 .../cache/GridCacheSharedManagerAdapter.java    |  12 +-
 .../processors/cache/GridCacheSwapEntry.java    |   8 +-
 .../cache/GridCacheSwapEntryImpl.java           |  20 +-
 .../processors/cache/GridCacheSwapListener.java |   4 +-
 .../processors/cache/GridCacheSwapManager.java  |  75 +++--
 .../cache/GridCacheTryPutFailedException.java   |   4 +-
 .../processors/cache/GridCacheTtlManager.java   |  24 +-
 .../cache/GridCacheUpdateAtomicResult.java      |  16 +-
 .../cache/GridCacheUpdateTxResult.java          |   8 +-
 .../processors/cache/GridCacheUtilityKey.java   |   4 +-
 .../processors/cache/GridCacheUtils.java        | 130 ++++++---
 .../cache/GridCacheValueCollection.java         |  22 +-
 .../cache/IgniteCacheExpiryPolicy.java          |  15 +-
 .../processors/cache/IgniteCacheFutureImpl.java |  17 +-
 .../processors/cache/IgniteCacheProxy.java      |  96 +++++--
 .../processors/cache/IgniteInternalCache.java   |  53 ++--
 .../processors/cache/KeyCacheObject.java        |   2 +-
 .../processors/cache/KeyCacheObjectImpl.java    |   6 +-
 .../processors/cache/QueryCursorImpl.java       |  14 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |  28 +-
 .../cache/affinity/GridCacheAffinityProxy.java  |  22 +-
 .../CacheDataStructuresManager.java             |  78 +++--
 .../distributed/GridCacheCommittedTxInfo.java   |  22 +-
 .../distributed/GridCacheMappedVersion.java     |   6 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |  30 +-
 .../distributed/GridCacheTxFinishSync.java      |  27 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |  40 +--
 .../distributed/GridCacheTxRecoveryRequest.java |  18 +-
 .../GridCacheTxRecoveryResponse.java            |  16 +-
 .../distributed/GridDistributedBaseMessage.java |  32 ++-
 .../GridDistributedCacheAdapter.java            |  72 +++--
 .../distributed/GridDistributedCacheEntry.java  |  35 ++-
 .../distributed/GridDistributedLockRequest.java |  40 +--
 .../GridDistributedLockResponse.java            |  36 ++-
 .../GridDistributedTxFinishRequest.java         |  24 +-
 .../GridDistributedTxFinishResponse.java        |  18 +-
 .../distributed/GridDistributedTxMapping.java   |  34 ++-
 .../GridDistributedTxPrepareRequest.java        |  42 ++-
 .../GridDistributedTxPrepareResponse.java       |  21 +-
 .../GridDistributedTxRemoteAdapter.java         |  85 ++++--
 .../GridDistributedUnlockRequest.java           |  26 +-
 .../GridFutureRemapTimeoutObject.java           |  13 +-
 .../IgniteExternalizableExpiryPolicy.java       |  18 +-
 .../dht/GridClientPartitionTopology.java        |  48 ++--
 .../dht/GridDhtAffinityAssignmentRequest.java   |  16 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |  29 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |  37 +--
 .../cache/distributed/dht/GridDhtCache.java     |  15 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  91 ++++--
 .../distributed/dht/GridDhtCacheEntry.java      |  49 ++--
 .../distributed/dht/GridDhtEmbeddedFuture.java  |  16 +-
 .../distributed/dht/GridDhtFinishedFuture.java  |  10 +-
 .../cache/distributed/dht/GridDhtFuture.java    |   7 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  52 ++--
 .../dht/GridDhtInvalidPartitionException.java   |   2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  73 +++--
 .../distributed/dht/GridDhtLockFuture.java      |  84 ++++--
 .../distributed/dht/GridDhtLockRequest.java     |  47 ++--
 .../distributed/dht/GridDhtLockResponse.java    |  38 +--
 .../dht/GridDhtOffHeapCacheEntry.java           |   9 +-
 .../distributed/dht/GridDhtPartitionState.java  |   4 +-
 .../dht/GridDhtPartitionTopology.java           |  22 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  59 ++--
 .../dht/GridDhtPartitionsReservation.java       |  16 +-
 .../distributed/dht/GridDhtTopologyFuture.java  |   8 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  92 ++++--
 .../distributed/dht/GridDhtTxFinishFuture.java  |  52 ++--
 .../distributed/dht/GridDhtTxFinishRequest.java |  34 ++-
 .../dht/GridDhtTxFinishResponse.java            |  18 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |  65 +++--
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  79 ++++--
 .../cache/distributed/dht/GridDhtTxMapping.java |  21 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  99 +++++--
 .../dht/GridDhtTxPrepareRequest.java            |  45 +--
 .../dht/GridDhtTxPrepareResponse.java           |  40 ++-
 .../cache/distributed/dht/GridDhtTxRemote.java  |  49 ++--
 .../distributed/dht/GridDhtUnlockRequest.java   |  25 +-
 .../GridDhtUnreservedPartitionException.java    |   6 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |  20 +-
 .../dht/GridPartitionedGetFuture.java           |  72 +++--
 .../cache/distributed/dht/GridReservable.java   |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 138 ++++++---
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |  14 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |  22 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |   9 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  59 ++--
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  46 +--
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  32 ++-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  77 +++--
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  58 ++--
 .../atomic/GridNearAtomicUpdateResponse.java    |  41 ++-
 .../dht/colocated/GridDhtColocatedCache.java    |  78 +++--
 .../colocated/GridDhtColocatedCacheEntry.java   |  13 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  81 ++++--
 .../GridDhtColocatedOffHeapCacheEntry.java      |   9 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |  17 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |  70 +++--
 .../dht/preloader/GridDhtForceKeysRequest.java  |  33 ++-
 .../dht/preloader/GridDhtForceKeysResponse.java |  34 ++-
 .../GridDhtPartitionDemandMessage.java          |  30 +-
 .../preloader/GridDhtPartitionDemandPool.java   |  93 ++++--
 .../preloader/GridDhtPartitionExchangeId.java   |  31 +-
 .../dht/preloader/GridDhtPartitionFullMap.java  |  16 +-
 .../dht/preloader/GridDhtPartitionMap.java      |  22 +-
 .../GridDhtPartitionSupplyMessage.java          |  35 ++-
 .../preloader/GridDhtPartitionSupplyPool.java   |  56 ++--
 .../GridDhtPartitionsAbstractMessage.java       |  18 +-
 .../GridDhtPartitionsExchangeFuture.java        |  95 +++++--
 .../preloader/GridDhtPartitionsFullMessage.java |  30 +-
 .../GridDhtPartitionsSingleMessage.java         |  27 +-
 .../GridDhtPartitionsSingleRequest.java         |  12 +-
 .../dht/preloader/GridDhtPreloader.java         |  72 +++--
 .../preloader/GridDhtPreloaderAssignments.java  |  12 +-
 .../distributed/near/CacheVersionedValue.java   |  21 +-
 .../distributed/near/GridNearAtomicCache.java   |  75 +++--
 .../distributed/near/GridNearCacheAdapter.java  |  72 +++--
 .../near/GridNearCacheClearAllRunnable.java     |   9 +-
 .../distributed/near/GridNearCacheEntry.java    |  40 +--
 .../distributed/near/GridNearGetFuture.java     |  77 +++--
 .../distributed/near/GridNearGetRequest.java    |  43 +--
 .../distributed/near/GridNearGetResponse.java   |  40 +--
 .../distributed/near/GridNearLockFuture.java    |  78 +++--
 .../distributed/near/GridNearLockMapping.java   |  17 +-
 .../distributed/near/GridNearLockRequest.java   |  40 +--
 .../distributed/near/GridNearLockResponse.java  |  33 +--
 .../near/GridNearOffHeapCacheEntry.java         |   7 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  74 +++--
 .../GridNearPessimisticTxPrepareFuture.java     |  54 ++--
 .../near/GridNearTransactionalCache.java        |  64 +++--
 .../near/GridNearTxFinishFuture.java            |  58 ++--
 .../near/GridNearTxFinishRequest.java           |  26 +-
 .../near/GridNearTxFinishResponse.java          |  26 +-
 .../cache/distributed/near/GridNearTxLocal.java |  90 ++++--
 .../near/GridNearTxPrepareFutureAdapter.java    |  47 ++--
 .../near/GridNearTxPrepareRequest.java          |  37 +--
 .../near/GridNearTxPrepareResponse.java         |  45 +--
 .../distributed/near/GridNearTxRemote.java      |  39 ++-
 .../distributed/near/GridNearUnlockRequest.java |  14 +-
 .../cache/dr/GridCacheDrExpirationInfo.java     |   8 +-
 .../processors/cache/dr/GridCacheDrInfo.java    |  15 +-
 .../processors/cache/dr/GridCacheDrManager.java |  16 +-
 .../cache/dr/GridOsCacheDrManager.java          |  18 +-
 .../extras/GridCacheAttributesEntryExtras.java  |   8 +-
 .../GridCacheAttributesMvccEntryExtras.java     |  10 +-
 ...dCacheAttributesMvccObsoleteEntryExtras.java |  10 +-
 ...cheAttributesMvccObsoleteTtlEntryExtras.java |  10 +-
 .../GridCacheAttributesMvccTtlEntryExtras.java  |  10 +-
 .../GridCacheAttributesObsoleteEntryExtras.java |   8 +-
 ...idCacheAttributesObsoleteTtlEntryExtras.java |   8 +-
 .../GridCacheAttributesTtlEntryExtras.java      |   8 +-
 .../cache/extras/GridCacheEntryExtras.java      |   8 +-
 .../extras/GridCacheEntryExtrasAdapter.java     |   6 +-
 .../cache/extras/GridCacheMvccEntryExtras.java  |   8 +-
 .../GridCacheMvccObsoleteEntryExtras.java       |   8 +-
 .../GridCacheMvccObsoleteTtlEntryExtras.java    |   8 +-
 .../extras/GridCacheMvccTtlEntryExtras.java     |   7 +-
 .../extras/GridCacheObsoleteEntryExtras.java    |   8 +-
 .../extras/GridCacheObsoleteTtlEntryExtras.java |   8 +-
 .../cache/extras/GridCacheTtlEntryExtras.java   |   8 +-
 .../cache/jta/CacheJtaManagerAdapter.java       |  11 +-
 .../cache/jta/CacheNoopJtaManager.java          |   8 +-
 .../processors/cache/local/GridLocalCache.java  |  43 +--
 .../cache/local/GridLocalCacheEntry.java        |  21 +-
 .../cache/local/GridLocalLockCallback.java      |   4 +-
 .../cache/local/GridLocalLockFuture.java        |  42 ++-
 .../local/atomic/GridLocalAtomicCache.java      |  91 ++++--
 .../CacheDefaultPortableAffinityKeyMapper.java  |  12 +-
 .../portable/CacheObjectPortableContext.java    |  23 +-
 .../portable/CacheObjectPortableProcessor.java  |  18 +-
 .../CacheObjectPortableProcessorImpl.java       | 138 ++++++---
 .../cache/portable/IgnitePortablesImpl.java     |  19 +-
 .../cache/portable/PortableMetaDataKey.java     |  12 +-
 .../processors/cache/query/CacheQuery.java      |  18 +-
 .../CacheQueryCloseableScanBiPredicate.java     |   4 +-
 .../cache/query/CacheQueryFuture.java           |  11 +-
 .../processors/cache/query/CacheQueryType.java  |   2 +-
 .../GridCacheDistributedFieldsQueryFuture.java  |  20 +-
 .../query/GridCacheDistributedQueryFuture.java  |  25 +-
 .../query/GridCacheDistributedQueryManager.java |  58 ++--
 .../query/GridCacheLocalFieldsQueryFuture.java  |  17 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |  18 +-
 .../cache/query/GridCacheLocalQueryManager.java |  17 +-
 .../cache/query/GridCacheQueryAdapter.java      |  65 +++--
 .../cache/query/GridCacheQueryBean.java         |   9 +-
 .../cache/query/GridCacheQueryErrorFuture.java  |  13 +-
 .../query/GridCacheQueryFutureAdapter.java      |  43 ++-
 .../cache/query/GridCacheQueryInfo.java         |  12 +-
 .../cache/query/GridCacheQueryManager.java      | 149 +++++++---
 .../query/GridCacheQueryMetadataAware.java      |   9 +-
 .../query/GridCacheQueryMetricsAdapter.java     |  12 +-
 .../cache/query/GridCacheQueryMetricsKey.java   |  14 +-
 .../cache/query/GridCacheQueryRequest.java      |  41 +--
 .../cache/query/GridCacheQueryResponse.java     |  34 ++-
 .../query/GridCacheQueryResponseEntry.java      |  12 +-
 .../cache/query/GridCacheQueryType.java         |   4 +-
 .../cache/query/GridCacheSqlIndexMetadata.java  |   6 +-
 .../cache/query/GridCacheSqlMetadata.java       |  12 +-
 .../cache/query/GridCacheSqlQuery.java          |  24 +-
 .../cache/query/GridCacheTwoStepQuery.java      |  11 +-
 .../processors/cache/query/QueryCursorEx.java   |  11 +-
 .../continuous/CacheContinuousQueryEntry.java   |  29 +-
 .../continuous/CacheContinuousQueryEvent.java   |  14 +-
 .../CacheContinuousQueryFilterEx.java           |   4 +-
 .../continuous/CacheContinuousQueryHandler.java |  55 ++--
 .../CacheContinuousQueryListener.java           |   2 +-
 .../continuous/CacheContinuousQueryManager.java |  73 +++--
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |  46 +--
 .../query/jdbc/GridCacheQueryJdbcTask.java      |  62 ++--
 .../jdbc/GridCacheQueryJdbcValidationTask.java  |  25 +-
 .../processors/cache/store/CacheLocalStore.java |   8 +-
 .../cache/store/CacheOsStoreManager.java        |   8 +-
 .../cache/store/CacheStoreManager.java          |  24 +-
 .../store/GridCacheStoreManagerAdapter.java     |  69 +++--
 .../cache/store/GridCacheWriteBehindStore.java  |  55 ++--
 .../cache/transactions/IgniteInternalTx.java    |  40 ++-
 .../transactions/IgniteTransactionsImpl.java    |  24 +-
 .../cache/transactions/IgniteTxAdapter.java     | 113 +++++---
 .../cache/transactions/IgniteTxEntry.java       |  61 ++--
 .../cache/transactions/IgniteTxHandler.java     |  90 ++++--
 .../cache/transactions/IgniteTxKey.java         |  20 +-
 .../transactions/IgniteTxLocalAdapter.java      | 131 ++++++---
 .../cache/transactions/IgniteTxLocalEx.java     |  26 +-
 .../cache/transactions/IgniteTxManager.java     | 119 +++++---
 .../cache/transactions/IgniteTxMap.java         |  23 +-
 .../cache/transactions/IgniteTxRemoteEx.java    |   7 +-
 .../transactions/TransactionMetricsAdapter.java |  13 +-
 .../cache/transactions/TransactionProxy.java    |   4 +-
 .../transactions/TransactionProxyImpl.java      |  38 ++-
 .../cache/transactions/TxEntryValueHolder.java  |  31 +-
 .../version/CacheVersionConflictResolver.java   |   4 +-
 .../version/GridCachePlainVersionedEntry.java   |   6 +-
 .../version/GridCacheRawVersionedEntry.java     |  29 +-
 .../cache/version/GridCacheVersion.java         |  20 +-
 .../cache/version/GridCacheVersionAware.java    |   2 +-
 .../GridCacheVersionConflictContext.java        |  10 +-
 .../cache/version/GridCacheVersionEx.java       |  13 +-
 .../cache/version/GridCacheVersionManager.java  |  26 +-
 .../cache/version/GridCacheVersionable.java     |   2 +-
 .../cache/version/GridCacheVersionedEntry.java  |   4 +-
 .../version/GridCacheVersionedEntryEx.java      |   2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |  18 +-
 .../IgniteCacheObjectProcessorImpl.java         |  46 +--
 .../clock/GridClockDeltaSnapshot.java           |  20 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |  21 +-
 .../processors/clock/GridClockDeltaVersion.java |  16 +-
 .../processors/clock/GridClockMessage.java      |  10 +-
 .../processors/clock/GridClockServer.java       |  24 +-
 .../processors/clock/GridClockSource.java       |   2 +-
 .../clock/GridClockSyncProcessor.java           |  52 ++--
 .../processors/clock/GridJvmClockSource.java    |   2 +-
 .../processors/closure/AffinityTask.java        |   4 +-
 .../processors/closure/GridClosurePolicy.java   |   4 +-
 .../closure/GridClosureProcessor.java           |  80 ++++--
 .../closure/GridPeerDeployAwareTaskAdapter.java |  10 +-
 .../processors/cluster/ClusterProcessor.java    |  12 +-
 .../continuous/AbstractContinuousMessage.java   |   9 +-
 .../continuous/GridContinuousHandler.java       |  14 +-
 .../continuous/GridContinuousMessage.java       |  30 +-
 .../continuous/GridContinuousMessageType.java   |   4 +-
 .../continuous/GridContinuousProcessor.java     |  96 ++++---
 .../processors/continuous/StartRequestData.java |  23 +-
 .../StartRoutineAckDiscoveryMessage.java        |  15 +-
 .../StartRoutineDiscoveryMessage.java           |  13 +-
 .../StopRoutineAckDiscoveryMessage.java         |  11 +-
 .../continuous/StopRoutineDiscoveryMessage.java |  11 +-
 .../datastreamer/DataStreamProcessor.java       |  48 ++--
 .../datastreamer/DataStreamerCacheUpdaters.java |  20 +-
 .../datastreamer/DataStreamerEntry.java         |  19 +-
 .../datastreamer/DataStreamerFuture.java        |  10 +-
 .../datastreamer/DataStreamerImpl.java          | 125 +++++---
 .../datastreamer/DataStreamerRequest.java       |  30 +-
 .../datastreamer/DataStreamerResponse.java      |  11 +-
 .../datastreamer/DataStreamerUpdateJob.java     |  25 +-
 .../CacheDataStructuresCacheKey.java            |  10 +-
 .../CacheDataStructuresConfigurationKey.java    |  10 +-
 .../datastructures/DataStructuresProcessor.java | 103 +++++--
 .../GridAtomicCacheQueueImpl.java               |  20 +-
 .../GridCacheAnnotationHelper.java              |  23 +-
 .../datastructures/GridCacheAtomicLongEx.java   |   4 +-
 .../datastructures/GridCacheAtomicLongImpl.java |  39 +--
 .../GridCacheAtomicLongValue.java               |  12 +-
 .../GridCacheAtomicReferenceEx.java             |   4 +-
 .../GridCacheAtomicReferenceImpl.java           |  38 ++-
 .../GridCacheAtomicReferenceValue.java          |  14 +-
 .../GridCacheAtomicSequenceEx.java              |   4 +-
 .../GridCacheAtomicSequenceImpl.java            |  52 ++--
 .../GridCacheAtomicSequenceValue.java           |  12 +-
 .../GridCacheAtomicStampedEx.java               |   4 +-
 .../GridCacheAtomicStampedImpl.java             |  44 +--
 .../GridCacheAtomicStampedValue.java            |  18 +-
 .../GridCacheCountDownLatchEx.java              |   4 +-
 .../GridCacheCountDownLatchImpl.java            |  44 +--
 .../GridCacheCountDownLatchValue.java           |  12 +-
 .../datastructures/GridCacheInternalKey.java    |   4 +-
 .../GridCacheInternalKeyImpl.java               |  15 +-
 .../datastructures/GridCacheQueueAdapter.java   |  49 ++--
 .../datastructures/GridCacheQueueHeader.java    |  24 +-
 .../datastructures/GridCacheQueueHeaderKey.java |  13 +-
 .../datastructures/GridCacheQueueItemKey.java   |  15 +-
 .../datastructures/GridCacheQueueProxy.java     |  33 ++-
 .../datastructures/GridCacheRemovable.java      |   2 +-
 .../datastructures/GridCacheSetHeader.java      |  15 +-
 .../datastructures/GridCacheSetHeaderKey.java   |  13 +-
 .../datastructures/GridCacheSetImpl.java        |  57 ++--
 .../datastructures/GridCacheSetItemKey.java     |  17 +-
 .../datastructures/GridCacheSetProxy.java       |  34 ++-
 .../datastructures/GridSetQueryPredicate.java   |  19 +-
 .../GridTransactionalCacheQueueImpl.java        |  28 +-
 .../internal/processors/dr/GridDrType.java      |   2 +-
 .../dr/IgniteDrDataStreamerCacheUpdater.java    |  40 ++-
 .../internal/processors/hadoop/Hadoop.java      |  12 +-
 .../processors/hadoop/HadoopFileBlock.java      |  16 +-
 .../processors/hadoop/HadoopInputSplit.java     |   4 +-
 .../internal/processors/hadoop/HadoopJob.java   |   8 +-
 .../internal/processors/hadoop/HadoopJobId.java |  14 +-
 .../processors/hadoop/HadoopJobInfo.java        |  10 +-
 .../processors/hadoop/HadoopJobPhase.java       |   2 +-
 .../processors/hadoop/HadoopJobProperty.java    |   4 +-
 .../processors/hadoop/HadoopJobStatus.java      |  11 +-
 .../processors/hadoop/HadoopMapReducePlan.java  |  10 +-
 .../hadoop/HadoopMapReducePlanner.java          |  11 +-
 .../processors/hadoop/HadoopNoopProcessor.java  |  13 +-
 .../processors/hadoop/HadoopPartitioner.java    |   2 +-
 .../hadoop/HadoopProcessorAdapter.java          |  13 +-
 .../processors/hadoop/HadoopSerialization.java  |  10 +-
 .../internal/processors/hadoop/HadoopTask.java  |   7 +-
 .../processors/hadoop/HadoopTaskContext.java    |  12 +-
 .../processors/hadoop/HadoopTaskInfo.java       |  12 +-
 .../processors/hadoop/HadoopTaskInput.java      |   7 +-
 .../processors/hadoop/HadoopTaskOutput.java     |   4 +-
 .../processors/hadoop/HadoopTaskType.java       |   4 +-
 .../hadoop/counter/HadoopCounter.java           |   2 +-
 .../hadoop/counter/HadoopCounterWriter.java     |   6 +-
 .../hadoop/counter/HadoopCounters.java          |   4 +-
 .../processors/igfs/IgfsAckMessage.java         |  20 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |  34 ++-
 .../processors/igfs/IgfsAttributes.java         |  16 +-
 .../internal/processors/igfs/IgfsBlockKey.java  |  26 +-
 .../processors/igfs/IgfsBlockLocationImpl.java  |  28 +-
 .../processors/igfs/IgfsBlocksMessage.java      |  17 +-
 .../processors/igfs/IgfsClientSession.java      |  13 +-
 .../igfs/IgfsCommunicationMessage.java          |  15 +-
 .../internal/processors/igfs/IgfsContext.java   |  23 +-
 .../processors/igfs/IgfsDataManager.java        | 117 +++++---
 .../processors/igfs/IgfsDeleteMessage.java      |  22 +-
 .../processors/igfs/IgfsDeleteWorker.java       |  46 +--
 .../ignite/internal/processors/igfs/IgfsEx.java |  19 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |  27 +-
 .../internal/processors/igfs/IgfsFileImpl.java  |  22 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |  29 +-
 .../internal/processors/igfs/IgfsFileMap.java   |  28 +-
 .../processors/igfs/IgfsFileWorkerBatch.java    |  18 +-
 .../igfs/IgfsFragmentizerManager.java           |  71 +++--
 .../igfs/IgfsFragmentizerRequest.java           |  21 +-
 .../igfs/IgfsFragmentizerResponse.java          |  12 +-
 .../processors/igfs/IgfsHandshakeResponse.java  |  10 +-
 .../internal/processors/igfs/IgfsHelper.java    |   6 +-
 .../processors/igfs/IgfsHelperImpl.java         |  14 +-
 .../internal/processors/igfs/IgfsImpl.java      | 134 ++++++---
 .../processors/igfs/IgfsInputStreamAdapter.java |   9 +-
 .../igfs/IgfsInputStreamDescriptor.java         |   7 +-
 .../processors/igfs/IgfsInputStreamImpl.java    |  39 ++-
 .../igfs/IgfsInvalidRangeException.java         |   4 +-
 .../processors/igfs/IgfsIpcHandler.java         |  45 +--
 .../internal/processors/igfs/IgfsJobImpl.java   |  24 +-
 .../processors/igfs/IgfsListingEntry.java       |  15 +-
 .../processors/igfs/IgfsLocalMetrics.java       |   8 +-
 .../internal/processors/igfs/IgfsManager.java   |   8 +-
 .../processors/igfs/IgfsMetaManager.java        |  99 +++++--
 .../processors/igfs/IgfsMetricsAdapter.java     |  12 +-
 .../processors/igfs/IgfsModeResolver.java       |  20 +-
 .../processors/igfs/IgfsNoopHelper.java         |   6 +-
 .../processors/igfs/IgfsNoopProcessor.java      |  23 +-
 .../igfs/IgfsOutputStreamAdapter.java           |  18 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |  40 ++-
 .../internal/processors/igfs/IgfsPaths.java     |  21 +-
 .../internal/processors/igfs/IgfsProcessor.java |  67 +++--
 .../processors/igfs/IgfsProcessorAdapter.java   |  22 +-
 .../processors/igfs/IgfsSamplingKey.java        |  15 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |  19 +-
 .../IgfsSecondaryInputStreamDescriptor.java     |   4 +-
 .../IgfsSecondaryOutputStreamDescriptor.java    |   7 +-
 .../internal/processors/igfs/IgfsServer.java    |  47 ++--
 .../processors/igfs/IgfsServerHandler.java      |  13 +-
 .../processors/igfs/IgfsServerManager.java      |  35 +--
 .../internal/processors/igfs/IgfsStatus.java    |   7 +-
 .../processors/igfs/IgfsSyncMessage.java        |  12 +-
 .../processors/igfs/IgfsTaskArgsImpl.java       |  18 +-
 .../internal/processors/igfs/IgfsThread.java    |   4 +-
 .../internal/processors/igfs/IgfsUtils.java     |  40 +--
 .../processors/job/GridJobEventListener.java    |   4 +-
 .../processors/job/GridJobHoldListener.java     |   4 +-
 .../processors/job/GridJobProcessor.java        | 112 +++++---
 .../internal/processors/job/GridJobWorker.java  |  75 +++--
 .../processors/jobmetrics/GridJobMetrics.java   |   4 +-
 .../jobmetrics/GridJobMetricsProcessor.java     |  21 +-
 .../jobmetrics/GridJobMetricsSnapshot.java      |   5 +-
 .../DiscoveryNodeValidationProcessor.java       |   4 +-
 .../OsDiscoveryNodeValidationProcessor.java     |  19 +-
 .../offheap/GridOffHeapProcessor.java           |  34 +--
 .../platform/PlatformAwareEventFilter.java      |  12 +-
 .../processors/platform/PlatformContext.java    |  44 +--
 .../platform/PlatformLocalEventListener.java    |   2 +-
 .../platform/PlatformNoopProcessor.java         |   9 +-
 .../processors/platform/PlatformProcessor.java  |   7 +-
 .../processors/platform/PlatformTarget.java     |   6 +-
 .../cache/PlatformCacheEntryFilter.java         |   6 +-
 .../cache/query/PlatformContinuousQuery.java    |  15 +-
 .../callback/PlatformCallbackGateway.java       |   7 +-
 .../callback/PlatformCallbackUtils.java         |   2 +-
 .../platform/compute/PlatformJob.java           |   4 +-
 .../platform/memory/PlatformInputStream.java    |   4 +-
 .../platform/memory/PlatformMemory.java         |   2 +-
 .../platform/memory/PlatformMemoryManager.java  |   2 +-
 .../platform/memory/PlatformOutputStream.java   |   4 +-
 .../platform/services/PlatformService.java      |   6 +-
 .../processors/plugin/CachePluginManager.java   |  33 ++-
 .../plugin/IgnitePluginProcessor.java           |  37 ++-
 .../processors/port/GridPortListener.java       |   4 +-
 .../processors/port/GridPortProcessor.java      |  21 +-
 .../processors/port/GridPortRecord.java         |   6 +-
 .../query/GridQueryCacheObjectsIterator.java    |   9 +-
 .../query/GridQueryFieldMetadata.java           |   4 +-
 .../processors/query/GridQueryFieldsResult.java |   7 +-
 .../query/GridQueryFieldsResultAdapter.java     |  10 +-
 .../query/GridQueryIndexDescriptor.java         |   4 +-
 .../processors/query/GridQueryIndexType.java    |   2 +-
 .../processors/query/GridQueryIndexing.java     |  36 +--
 .../processors/query/GridQueryProcessor.java    |  99 +++++--
 .../query/GridQueryTypeDescriptor.java          |   7 +-
 .../messages/GridQueryCancelRequest.java        |  11 +-
 .../twostep/messages/GridQueryFailResponse.java |  11 +-
 .../messages/GridQueryNextPageRequest.java      |  11 +-
 .../messages/GridQueryNextPageResponse.java     |  22 +-
 .../h2/twostep/messages/GridQueryRequest.java   |  26 +-
 .../resource/GridNoImplicitInjection.java       |   2 +-
 .../resource/GridResourceBasicInjector.java     |   8 +-
 .../processors/resource/GridResourceField.java  |  13 +-
 .../resource/GridResourceInjector.java          |   6 +-
 .../processors/resource/GridResourceIoc.java    |  34 ++-
 .../GridResourceJobContextInjector.java         |   9 +-
 .../resource/GridResourceLoggerInjector.java    |   9 +-
 .../processors/resource/GridResourceMethod.java |  11 +-
 .../resource/GridResourceProcessor.java         |  54 ++--
 .../resource/GridResourceServiceInjector.java   |  14 +-
 .../processors/resource/GridResourceUtils.java  |  13 +-
 .../resource/GridSpringResourceContext.java     |   5 +-
 .../processors/rest/GridRestCommand.java        |   8 +-
 .../processors/rest/GridRestProcessor.java      |  84 ++++--
 .../processors/rest/GridRestProtocol.java       |   9 +-
 .../rest/GridRestProtocolHandler.java           |   8 +-
 .../processors/rest/GridRestResponse.java       |  15 +-
 .../message/GridClientAbstractMessage.java      |  13 +-
 .../GridClientAuthenticationRequest.java        |   9 +-
 .../client/message/GridClientCacheRequest.java  |  15 +-
 .../message/GridClientHandshakeRequest.java     |   7 +-
 .../message/GridClientHandshakeResponse.java    |   4 +-
 .../rest/client/message/GridClientMessage.java  |   6 +-
 .../rest/client/message/GridClientNodeBean.java |  15 +-
 .../message/GridClientNodeMetricsBean.java      |   7 +-
 .../client/message/GridClientPingPacket.java    |   4 +-
 .../message/GridClientPortableMetaData.java     |   7 +-
 .../rest/client/message/GridClientResponse.java |   9 +-
 .../client/message/GridClientTaskRequest.java   |   9 +-
 .../message/GridClientTaskResultBean.java       |  10 +-
 .../message/GridClientTopologyRequest.java      |  11 +-
 .../rest/client/message/GridRouterRequest.java  |   9 +-
 .../rest/client/message/GridRouterResponse.java |   9 +-
 .../rest/handlers/GridRestCommandHandler.java   |  12 +-
 .../handlers/GridRestCommandHandlerAdapter.java |   6 +-
 .../handlers/cache/GridCacheCommandHandler.java | 103 +++++--
 .../handlers/cache/GridCacheRestMetrics.java    |   7 +-
 .../handlers/cache/GridCacheRestResponse.java   |  12 +-
 .../DataStructuresCommandHandler.java           |  32 ++-
 .../query/CacheQueryFieldsMetaResult.java       |  12 +-
 .../rest/handlers/query/CacheQueryResult.java   |  13 +-
 .../handlers/query/QueryCommandHandler.java     |  48 ++--
 .../handlers/task/GridTaskCommandHandler.java   | 102 ++++---
 .../handlers/task/GridTaskResultRequest.java    |  15 +-
 .../handlers/task/GridTaskResultResponse.java   |  13 +-
 .../top/GridTopologyCommandHandler.java         |  61 ++--
 .../version/GridVersionCommandHandler.java      |  24 +-
 .../rest/protocols/GridRestProtocolAdapter.java |  36 +--
 .../protocols/tcp/GridClientPacketType.java     |   2 +-
 .../protocols/tcp/GridMemcachedMessage.java     |  12 +-
 .../tcp/GridTcpMemcachedNioListener.java        |  65 +++--
 .../protocols/tcp/GridTcpRestNioListener.java   |  83 ++++--
 .../rest/protocols/tcp/GridTcpRestParser.java   |  62 ++--
 .../rest/protocols/tcp/GridTcpRestProtocol.java |  63 +++--
 .../rest/request/DataStructuresRequest.java     |   2 +-
 .../rest/request/GridRestCacheRequest.java      |   7 +-
 .../rest/request/GridRestLogRequest.java        |   4 +-
 .../rest/request/GridRestRequest.java           |  13 +-
 .../rest/request/GridRestTaskRequest.java       |   7 +-
 .../rest/request/GridRestTopologyRequest.java   |   7 +-
 .../rest/request/RestSqlQueryRequest.java       |   2 +-
 .../schedule/GridScheduleStatistics.java        |   5 +-
 .../schedule/IgniteNoopScheduleProcessor.java   |  11 +-
 .../IgniteScheduleProcessorAdapter.java         |  11 +-
 .../security/GridSecurityProcessor.java         |  19 +-
 .../processors/security/SecurityContext.java    |   5 +-
 .../security/os/GridOsSecurityProcessor.java    |  25 +-
 .../segmentation/GridSegmentationProcessor.java |   4 +-
 .../os/GridOsSegmentationProcessor.java         |   8 +-
 .../service/GridServiceAssignments.java         |  22 +-
 .../service/GridServiceAssignmentsKey.java      |   6 +-
 .../service/GridServiceDeployment.java          |  13 +-
 .../service/GridServiceDeploymentFuture.java    |   8 +-
 .../service/GridServiceDeploymentKey.java       |   6 +-
 .../GridServiceMethodNotFoundException.java     |   7 +-
 .../service/GridServiceMethodReflectKey.java    |   4 +-
 .../service/GridServiceNotFoundException.java   |   4 +-
 .../service/GridServiceProcessor.java           | 105 ++++---
 .../processors/service/GridServiceProxy.java    |  54 ++--
 .../processors/service/ServiceContextImpl.java  |  20 +-
 .../service/ServiceDescriptorImpl.java          |  15 +-
 .../session/GridTaskSessionProcessor.java       |  28 +-
 .../internal/processors/task/GridInternal.java  |   8 +-
 .../processors/task/GridTaskEventListener.java  |   8 +-
 .../processors/task/GridTaskProcessor.java      |  99 +++++--
 .../task/GridTaskThreadContextKey.java          |   2 +-
 .../processors/task/GridTaskWorker.java         | 113 +++++---
 .../timeout/GridSpiTimeoutObject.java           |  10 +-
 .../processors/timeout/GridTimeoutObject.java   |   4 +-
 .../timeout/GridTimeoutObjectAdapter.java       |   6 +-
 .../timeout/GridTimeoutProcessor.java           |  29 +-
 .../internal/tck/TCKMBeanServerBuilder.java     |  14 +-
 .../IgniteTxHeuristicCheckedException.java      |   4 +-
 .../IgniteTxOptimisticCheckedException.java     |   4 +-
 .../IgniteTxRollbackCheckedException.java       |   4 +-
 .../IgniteTxTimeoutCheckedException.java        |   4 +-
 .../org/apache/ignite/internal/util/F0.java     |  29 +-
 .../internal/util/GridAnnotationsCache.java     |  17 +-
 .../ignite/internal/util/GridArgumentCheck.java |   7 +-
 .../internal/util/GridAtomicInitializer.java    |  12 +-
 .../ignite/internal/util/GridAtomicInteger.java |   7 +-
 .../ignite/internal/util/GridAtomicLong.java    |   7 +-
 .../GridBoundedConcurrentLinkedHashMap.java     |   8 +-
 .../GridBoundedConcurrentLinkedHashSet.java     |  18 +-
 .../util/GridBoundedConcurrentOrderedMap.java   |  18 +-
 .../util/GridBoundedConcurrentOrderedSet.java   |   9 +-
 .../internal/util/GridBoundedLinkedHashMap.java |   5 +-
 .../internal/util/GridBoundedLinkedHashSet.java |   7 +-
 .../ignite/internal/util/GridBusyLock.java      |   7 +-
 .../ignite/internal/util/GridByteArrayList.java |  26 +-
 .../internal/util/GridCircularBuffer.java       |  23 +-
 .../internal/util/GridClassLoaderCache.java     |  13 +-
 .../internal/util/GridClientByteUtils.java      |   7 +-
 .../util/GridCloseableIteratorAdapter.java      |  10 +-
 .../util/GridCloseableIteratorAdapterEx.java    |  12 +-
 .../ignite/internal/util/GridCollections.java   |  14 +-
 .../internal/util/GridConcurrentFactory.java    |  11 +-
 .../internal/util/GridConcurrentHashSet.java    |  13 +-
 .../util/GridConcurrentLinkedHashSet.java       |  16 +-
 .../util/GridConcurrentPhantomHashSet.java      |  25 +-
 .../util/GridConcurrentSkipListSet.java         |  22 +-
 .../util/GridConcurrentWeakHashSet.java         |  25 +-
 .../internal/util/GridConfigurationFinder.java  |  19 +-
 .../internal/util/GridConsistentHash.java       |  32 ++-
 .../apache/ignite/internal/util/GridDebug.java  |  33 ++-
 .../util/GridEmptyCloseableIterator.java        |   6 +-
 .../ignite/internal/util/GridEmptyIterator.java |   9 +-
 .../ignite/internal/util/GridEnumCache.java     |   7 +-
 .../internal/util/GridExecutionStatistics.java  |  19 +-
 .../internal/util/GridFixedSizeInputStream.java |   5 +-
 .../ignite/internal/util/GridHandleTable.java   |   7 +-
 .../ignite/internal/util/GridJavaProcess.java   |  25 +-
 .../ignite/internal/util/GridKeyLock.java       |  11 +-
 .../internal/util/GridLeanIdentitySet.java      |   7 +-
 .../ignite/internal/util/GridLeanMap.java       |  19 +-
 .../ignite/internal/util/GridLeanSet.java       |  10 +-
 .../ignite/internal/util/GridListSet.java       |  19 +-
 .../ignite/internal/util/GridLogThrottle.java   |  17 +-
 .../ignite/internal/util/GridLongList.java      |  26 +-
 .../apache/ignite/internal/util/GridMutex.java  |  10 +-
 .../apache/ignite/internal/util/GridQueue.java  |  16 +-
 .../apache/ignite/internal/util/GridRandom.java |   6 +-
 .../internal/util/GridReflectionCache.java      |  29 +-
 .../util/GridSerializableCollection.java        |   6 +-
 .../internal/util/GridSerializableIterable.java |   4 +-
 .../internal/util/GridSerializableIterator.java |   6 +-
 .../internal/util/GridSerializableList.java     |   6 +-
 .../internal/util/GridSerializableMap.java      |   6 +-
 .../internal/util/GridSerializableSet.java      |   7 +-
 .../ignite/internal/util/GridSetWrapper.java    |  12 +-
 .../ignite/internal/util/GridSnapshotLock.java  |   7 +-
 .../util/GridSpiCloseableIteratorWrapper.java   |   8 +-
 .../ignite/internal/util/GridSpinBusyLock.java  |   4 +-
 .../internal/util/GridSpinReadWriteLock.java    |  12 +-
 .../ignite/internal/util/GridStringBuilder.java |   7 +-
 .../internal/util/GridStringBuilderFactory.java |   4 +-
 .../ignite/internal/util/GridStripedLock.java   |  11 +-
 .../internal/util/GridStripedReadWriteLock.java |  14 +-
 .../internal/util/GridSynchronizedMap.java      |  12 +-
 .../apache/ignite/internal/util/GridTimer.java  |  10 +-
 .../ignite/internal/util/GridTimerTask.java     |   4 +-
 .../apache/ignite/internal/util/GridUnsafe.java |  11 +-
 .../ignite/internal/util/GridWeakIterator.java  |  10 +-
 .../internal/util/IgniteExceptionRegistry.java  |  27 +-
 .../ignite/internal/util/IgniteUtils.java       | 282 +++++++++++++++----
 .../ignite/internal/util/IgniteUuidCache.java   |   6 +-
 .../util/future/GridCompoundFuture.java         |  34 ++-
 .../util/future/GridCompoundIdentityFuture.java |  10 +-
 .../util/future/GridEmbeddedFuture.java         |  16 +-
 .../util/future/GridFinishedFuture.java         |  17 +-
 .../internal/util/future/GridFutureAdapter.java |  27 +-
 .../util/future/GridFutureChainListener.java    |   9 +-
 .../util/future/IgniteFinishedFutureImpl.java   |   4 +-
 .../internal/util/future/IgniteFutureImpl.java  |  21 +-
 .../util/gridify/GridifyArgumentBuilder.java    |  20 +-
 .../util/gridify/GridifyJobAdapter.java         |  13 +-
 .../util/gridify/GridifyRangeArgument.java      |   9 +-
 .../internal/util/gridify/GridifyUtils.java     |  35 ++-
 .../util/io/GridByteArrayInputStream.java       |   9 +-
 .../util/io/GridByteArrayOutputStream.java      |  13 +-
 .../ignite/internal/util/io/GridDataInput.java  |   6 +-
 .../ignite/internal/util/io/GridDataOutput.java |   6 +-
 .../internal/util/io/GridFilenameUtils.java     |  10 +-
 .../util/io/GridReversedLinesFileReader.java    |  12 +-
 .../internal/util/io/GridUnsafeDataInput.java   |  22 +-
 .../internal/util/io/GridUnsafeDataOutput.java  |  15 +-
 .../ignite/internal/util/ipc/IpcEndpoint.java   |   9 +-
 .../util/ipc/IpcEndpointBindException.java      |   4 +-
 .../internal/util/ipc/IpcEndpointFactory.java   |  13 +-
 .../internal/util/ipc/IpcEndpointType.java      |   2 +-
 .../internal/util/ipc/IpcServerEndpoint.java    |   9 +-
 .../internal/util/ipc/IpcToNioAdapter.java      |  31 +-
 .../util/ipc/loopback/IpcClientTcpEndpoint.java |  16 +-
 .../util/ipc/loopback/IpcServerTcpEndpoint.java |  23 +-
 .../shmem/IpcOutOfSystemResourcesException.java |   6 +-
 .../shmem/IpcSharedMemoryClientEndpoint.java    |  21 +-
 .../ipc/shmem/IpcSharedMemoryInitRequest.java   |   7 +-
 .../ipc/shmem/IpcSharedMemoryInitResponse.java  |  12 +-
 .../ipc/shmem/IpcSharedMemoryInputStream.java   |  10 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |  35 ++-
 ...cSharedMemoryOperationTimedoutException.java |   6 +-
 .../ipc/shmem/IpcSharedMemoryOutputStream.java  |  10 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |  58 ++--
 .../util/ipc/shmem/IpcSharedMemorySpace.java    |  19 +-
 .../util/ipc/shmem/IpcSharedMemoryUtils.java    |  18 +-
 .../internal/util/lang/GridAbsClosure.java      |   4 +-
 .../internal/util/lang/GridAbsClosureX.java     |   6 +-
 .../internal/util/lang/GridAbsPredicate.java    |   4 +-
 .../internal/util/lang/GridAbsPredicateX.java   |   6 +-
 .../util/lang/GridCloseableIterator.java        |   6 +-
 .../ignite/internal/util/lang/GridClosure3.java |   4 +-
 .../internal/util/lang/GridClosure3X.java       |   7 +-
 .../util/lang/GridClosureException.java         |   5 +-
 .../util/lang/GridFilteredIterator.java         |   5 +-
 .../ignite/internal/util/lang/GridFunc.java     |  76 +++--
 .../internal/util/lang/GridInClosure3.java      |   5 +-
 .../ignite/internal/util/lang/GridIterable.java |   4 +-
 .../internal/util/lang/GridIterableAdapter.java |  10 +-
 .../ignite/internal/util/lang/GridIterator.java |  10 +-
 .../internal/util/lang/GridIteratorAdapter.java |   8 +-
 .../ignite/internal/util/lang/GridMapEntry.java |  13 +-
 .../util/lang/GridMetadataAwareAdapter.java     |  18 +-
 .../internal/util/lang/GridNodePredicate.java   |  24 +-
 .../internal/util/lang/GridPeerDeployAware.java |   4 +-
 .../util/lang/GridPeerDeployAwareAdapter.java   |   4 +-
 .../internal/util/lang/GridPlainAbsClosure.java |   4 +-
 .../internal/util/lang/GridPlainCallable.java   |   4 +-
 .../internal/util/lang/GridPlainClosure.java    |   4 +-
 .../internal/util/lang/GridPlainClosure2.java   |   4 +-
 .../internal/util/lang/GridPlainInClosure.java  |   4 +-
 .../internal/util/lang/GridPlainOutClosure.java |   4 +-
 .../internal/util/lang/GridPlainRunnable.java   |   2 +-
 .../internal/util/lang/GridPredicate3.java      |   4 +-
 .../internal/util/lang/GridPredicate3X.java     |   7 +-
 .../ignite/internal/util/lang/GridTriple.java   |   7 +-
 .../ignite/internal/util/lang/GridTuple.java    |  17 +-
 .../ignite/internal/util/lang/GridTuple3.java   |  19 +-
 .../ignite/internal/util/lang/GridTuple4.java   |  19 +-
 .../ignite/internal/util/lang/GridTuple5.java   |  19 +-
 .../ignite/internal/util/lang/GridTuple6.java   |  19 +-
 .../ignite/internal/util/lang/GridTupleV.java   |  18 +-
 .../internal/util/lang/IgniteClosure2X.java     |   9 +-
 .../internal/util/lang/IgniteClosureX.java      |   9 +-
 .../internal/util/lang/IgniteInClosure2X.java   |   9 +-
 .../internal/util/lang/IgniteInClosureX.java    |   9 +-
 .../internal/util/lang/IgniteOutClosureX.java   |   8 +-
 .../ignite/internal/util/lang/IgnitePair.java   |   9 +-
 .../internal/util/lang/IgnitePredicate2X.java   |   9 +-
 .../internal/util/lang/IgnitePredicateX.java    |   9 +-
 .../internal/util/lang/IgniteReducer2.java      |   6 +-
 .../internal/util/lang/IgniteReducer2X.java     |   7 +-
 .../internal/util/lang/IgniteReducer3.java      |   6 +-
 .../internal/util/lang/IgniteReducer3X.java     |   7 +-
 .../internal/util/lang/IgniteReducerX.java      |   9 +-
 .../nio/GridAbstractCommunicationClient.java    |  10 +-
 .../internal/util/nio/GridBufferedParser.java   |  10 +-
 .../util/nio/GridCommunicationClient.java       |  21 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |  11 +-
 .../internal/util/nio/GridDelimitedParser.java  |   9 +-
 .../internal/util/nio/GridDirectParser.java     |  17 +-
 .../util/nio/GridNioAsyncNotifyFilter.java      |  13 +-
 .../util/nio/GridNioBackPressureControl.java    |   4 +-
 .../internal/util/nio/GridNioCodecFilter.java   |  15 +-
 .../util/nio/GridNioDelimitedBuffer.java        |   9 +-
 .../util/nio/GridNioEmbeddedFuture.java         |  12 +-
 .../internal/util/nio/GridNioException.java     |   6 +-
 .../ignite/internal/util/nio/GridNioFilter.java |   4 +-
 .../internal/util/nio/GridNioFilterAdapter.java |   4 +-
 .../internal/util/nio/GridNioFilterChain.java   |   7 +-
 .../util/nio/GridNioFinishedFuture.java         |  10 +-
 .../ignite/internal/util/nio/GridNioFuture.java |   8 +-
 .../internal/util/nio/GridNioFutureImpl.java    |  10 +-
 .../internal/util/nio/GridNioMessageReader.java |  12 +-
 .../util/nio/GridNioMessageTracker.java         |  12 +-
 .../internal/util/nio/GridNioMessageWriter.java |  14 +-
 .../util/nio/GridNioMetricsListener.java        |   2 +-
 .../ignite/internal/util/nio/GridNioParser.java |  11 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |  20 +-
 .../ignite/internal/util/nio/GridNioServer.java |  82 ++++--
 .../internal/util/nio/GridNioServerBuffer.java  |   9 +-
 .../util/nio/GridNioServerListener.java         |   4 +-
 .../util/nio/GridNioServerListenerAdapter.java  |   2 +-
 .../internal/util/nio/GridNioSession.java       |   7 +-
 .../internal/util/nio/GridNioSessionImpl.java   |  16 +-
 .../util/nio/GridNioSessionMetaKey.java         |   4 +-
 .../util/nio/GridSelectorNioSessionImpl.java    |  26 +-
 .../util/nio/GridShmemCommunicationClient.java  |  30 +-
 .../util/nio/GridTcpNioCommunicationClient.java |  30 +-
 .../util/nio/ssl/BlockingSslHandler.java        |  35 ++-
 .../internal/util/nio/ssl/GridNioSslFilter.java |  30 +-
 .../util/nio/ssl/GridNioSslHandler.java         |  44 ++-
 .../util/nodestart/IgniteNodeStartUtils.java    |  30 +-
 .../IgniteRemoteStartSpecification.java         |  11 +-
 .../util/nodestart/IgniteSshHelper.java         |   4 +-
 .../util/nodestart/StartNodeCallable.java       |   7 +-
 .../internal/util/offheap/GridOffHeapEvent.java |   4 +-
 .../util/offheap/GridOffHeapEventListener.java  |   2 +-
 .../util/offheap/GridOffHeapEvictListener.java  |   2 +-
 .../internal/util/offheap/GridOffHeapMap.java   |  11 +-
 .../util/offheap/GridOffHeapMapFactory.java     |   7 +-
 .../GridOffHeapOutOfMemoryException.java        |   2 +-
 .../util/offheap/GridOffHeapPartitionedMap.java |  14 +-
 .../offheap/unsafe/GridOffHeapSmartPointer.java |   2 +-
 .../unsafe/GridOffHeapSmartPointerFactory.java  |   2 +-
 .../offheap/unsafe/GridOffHeapSnapTreeMap.java  |  33 ++-
 .../unsafe/GridUnsafeCompoundMemory.java        |   2 +-
 .../util/offheap/unsafe/GridUnsafeGuard.java    |  12 +-
 .../util/offheap/unsafe/GridUnsafeLru.java      |  15 +-
 .../offheap/unsafe/GridUnsafeLruPoller.java     |   2 +-
 .../util/offheap/unsafe/GridUnsafeMap.java      |  36 ++-
 .../util/offheap/unsafe/GridUnsafeMemory.java   |  27 +-
 .../unsafe/GridUnsafePartitionedMap.java        |  26 +-
 .../util/portscanner/GridJmxPortFinder.java     |  15 +-
 .../util/snaptree/CopyOnWriteManager.java       |   6 +-
 .../ignite/internal/util/snaptree/Epoch.java    |   2 +-
 .../internal/util/snaptree/EpochNode.java       |   5 +-
 .../internal/util/snaptree/SnapTreeMap.java     |  22 +-
 .../util/spring/IgniteSpringHelper.java         |  19 +-
 .../internal/util/test/GridTestPrintStream.java |  11 +-
 .../util/test/GridTestPrintStreamFactory.java   |   4 +-
 .../util/tostring/GridToStringBuilder.java      |  33 ++-
 .../tostring/GridToStringClassDescriptor.java   |   7 +-
 .../util/tostring/GridToStringExclude.java      |   8 +-
 .../tostring/GridToStringFieldDescriptor.java   |   2 +-
 .../util/tostring/GridToStringInclude.java      |   8 +-
 .../util/tostring/GridToStringOrder.java        |   8 +-
 .../util/tostring/GridToStringThreadLocal.java  |   4 +-
 .../apache/ignite/internal/util/typedef/C1.java |   6 +-
 .../apache/ignite/internal/util/typedef/C2.java |   6 +-
 .../apache/ignite/internal/util/typedef/C3.java |   5 +-
 .../apache/ignite/internal/util/typedef/CA.java |   5 +-
 .../ignite/internal/util/typedef/CAX.java       |   5 +-
 .../ignite/internal/util/typedef/CI1.java       |   6 +-
 .../ignite/internal/util/typedef/CI2.java       |   6 +-
 .../ignite/internal/util/typedef/CIX1.java      |   5 +-
 .../ignite/internal/util/typedef/CIX2.java      |   5 +-
 .../ignite/internal/util/typedef/CIX3.java      |   5 +-
 .../apache/ignite/internal/util/typedef/CO.java |   6 +-
 .../ignite/internal/util/typedef/COX.java       |   5 +-
 .../ignite/internal/util/typedef/CX1.java       |   5 +-
 .../ignite/internal/util/typedef/CX2.java       |   5 +-
 .../ignite/internal/util/typedef/CX3.java       |   5 +-
 .../apache/ignite/internal/util/typedef/F.java  |   4 +-
 .../apache/ignite/internal/util/typedef/G.java  |   4 +-
 .../apache/ignite/internal/util/typedef/P1.java |   6 +-
 .../apache/ignite/internal/util/typedef/P2.java |   6 +-
 .../apache/ignite/internal/util/typedef/P3.java |   5 +-
 .../apache/ignite/internal/util/typedef/PA.java |   5 +-
 .../ignite/internal/util/typedef/PAX.java       |   6 +-
 .../ignite/internal/util/typedef/PCE.java       |   9 +-
 .../apache/ignite/internal/util/typedef/PE.java |   8 +-
 .../ignite/internal/util/typedef/PKV.java       |   6 +-
 .../apache/ignite/internal/util/typedef/PN.java |   8 +-
 .../ignite/internal/util/typedef/PX1.java       |   5 +-
 .../ignite/internal/util/typedef/PX2.java       |   5 +-
 .../ignite/internal/util/typedef/PX3.java       |   5 +-
 .../apache/ignite/internal/util/typedef/R1.java |   6 +-
 .../apache/ignite/internal/util/typedef/R2.java |   5 +-
 .../apache/ignite/internal/util/typedef/R3.java |   5 +-
 .../ignite/internal/util/typedef/RX1.java       |   5 +-
 .../ignite/internal/util/typedef/RX2.java       |   5 +-
 .../ignite/internal/util/typedef/RX3.java       |   5 +-
 .../apache/ignite/internal/util/typedef/T1.java |   8 +-
 .../apache/ignite/internal/util/typedef/T2.java |  10 +-
 .../apache/ignite/internal/util/typedef/T3.java |   9 +-
 .../apache/ignite/internal/util/typedef/T4.java |   9 +-
 .../apache/ignite/internal/util/typedef/T5.java |   9 +-
 .../apache/ignite/internal/util/typedef/T6.java |   9 +-
 .../apache/ignite/internal/util/typedef/X.java  |  37 ++-
 .../internal/util/typedef/internal/A.java       |   4 +-
 .../internal/util/typedef/internal/CU.java      |   4 +-
 .../internal/util/typedef/internal/D.java       |   4 +-
 .../internal/util/typedef/internal/GPC.java     |   4 +-
 .../internal/util/typedef/internal/GPR.java     |   4 +-
 .../internal/util/typedef/internal/LT.java      |   4 +-
 .../internal/util/typedef/internal/S.java       |   4 +-
 .../internal/util/typedef/internal/SB.java      |   4 +-
 .../internal/util/typedef/internal/U.java       |   4 +-
 .../ignite/internal/util/worker/GridWorker.java |  18 +-
 .../internal/util/worker/GridWorkerFuture.java  |   6 +-
 .../util/worker/GridWorkerListener.java         |   4 +-
 .../util/worker/GridWorkerListenerAdapter.java  |   2 +-
 .../internal/util/worker/GridWorkerPool.java    |  17 +-
 .../apache/ignite/internal/visor/VisorJob.java  |  17 +-
 .../internal/visor/VisorMultiNodeTask.java      |  31 +-
 .../ignite/internal/visor/VisorOneNodeTask.java |  11 +-
 .../internal/visor/VisorTaskArgument.java       |   8 +-
 .../ignite/internal/visor/cache/VisorCache.java |  44 +--
 .../cache/VisorCacheAffinityConfiguration.java  |  17 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  14 +-
 .../visor/cache/VisorCacheClearTask.java        |  23 +-
 .../visor/cache/VisorCacheConfiguration.java    |  25 +-
 .../VisorCacheConfigurationCollectorJob.java    |  17 +-
 .../VisorCacheConfigurationCollectorTask.java   |  12 +-
 .../cache/VisorCacheDefaultConfiguration.java   |   9 +-
 .../cache/VisorCacheEvictionConfiguration.java  |  16 +-
 .../visor/cache/VisorCacheLoadTask.java         |  26 +-
 .../visor/cache/VisorCacheMetadataTask.java     |  21 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  16 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |  25 +-
 .../cache/VisorCacheNearConfiguration.java      |  17 +-
 .../visor/cache/VisorCacheNodesTask.java        |  16 +-
 .../cache/VisorCacheQueryConfiguration.java     |   9 +-
 .../visor/cache/VisorCacheQueryMetrics.java     |   9 +-
 .../cache/VisorCacheRebalanceConfiguration.java |  11 +-
 .../visor/cache/VisorCacheRebalanceTask.java    |  21 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |  11 +-
 .../visor/cache/VisorCacheStartTask.java        |  33 ++-
 .../visor/cache/VisorCacheStopTask.java         |  11 +-
 .../cache/VisorCacheStoreConfiguration.java     |  21 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |  28 +-
 .../cache/VisorCacheTypeFieldMetadata.java      |   9 +-
 .../visor/cache/VisorCacheTypeMetadata.java     |  20 +-
 .../compute/VisorComputeCancelSessionsTask.java |  24 +-
 .../compute/VisorComputeMonitoringHolder.java   |  14 +-
 .../compute/VisorComputeResetMetricsTask.java   |   9 +-
 .../VisorComputeToggleMonitoringTask.java       |  29 +-
 .../visor/debug/VisorThreadDumpTask.java        |  16 +-
 .../internal/visor/debug/VisorThreadInfo.java   |   6 +-
 .../visor/debug/VisorThreadLockInfo.java        |   6 +-
 .../visor/debug/VisorThreadMonitorInfo.java     |   4 +-
 .../visor/event/VisorGridDeploymentEvent.java   |  11 +-
 .../visor/event/VisorGridDiscoveryEvent.java    |  11 +-
 .../internal/visor/event/VisorGridEvent.java    |  13 +-
 .../visor/event/VisorGridEventsLost.java        |   9 +-
 .../internal/visor/event/VisorGridJobEvent.java |  11 +-
 .../visor/event/VisorGridTaskEvent.java         |  11 +-
 .../internal/visor/file/VisorFileBlock.java     |   7 +-
 .../internal/visor/file/VisorFileBlockTask.java |  26 +-
 .../visor/file/VisorLatestTextFilesTask.java    |  30 +-
 .../ignite/internal/visor/igfs/VisorIgfs.java   |  11 +-
 .../internal/visor/igfs/VisorIgfsEndpoint.java  |   9 +-
 .../visor/igfs/VisorIgfsFormatTask.java         |  11 +-
 .../internal/visor/igfs/VisorIgfsMetrics.java   |   9 +-
 .../internal/visor/igfs/VisorIgfsProfiler.java  |  10 +-
 .../visor/igfs/VisorIgfsProfilerClearTask.java  |  30 +-
 .../visor/igfs/VisorIgfsProfilerEntry.java      |  11 +-
 .../visor/igfs/VisorIgfsProfilerTask.java       |  51 +++-
 .../VisorIgfsProfilerUniformityCounters.java    |  12 +-
 .../visor/igfs/VisorIgfsResetMetricsTask.java   |  14 +-
 .../visor/igfs/VisorIgfsSamplingStateTask.java  |  17 +-
 .../ignite/internal/visor/log/VisorLogFile.java |   8 +-
 .../visor/log/VisorLogSearchResult.java         |   9 +-
 .../internal/visor/log/VisorLogSearchTask.java  |  45 +--
 .../internal/visor/misc/VisorAckTask.java       |  16 +-
 .../visor/misc/VisorLatestVersionTask.java      |   9 +-
 .../internal/visor/misc/VisorNopTask.java       |  21 +-
 .../visor/misc/VisorResolveHostNameTask.java    |  23 +-
 .../visor/node/VisorAtomicConfiguration.java    |  11 +-
 .../visor/node/VisorBasicConfiguration.java     |  34 ++-
 .../node/VisorExecutorServiceConfiguration.java |  10 +-
 .../visor/node/VisorGridConfiguration.java      |  19 +-
 .../visor/node/VisorIgfsConfiguration.java      |  29 +-
 .../visor/node/VisorLifecycleConfiguration.java |  13 +-
 .../visor/node/VisorMetricsConfiguration.java   |   9 +-
 .../VisorNodeConfigurationCollectorJob.java     |   6 +-
 .../VisorNodeConfigurationCollectorTask.java    |   6 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |  41 +--
 .../node/VisorNodeDataCollectorJobResult.java   |  15 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |  30 +-
 .../node/VisorNodeDataCollectorTaskArg.java     |   4 +-
 .../node/VisorNodeDataCollectorTaskResult.java  |  21 +-
 .../node/VisorNodeEventsCollectorTask.java      |  46 +--
 .../internal/visor/node/VisorNodeGcTask.java    |  24 +-
 .../internal/visor/node/VisorNodePingTask.java  |  21 +-
 .../visor/node/VisorNodeRestartTask.java        |  18 +-
 .../internal/visor/node/VisorNodeStopTask.java  |  18 +-
 .../node/VisorNodeSuppressedErrorsTask.java     |  26 +-
 .../node/VisorPeerToPeerConfiguration.java      |  13 +-
 .../visor/node/VisorRestConfiguration.java      |  22 +-
 .../node/VisorSegmentationConfiguration.java    |  15 +-
 .../visor/node/VisorSpisConfiguration.java      |  27 +-
 .../node/VisorTransactionConfiguration.java     |  12 +-
 .../internal/visor/query/VisorQueryArg.java     |   4 +-
 .../visor/query/VisorQueryCleanupTask.java      |  32 ++-
 .../internal/visor/query/VisorQueryCursor.java  |  14 +-
 .../internal/visor/query/VisorQueryField.java   |   9 +-
 .../internal/visor/query/VisorQueryJob.java     |  43 +--
 .../visor/query/VisorQueryNextPageTask.java     |  21 +-
 .../internal/visor/query/VisorQueryResult.java  |   9 +-
 .../visor/query/VisorQueryResultEx.java         |   9 +-
 .../internal/visor/query/VisorQueryTask.java    |  10 +-
 .../internal/visor/query/VisorQueryUtils.java   |  17 +-
 .../util/VisorClusterGroupEmptyException.java   |   4 +-
 .../internal/visor/util/VisorEventMapper.java   |  24 +-
 .../visor/util/VisorExceptionWrapper.java       |   2 +-
 .../internal/visor/util/VisorMimeTypes.java     |  13 +-
 .../internal/visor/util/VisorTaskUtils.java     |  97 ++++---
 .../apache/ignite/lang/IgniteAsyncSupport.java  |   2 +-
 .../ignite/lang/IgniteAsyncSupported.java       |   8 +-
 .../org/apache/ignite/lang/IgniteBiClosure.java |   4 +-
 .../apache/ignite/lang/IgniteBiInClosure.java   |   4 +-
 .../apache/ignite/lang/IgniteBiPredicate.java   |   4 +-
 .../org/apache/ignite/lang/IgniteBiTuple.java   |  24 +-
 .../org/apache/ignite/lang/IgniteCallable.java  |   6 +-
 .../org/apache/ignite/lang/IgniteClosure.java   |   4 +-
 .../org/apache/ignite/lang/IgniteFuture.java    |   8 +-
 .../lang/IgniteFutureCancelledException.java    |   6 +-
 .../lang/IgniteFutureTimeoutException.java      |   6 +-
 .../org/apache/ignite/lang/IgniteInClosure.java |   4 +-
 .../ignite/lang/IgniteNotPeerDeployable.java    |   8 +-
 .../apache/ignite/lang/IgniteOutClosure.java    |   4 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |   4 +-
 .../ignite/lang/IgniteProductVersion.java       |  21 +-
 .../org/apache/ignite/lang/IgniteReducer.java   |   9 +-
 .../org/apache/ignite/lang/IgniteRunnable.java  |   4 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |  20 +-
 .../apache/ignite/lifecycle/LifecycleAware.java |   4 +-
 .../apache/ignite/lifecycle/LifecycleBean.java  |   4 +-
 .../ignite/lifecycle/LifecycleEventType.java    |   4 +-
 .../apache/ignite/logger/LoggerNodeIdAware.java |   4 +-
 .../org/apache/ignite/logger/NullLogger.java    |   6 +-
 .../apache/ignite/logger/java/JavaLogger.java   |  40 ++-
 .../logger/java/JavaLoggerFileHandler.java      |  22 +-
 .../ignite/logger/java/JavaLoggerFormatter.java |  14 +-
 .../ignite/marshaller/AbstractMarshaller.java   |  13 +-
 .../apache/ignite/marshaller/Marshaller.java    |  10 +-
 .../ignite/marshaller/MarshallerContext.java    |   4 +-
 .../ignite/marshaller/MarshallerExclusions.java |  27 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |  18 +-
 .../jdk/JdkMarshallerDummySerializable.java     |   4 +-
 .../jdk/JdkMarshallerInputStreamWrapper.java    |   5 +-
 .../jdk/JdkMarshallerObjectInputStream.java     |   9 +-
 .../jdk/JdkMarshallerObjectOutputStream.java    |  10 +-
 .../jdk/JdkMarshallerOutputStreamWrapper.java   |   5 +-
 .../optimized/OptimizedClassDescriptor.java     |  83 +++++-
 .../optimized/OptimizedFieldType.java           |   2 +-
 .../optimized/OptimizedMarshaller.java          |  26 +-
 .../optimized/OptimizedMarshallerIdMapper.java  |   2 +-
 .../optimized/OptimizedMarshallerUtils.java     |  32 ++-
 .../optimized/OptimizedObjectInputStream.java   |  91 +++++-
 .../optimized/OptimizedObjectOutputStream.java  |  58 +++-
 .../OptimizedObjectStreamRegistry.java          |  17 +-
 .../marshaller/portable/PortableMarshaller.java |  30 +-
 .../ignite/messaging/MessagingListenActor.java  |  22 +-
 .../ignite/mxbean/CacheMetricsMXBean.java       |  10 +-
 .../mxbean/ClusterLocalNodeMetricsMXBean.java   |   4 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |   7 +-
 .../apache/ignite/mxbean/IgnitionMXBean.java    |   2 +-
 .../apache/ignite/mxbean/MXBeanDescription.java |   8 +-
 .../mxbean/MXBeanParametersDescriptions.java    |   8 +-
 .../ignite/mxbean/MXBeanParametersNames.java    |   8 +-
 .../apache/ignite/mxbean/ThreadPoolMXBean.java  |   2 +-
 .../ignite/plugin/CachePluginConfiguration.java |   5 +-
 .../ignite/plugin/CachePluginContext.java       |  10 +-
 .../ignite/plugin/CachePluginProvider.java      |  10 +-
 .../org/apache/ignite/plugin/Extension.java     |   2 +-
 .../apache/ignite/plugin/ExtensionRegistry.java |   2 +-
 .../org/apache/ignite/plugin/IgnitePlugin.java  |   2 +-
 .../ignite/plugin/PluginConfiguration.java      |   2 +-
 .../org/apache/ignite/plugin/PluginContext.java |  16 +-
 .../ignite/plugin/PluginNotFoundException.java  |   4 +-
 .../apache/ignite/plugin/PluginProvider.java    |  16 +-
 .../plugin/PluginValidationException.java       |   7 +-
 .../plugin/extensions/communication/IoPool.java |   7 +-
 .../extensions/communication/Message.java       |   6 +-
 .../MessageCollectionItemType.java              |   4 +-
 .../communication/MessageFactory.java           |   6 +-
 .../communication/MessageFormatter.java         |   4 +-
 .../extensions/communication/MessageReader.java |  13 +-
 .../extensions/communication/MessageWriter.java |  12 +-
 .../plugin/security/AuthenticationContext.java  |   6 +-
 .../plugin/security/SecurityCredentials.java    |  16 +-
 .../SecurityCredentialsBasicProvider.java       |   4 +-
 .../security/SecurityCredentialsProvider.java   |   4 +-
 .../plugin/security/SecurityException.java      |   6 +-
 .../plugin/security/SecurityPermission.java     |   4 +-
 .../plugin/security/SecurityPermissionSet.java  |  10 +-
 .../ignite/plugin/security/SecuritySubject.java |   8 +-
 .../plugin/security/SecuritySubjectType.java    |   6 +-
 .../plugin/segmentation/SegmentationPolicy.java |   2 +-
 .../segmentation/SegmentationResolver.java      |   9 +-
 .../apache/ignite/portable/PortableBuilder.java |   7 +-
 .../ignite/portable/PortableException.java      |   7 +-
 .../ignite/portable/PortableIdMapper.java       |   4 +-
 .../portable/PortableInvalidClassException.java |   4 +-
 .../ignite/portable/PortableMarshalAware.java   |   2 +-
 .../ignite/portable/PortableMetadata.java       |  10 +-
 .../apache/ignite/portable/PortableObject.java  |  17 +-
 .../portable/PortableProtocolVersion.java       |   4 +-
 .../ignite/portable/PortableRawReader.java      |  13 +-
 .../ignite/portable/PortableRawWriter.java      |  13 +-
 .../apache/ignite/portable/PortableReader.java  |  13 +-
 .../ignite/portable/PortableSerializer.java     |   4 +-
 .../portable/PortableTypeConfiguration.java     |  11 +-
 .../apache/ignite/portable/PortableWriter.java  |  13 +-
 .../ignite/resources/CacheNameResource.java     |   8 +-
 .../resources/CacheStoreSessionResource.java    |   8 +-
 .../resources/IgniteInstanceResource.java       |   8 +-
 .../ignite/resources/JobContextResource.java    |   8 +-
 .../ignite/resources/LoadBalancerResource.java  |   8 +-
 .../apache/ignite/resources/LoggerResource.java |   8 +-
 .../ignite/resources/MBeanServerResource.java   |  10 +-
 .../ignite/resources/ServiceResource.java       |   8 +-
 .../SpringApplicationContextResource.java       |   8 +-
 .../apache/ignite/resources/SpringResource.java |  10 +-
 .../resources/TaskContinuousMapperResource.java |   8 +-
 .../ignite/resources/TaskSessionResource.java   |   8 +-
 .../apache/ignite/resources/package-info.java   |   2 +-
 .../ignite/scheduler/SchedulerFuture.java       |  14 +-
 .../org/apache/ignite/services/Service.java     |   4 +-
 .../ignite/services/ServiceConfiguration.java   |  13 +-
 .../apache/ignite/services/ServiceContext.java  |   9 +-
 .../ignite/services/ServiceDescriptor.java      |  10 +-
 .../ignite/spi/IgniteNodeValidationResult.java  |   4 +-
 .../apache/ignite/spi/IgnitePortProtocol.java   |   4 +-
 .../java/org/apache/ignite/spi/IgniteSpi.java   |   9 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |  68 +++--
 .../ignite/spi/IgniteSpiCloseableIterator.java  |   9 +-
 .../ignite/spi/IgniteSpiConfiguration.java      |   8 +-
 .../ignite/spi/IgniteSpiConsistencyChecked.java |   8 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |  27 +-
 .../apache/ignite/spi/IgniteSpiException.java   |   4 +-
 .../ignite/spi/IgniteSpiManagementMBean.java    |   7 +-
 .../ignite/spi/IgniteSpiMultiException.java     |  11 +-
 .../spi/IgniteSpiMultipleInstancesSupport.java  |   9 +-
 .../org/apache/ignite/spi/IgniteSpiNoop.java    |   8 +-
 .../spi/IgniteSpiOperationTimeoutException.java |  10 +-
 .../spi/IgniteSpiOperationTimeoutHelper.java    |  10 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  |  10 +-
 .../ignite/spi/IgniteSpiThreadFactory.java      |   7 +-
 .../ignite/spi/IgniteSpiTimeoutObject.java      |   4 +-
 .../spi/IgniteSpiVersionCheckException.java     |   2 +-
 .../spi/checkpoint/CheckpointListener.java      |   2 +-
 .../ignite/spi/checkpoint/CheckpointSpi.java    |   7 +-
 .../checkpoint/cache/CacheCheckpointSpi.java    |  35 ++-
 .../cache/CacheCheckpointSpiMBean.java          |   6 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |  30 +-
 .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java |   6 +-
 .../spi/checkpoint/noop/NoopCheckpointSpi.java  |  19 +-
 .../sharedfs/SharedFsCheckpointData.java        |   7 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |  40 ++-
 .../sharedfs/SharedFsCheckpointSpiMBean.java    |   9 +-
 .../checkpoint/sharedfs/SharedFsTimeData.java   |   4 +-
 .../sharedfs/SharedFsTimeoutTask.java           |  23 +-
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |  17 +-
 .../ignite/spi/collision/CollisionContext.java  |   4 +-
 .../collision/CollisionExternalListener.java    |   4 +-
 .../spi/collision/CollisionJobContext.java      |   6 +-
 .../ignite/spi/collision/CollisionSpi.java      |   6 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |  23 +-
 .../fifoqueue/FifoQueueCollisionSpiMBean.java   |   6 +-
 .../jobstealing/JobStealingCollisionSpi.java    |  65 +++--
 .../JobStealingCollisionSpiMBean.java           |  11 +-
 .../jobstealing/JobStealingDisabled.java        |   8 +-
 .../jobstealing/JobStealingRequest.java         |  13 +-
 .../spi/collision/noop/NoopCollisionSpi.java    |  15 +-
 .../PriorityQueueCollisionSpi.java              |  37 ++-
 .../PriorityQueueCollisionSpiMBean.java         |   6 +-
 .../communication/CommunicationListener.java    |   9 +-
 .../spi/communication/CommunicationSpi.java     |  14 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 149 +++++++---
 .../tcp/TcpCommunicationSpiMBean.java           |   6 +-
 .../spi/deployment/DeploymentListener.java      |   2 +-
 .../spi/deployment/DeploymentResource.java      |   2 +-
 .../deployment/DeploymentResourceAdapter.java   |   4 +-
 .../ignite/spi/deployment/DeploymentSpi.java    |   7 +-
 .../IgnoreIfPeerClassLoadingDisabled.java       |   9 +-
 .../deployment/local/LocalDeploymentSpi.java    |  44 +--
 .../local/LocalDeploymentSpiMBean.java          |   6 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |  11 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |  20 +-
 .../discovery/DiscoverySpiCustomMessage.java    |   7 +-
 .../spi/discovery/DiscoverySpiDataExchange.java |   7 +-
 .../discovery/DiscoverySpiHistorySupport.java   |   9 +-
 .../spi/discovery/DiscoverySpiListener.java     |  12 +-
 .../DiscoverySpiNodeAuthenticator.java          |  10 +-
 .../spi/discovery/DiscoverySpiOrderSupport.java |   9 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    | 123 ++++++--
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 160 ++++++++---
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |  36 ++-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 110 ++++++--
 .../spi/discovery/tcp/TcpDiscoverySpiMBean.java |  12 +-
 .../tcp/internal/TcpDiscoveryNode.java          |  50 ++--
 .../tcp/internal/TcpDiscoveryNodesRing.java     |  33 ++-
 .../tcp/internal/TcpDiscoverySpiState.java      |   2 +-
 .../tcp/internal/TcpDiscoveryStatistics.java    |  26 +-
 .../tcp/ipfinder/TcpDiscoveryIpFinder.java      |  10 +-
 .../ipfinder/TcpDiscoveryIpFinderAdapter.java   |  23 +-
 .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java |  42 +--
 .../TcpDiscoveryMulticastIpFinder.java          |  56 ++--
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |  37 ++-
 .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java |  31 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |  14 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  14 +-
 .../TcpDiscoveryCheckFailedMessage.java         |   7 +-
 .../messages/TcpDiscoveryClientAckResponse.java |  10 +-
 .../TcpDiscoveryClientHeartbeatMessage.java     |  11 +-
 .../messages/TcpDiscoveryClientPingRequest.java |   9 +-
 .../TcpDiscoveryClientPingResponse.java         |   9 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  12 +-
 .../TcpDiscoveryConnectionCheckMessage.java     |  12 +-
 .../TcpDiscoveryCustomEventMessage.java         |  15 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |   9 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |   9 +-
 .../messages/TcpDiscoveryEnsureDelivery.java    |   8 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   7 +-
 .../messages/TcpDiscoveryHandshakeResponse.java |   7 +-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  30 +-
 .../TcpDiscoveryJoinRequestMessage.java         |   9 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |   8 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  12 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  20 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |   9 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   7 +-
 .../tcp/messages/TcpDiscoveryPingRequest.java   |   9 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |   7 +-
 .../messages/TcpDiscoveryRedirectToClient.java  |   8 +-
 .../TcpDiscoveryStatusCheckMessage.java         |   9 +-
 .../spi/eventstorage/EventStorageSpi.java       |  12 +-
 .../memory/MemoryEventStorageSpi.java           |  32 ++-
 .../memory/MemoryEventStorageSpiMBean.java      |   6 +-
 .../ignite/spi/failover/FailoverContext.java    |  18 +-
 .../apache/ignite/spi/failover/FailoverSpi.java |   9 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |  31 +-
 .../failover/always/AlwaysFailoverSpiMBean.java |   6 +-
 .../jobstealing/JobStealingFailoverSpi.java     |  35 ++-
 .../JobStealingFailoverSpiMBean.java            |   6 +-
 .../spi/failover/never/NeverFailoverSpi.java    |  21 +-
 .../failover/never/NeverFailoverSpiMBean.java   |   6 +-
 .../spi/indexing/IndexingQueryFilter.java       |   6 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |  13 +-
 .../spi/indexing/noop/NoopIndexingSpi.java      |  17 +-
 .../spi/loadbalancing/LoadBalancingSpi.java     |  14 +-
 .../adaptive/AdaptiveCpuLoadProbe.java          |   8 +-
 .../adaptive/AdaptiveJobCountLoadProbe.java     |   7 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |  67 +++--
 .../adaptive/AdaptiveLoadBalancingSpiMBean.java |   6 +-
 .../adaptive/AdaptiveLoadProbe.java             |   4 +-
 .../AdaptiveProcessingTimeLoadProbe.java        |   7 +-
 .../RoundRobinGlobalLoadBalancer.java           |  39 ++-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |  48 ++--
 .../RoundRobinLoadBalancingSpiMBean.java        |   6 +-
 .../RoundRobinPerTaskLoadBalancer.java          |  10 +-
 .../WeightedRandomLoadBalancingSpi.java         |  55 ++--
 .../WeightedRandomLoadBalancingSpiMBean.java    |   6 +-
 .../ignite/spi/swapspace/SwapContext.java       |   4 +-
 .../apache/ignite/spi/swapspace/SwapKey.java    |   9 +-
 .../ignite/spi/swapspace/SwapSpaceSpi.java      |  16 +-
 .../spi/swapspace/SwapSpaceSpiListener.java     |   4 +-
 .../spi/swapspace/file/FileSwapArray.java       |   7 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |  81 ++++--
 .../swapspace/file/FileSwapSpaceSpiMBean.java   |   6 +-
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |  33 ++-
 .../apache/ignite/ssl/SslContextFactory.java    |  29 +-
 .../ignite/startup/BasicWarmupClosure.java      |  45 +--
 .../ignite/startup/cmdline/AboutDialog.java     |  41 ++-
 .../CommandLineRandomNumberGenerator.java       |   4 +-
 .../startup/cmdline/CommandLineStartup.java     |  53 ++--
 .../startup/cmdline/CommandLineTransformer.java |   7 +-
 .../org/apache/ignite/startup/package-info.java |   2 +-
 .../org/apache/ignite/stream/StreamAdapter.java |   6 +-
 .../apache/ignite/stream/StreamReceiver.java    |  12 +-
 .../apache/ignite/stream/StreamTransformer.java |  15 +-
 .../ignite/stream/StreamTupleExtractor.java     |   4 +-
 .../org/apache/ignite/stream/StreamVisitor.java |  11 +-
 .../org/apache/ignite/stream/package-info.java  |   2 +-
 .../stream/socket/SocketMessageConverter.java   |   2 +-
 .../ignite/stream/socket/SocketStreamer.java    |  35 ++-
 .../thread/IgniteStripedThreadPoolExecutor.java |  18 +-
 .../org/apache/ignite/thread/IgniteThread.java  |   9 +-
 .../ignite/thread/IgniteThreadFactory.java      |   7 +-
 .../ignite/thread/IgniteThreadPoolExecutor.java |  13 +-
 .../apache/ignite/transactions/Transaction.java |  12 +-
 .../transactions/TransactionConcurrency.java    |   4 +-
 .../TransactionHeuristicException.java          |   4 +-
 .../transactions/TransactionIsolation.java      |   4 +-
 .../ignite/transactions/TransactionMetrics.java |   4 +-
 .../TransactionOptimisticException.java         |   4 +-
 .../TransactionRollbackException.java           |   4 +-
 .../ignite/transactions/TransactionState.java   |   4 +-
 .../TransactionTimeoutException.java            |   4 +-
 .../java/org/jetbrains/annotations/NotNull.java |   8 +-
 .../java/org/jsr166/ConcurrentHashMap8.java     |  20 +-
 .../java/org/jsr166/ConcurrentLinkedDeque8.java |  18 +-
 .../org/jsr166/ConcurrentLinkedHashMap.java     |  28 +-
 .../src/main/java/org/jsr166/LongAdder8.java    |   8 +-
 .../src/main/java/org/jsr166/Striped64_8.java   |   4 +-
 .../GridCacheAffinityBackupsSelfTest.java       |  20 +-
 .../ignite/GridSuppressedExceptionSelfTest.java |   9 +-
 .../java/org/apache/ignite/GridTestIoUtils.java |  28 +-
 .../java/org/apache/ignite/GridTestJob.java     |   6 +-
 .../org/apache/ignite/GridTestJobContext.java   |  12 +-
 .../org/apache/ignite/GridTestJobResult.java    |  11 +-
 .../org/apache/ignite/GridTestNodeStartup.java  |   7 +-
 .../apache/ignite/GridTestStoreNodeStartup.java |   8 +-
 .../java/org/apache/ignite/GridTestTask.java    |  13 +-
 .../org/apache/ignite/GridTestTaskSession.java  |  20 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |  30 +-
 .../IgniteExternalizableAbstractTest.java       |  16 +-
 .../cache/IgniteWarmupClosureSelfTest.java      |  15 +-
 .../affinity/IgniteClientNodeAffinityTest.java  |  34 +--
 .../GridFairAffinityFunctionNodesSelfTest.java  |  25 +-
 .../fair/GridFairAffinityFunctionSelfTest.java  |  26 +-
 .../IgniteFairAffinityDynamicCacheSelfTest.java |  25 +-
 ...cheStoreSessionListenerAbstractSelfTest.java |  36 +--
 ...heStoreSessionListenerLifecycleSelfTest.java |  40 +--
 .../store/GridCacheBalancingStoreSelfTest.java  |  34 ++-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |  18 +-
 .../cache/store/GridGeneratingTestStore.java    |  19 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     |  39 ++-
 .../CacheJdbcPojoStoreMultitreadedSelfTest.java |   4 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |  57 ++--
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |  67 +++--
 .../CacheJdbcStoreSessionListenerSelfTest.java  |  28 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |  55 ++--
 .../jdbc/GridCacheJdbcBlobStoreSelfTest.java    |   9 +-
 .../cache/store/jdbc/model/Organization.java    |   3 +-
 .../cache/store/jdbc/model/OrganizationKey.java |   3 +-
 .../ignite/cache/store/jdbc/model/Person.java   |   3 +-
 .../store/jdbc/model/PersonComplexKey.java      |   4 +-
 .../cache/store/jdbc/model/PersonKey.java       |   3 +-
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |  64 +++--
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |  30 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |  23 +-
 .../igfs/IgfsFragmentizerTopologySelfTest.java  |   4 +-
 .../apache/ignite/igfs/IgfsPathSelfTest.java    |  26 +-
 .../ignite/igfs/IgfsTestInputGenerator.java     |   7 +-
 .../internal/ClusterGroupAbstractTest.java      |  64 +++--
 .../internal/ClusterGroupHostsSelfTest.java     |  24 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  21 +-
 .../ignite/internal/ClusterMetricsSelfTest.java |  34 ++-
 .../internal/ClusterNodeMetricsSelfTest.java    |  41 +--
 .../ignite/internal/GridAffinityMappedTest.java |  33 ++-
 .../internal/GridAffinityP2PSelfTest.java       |  41 +--
 .../ignite/internal/GridAffinitySelfTest.java   |  34 ++-
 .../GridAlwaysFailoverSpiFailSelfTest.java      |  32 ++-
 .../internal/GridCancelOnGridStopSelfTest.java  |  27 +-
 .../internal/GridCancelUnusedJobSelfTest.java   |  39 ++-
 .../GridCancelledJobsMetricsSelfTest.java       |  47 +++-
 .../GridCollisionJobsContextSelfTest.java       |  28 +-
 .../internal/GridCommunicationSelfTest.java     |  19 +-
 .../GridContinuousJobAnnotationSelfTest.java    |  36 ++-
 .../GridContinuousJobSiblingsSelfTest.java      |  29 +-
 .../internal/GridContinuousTaskSelfTest.java    |  44 ++-
 .../GridDeploymentMultiThreadedSelfTest.java    |  29 +-
 .../ignite/internal/GridDeploymentSelfTest.java |  43 +--
 .../internal/GridDiscoveryEventSelfTest.java    |  48 ++--
 .../ignite/internal/GridDiscoverySelfTest.java  |  60 ++--
 .../GridEventStorageCheckAllEventsSelfTest.java |  67 +++--
 ...ventStorageRuntimeConfigurationSelfTest.java |  38 ++-
 .../internal/GridEventStorageSelfTest.java      |  38 ++-
 .../internal/GridFactoryVmShutdownTest.java     |  21 +-
 ...ridFailFastNodeFailureDetectionSelfTest.java |  37 ++-
 .../GridFailedInputParametersSelfTest.java      |  14 +-
 .../GridFailoverCustomTopologySelfTest.java     |  38 ++-
 .../ignite/internal/GridFailoverSelfTest.java   |  36 ++-
 .../GridFailoverTaskWithPredicateSelfTest.java  |  41 ++-
 .../internal/GridFailoverTopologySelfTest.java  |  34 ++-
 .../ignite/internal/GridHomePathSelfTest.java   |  13 +-
 .../GridJobCheckpointCleanupSelfTest.java       |  35 ++-
 .../GridJobCollisionCancelSelfTest.java         |  41 ++-
 .../ignite/internal/GridJobContextSelfTest.java |  26 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |  71 +++--
 .../internal/GridJobStealingSelfTest.java       |  51 ++--
 .../GridJobStealingZeroActiveJobsSelfTest.java  |  36 ++-
 .../internal/GridJobSubjectIdSelfTest.java      |  32 ++-
 .../GridKernalConcurrentAccessStopSelfTest.java |  12 +-
 .../ignite/internal/GridKernalTestUtils.java    |   4 +-
 .../internal/GridLifecycleAwareSelfTest.java    |  28 +-
 .../internal/GridLifecycleBeanSelfTest.java     |  37 ++-
 .../internal/GridListenActorSelfTest.java       |  21 +-
 .../GridLocalEventListenerSelfTest.java         |  18 +-
 .../internal/GridMultipleJobsSelfTest.java      |  41 +--
 .../internal/GridMultipleSpisSelfTest.java      |  40 ++-
 .../GridMultipleVersionsDeploymentSelfTest.java |  48 ++--
 .../GridMultithreadedJobStealingSelfTest.java   |  41 +--
 .../ignite/internal/GridNodeFilterSelfTest.java |  13 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |  17 +-
 .../GridNodeVisorAttributesSelfTest.java        |  11 +-
 .../internal/GridNonHistoryMetricsSelfTest.java |  37 +--
 .../GridProjectionForCachesSelfTest.java        |  36 +--
 ...ectionLocalJobMultipleArgumentsSelfTest.java |  33 ++-
 .../ignite/internal/GridReduceSelfTest.java     |  20 +-
 .../internal/GridReleaseTypeSelfTest.java       |  22 +-
 .../internal/GridRuntimeExceptionSelfTest.java  |  40 ++-
 .../internal/GridSameVmStartupSelfTest.java     |  29 +-
 .../apache/ignite/internal/GridSelfTest.java    |  24 +-
 .../internal/GridSpiExceptionSelfTest.java      |  33 ++-
 .../ignite/internal/GridStartStopSelfTest.java  |  31 +-
 .../apache/ignite/internal/GridStartupMain.java |   9 +-
 .../apache/ignite/internal/GridStartupTest.java |  12 +-
 .../internal/GridStopWithCancelSelfTest.java    |  28 +-
 .../internal/GridStopWithWaitSelfTest.java      |  46 ++-
 .../GridTaskCancelSingleNodeSelfTest.java       |  41 ++-
 .../GridTaskContinuousMapperSelfTest.java       |  31 +-
 .../GridTaskExecutionContextSelfTest.java       |  34 ++-
 .../internal/GridTaskExecutionSelfTest.java     |  11 +-
 .../GridTaskFailoverAffinityRunTest.java        |  38 +--
 .../internal/GridTaskFailoverSelfTest.java      |  25 +-
 .../GridTaskFutureImplStopGridSelfTest.java     |  34 ++-
 .../GridTaskInstanceExecutionSelfTest.java      |  23 +-
 .../internal/GridTaskInstantiationSelfTest.java |  26 +-
 .../internal/GridTaskJobRejectSelfTest.java     |  46 +--
 .../internal/GridTaskListenerSelfTest.java      |  28 +-
 .../internal/GridTaskMapAsyncSelfTest.java      |  33 ++-
 .../GridTaskNameAnnotationSelfTest.java         |  30 +-
 .../internal/GridTaskResultCacheSelfTest.java   |  23 +-
 .../internal/GridTaskTimeoutSelfTest.java       |  42 ++-
 .../GridTopicExternalizableSelfTest.java        |  14 +-
 .../internal/GridUpdateNotifierSelfTest.java    |  23 +-
 .../ignite/internal/GridVersionSelfTest.java    |  10 +-
 .../IgniteClientReconnectAbstractTest.java      |  66 +++--
 .../IgniteClientReconnectApiExceptionTest.java  |  57 ++--
 .../IgniteClientReconnectAtomicsTest.java       |  18 +-
 .../IgniteClientReconnectCacheTest.java         | 102 ++++---
 .../IgniteClientReconnectCollectionsTest.java   |  26 +-
 .../IgniteClientReconnectComputeTest.java       |  17 +-
 ...eClientReconnectContinuousProcessorTest.java |  29 +-
 ...IgniteClientReconnectDiscoveryStateTest.java |  24 +-
 ...niteClientReconnectFailoverAbstractTest.java |  38 +--
 .../IgniteClientReconnectFailoverTest.java      |  34 ++-
 .../IgniteClientReconnectServicesTest.java      |  23 +-
 .../internal/IgniteClientReconnectStopTest.java |  21 +-
 .../IgniteClientReconnectStreamerTest.java      |  28 +-
 .../IgniteComputeEmptyClusterGroupTest.java     |  35 +--
 .../IgniteComputeTopologyExceptionTest.java     |  25 +-
 .../internal/IgniteExecutorServiceTest.java     |  25 +-
 ...gniteExplicitImplicitDeploymentSelfTest.java |  43 ++-
 .../internal/IgniteInternalCacheRemoveTest.java |   6 +-
 .../IgniteSlowClientDetectionSelfTest.java      |  47 ++--
 .../managers/GridManagerStopSelfTest.java       |  64 ++---
 .../managers/GridNoopManagerSelfTest.java       |  19 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |  77 +++--
 .../GridCheckpointManagerSelfTest.java          |   4 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |  49 ++--
 ...idCommunicationManagerListenersSelfTest.java |  26 +-
 .../GridCommunicationSendMessageSelfTest.java   |  35 +--
 .../communication/GridIoManagerSelfTest.java    |  45 +--
 .../GridDeploymentManagerStopSelfTest.java      |  25 +-
 .../GridDeploymentMessageCountSelfTest.java     |  45 +--
 .../managers/deployment/GridTestDeployment.java |   6 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |  49 ++--
 .../GridDiscoveryManagerAttributesSelfTest.java |  21 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |  29 +-
 .../IgniteTopologyPrintFormatSelfTest.java      |  32 +--
 .../events/GridEventStorageManagerSelfTest.java |  24 +-
 .../GridSwapSpaceCustomLocalValue.java          |   7 +-
 .../swapspace/GridSwapSpaceManagerSelfTest.java |  38 +--
 .../GridPortableAffinityKeySelfTest.java        |  45 +--
 .../GridPortableBuilderAdditionalSelfTest.java  |  63 +++--
 .../portable/GridPortableBuilderSelfTest.java   |  45 +--
 ...eBuilderStringAsCharsAdditionalSelfTest.java |   2 +-
 ...ridPortableBuilderStringAsCharsSelfTest.java |   2 +-
 ...idPortableMarshallerCtxDisabledSelfTest.java |  14 +-
 .../GridPortableMarshallerSelfTest.java         |  74 +++--
 .../GridPortableMetaDataDisabledSelfTest.java   |  19 +-
 .../portable/GridPortableMetaDataSelfTest.java  |  27 +-
 .../portable/GridPortableWildcardsSelfTest.java |  18 +-
 .../GridPortableMarshalerAwareTestClass.java    |  13 +-
 .../mutabletest/GridPortableTestClasses.java    |  23 +-
 .../portable/test/GridPortableTestClass1.java   |   2 +-
 .../portable/test/GridPortableTestClass2.java   |   2 +-
 .../test/subpackage/GridPortableTestClass3.java |   2 +-
 .../GridCacheTxLoadFromStoreOnLockSelfTest.java |  36 ++-
 .../GridAffinityProcessorAbstractSelfTest.java  |  32 ++-
 ...GridAffinityProcessorRendezvousSelfTest.java |   6 +-
 .../cache/CacheAffinityCallSelfTest.java        |  42 +--
 .../cache/CacheClientStoreSelfTest.java         |  33 ++-
 ...cheDhtLocalPartitionAfterRemoveSelfTest.java |  13 +-
 .../cache/CacheFutureExceptionSelfTest.java     |  32 ++-
 .../processors/cache/CacheGetFromJobTest.java   |  19 +-
 .../CacheMetricsForClusterGroupSelfTest.java    |  31 +-
 ...cheNearUpdateTopologyChangeAbstractTest.java |  27 +-
 .../cache/CacheOffheapMapEntrySelfTest.java     |  36 ++-
 .../CacheReadThroughAtomicRestartSelfTest.java  |   6 +-
 ...heReadThroughLocalAtomicRestartSelfTest.java |   6 +-
 .../CacheReadThroughLocalRestartSelfTest.java   |   6 +-
 ...dThroughReplicatedAtomicRestartSelfTest.java |   6 +-
 ...cheReadThroughReplicatedRestartSelfTest.java |   6 +-
 .../cache/CacheReadThroughRestartSelfTest.java  |  28 +-
 .../cache/CacheRemoveAllSelfTest.java           |  17 +-
 .../cache/CacheStopAndDestroySelfTest.java      |  50 ++--
 .../CacheStoreUsageMultinodeAbstractTest.java   |  64 +++--
 ...eUsageMultinodeDynamicStartAbstractTest.java |   8 +-
 ...oreUsageMultinodeDynamicStartAtomicTest.java |   6 +-
 ...heStoreUsageMultinodeDynamicStartTxTest.java |   6 +-
 ...reUsageMultinodeStaticStartAbstractTest.java |   9 +-
 ...toreUsageMultinodeStaticStartAtomicTest.java |   6 +-
 ...cheStoreUsageMultinodeStaticStartTxTest.java |   6 +-
 .../cache/CrossCacheTxRandomOperationsTest.java |  59 ++--
 ...ridCacheAbstractByteArrayValuesSelfTest.java |  12 +-
 .../GridCacheAbstractFailoverSelfTest.java      |  42 +--
 .../GridCacheAbstractFailoverTxSelfTest.java    |   9 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |  35 ++-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 132 ++++++---
 .../GridCacheAbstractIteratorsSelfTest.java     |  14 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |  73 +++--
 .../cache/GridCacheAbstractMetricsSelfTest.java |  42 +--
 .../GridCacheAbstractRemoveFailureTest.java     |  45 +--
 .../cache/GridCacheAbstractSelfTest.java        |  70 +++--
 .../cache/GridCacheAbstractTxReadTest.java      |  14 +-
 ...acheAbstractUsersAffinityMapperSelfTest.java |  37 ++-
 .../cache/GridCacheAffinityApiSelfTest.java     |  34 ++-
 .../cache/GridCacheAffinityMapperSelfTest.java  |  14 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |  45 +--
 .../cache/GridCacheAlwaysEvictionPolicy.java    |  11 +-
 .../GridCacheAsyncOperationsLimitSelfTest.java  |  15 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |  49 ++--
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |   7 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |  50 ++--
 .../cache/GridCacheBasicStoreAbstractTest.java  |  47 ++--
 ...acheBasicStoreMultithreadedAbstractTest.java |  29 +-
 .../cache/GridCacheClearAllSelfTest.java        |  31 +-
 .../cache/GridCacheClearLocallySelfTest.java    |  42 +--
 ...dCacheColocatedTxStoreExceptionSelfTest.java |   8 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |  35 +--
 .../cache/GridCacheConcurrentMapTest.java       |  28 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |  97 ++++---
 ...idCacheConfigurationConsistencySelfTest.java |  85 +++---
 ...ridCacheConfigurationValidationSelfTest.java |  27 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |  35 +--
 .../GridCacheDeploymentOffHeapSelfTest.java     |   9 +-
 .../cache/GridCacheDeploymentSelfTest.java      |  42 +--
 .../cache/GridCacheEntryMemorySizeSelfTest.java |  47 ++--
 .../cache/GridCacheEntryVersionSelfTest.java    |  37 +--
 .../GridCacheEvictionEventAbstractTest.java     |  39 +--
 .../GridCacheFinishPartitionsSelfTest.java      |  42 +--
 ...CacheFullTextQueryMultithreadedSelfTest.java |  29 +-
 .../cache/GridCacheGenericTestStore.java        |  29 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |  40 +--
 .../cache/GridCacheIncrementTransformTest.java  |  46 +--
 .../GridCacheInterceptorAbstractSelfTest.java   |  57 ++--
 ...cheInterceptorAtomicNearEnabledSelfTest.java |   4 +-
 ...erceptorAtomicPrimaryWriteOrderSelfTest.java |  14 +-
 ...omicReplicatedPrimaryWriteOrderSelfTest.java |  14 +-
 ...acheInterceptorAtomicReplicatedSelfTest.java |  14 +-
 .../GridCacheInterceptorAtomicSelfTest.java     |  14 +-
 ...ceptorAtomicWithStoreReplicatedSelfTest.java |   2 +-
 ...CacheInterceptorAtomicWithStoreSelfTest.java |   2 +-
 ...GridCacheInterceptorLocalAtomicSelfTest.java |  14 +-
 ...InterceptorLocalAtomicWithStoreSelfTest.java |   2 +-
 .../GridCacheInterceptorLocalSelfTest.java      |   9 +-
 ...dCacheInterceptorLocalWithStoreSelfTest.java |   2 +-
 ...GridCacheInterceptorNearEnabledSelfTest.java |   6 +-
 .../GridCacheInterceptorReplicatedSelfTest.java |   9 +-
 ...eInterceptorReplicatedWithStoreSelfTest.java |   2 +-
 .../cache/GridCacheInterceptorSelfTest.java     |   9 +-
 .../GridCacheInterceptorWithStoreSelfTest.java  |   2 +-
 .../cache/GridCacheIteratorPerformanceTest.java |  27 +-
 .../GridCacheKeyCheckNearEnabledSelfTest.java   |   4 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |  25 +-
 .../processors/cache/GridCacheLeakTest.java     |  33 +--
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  52 ++--
 .../GridCacheLocalTxStoreExceptionSelfTest.java |   6 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |  42 +--
 .../GridCacheMarshallerTxAbstractTest.java      |  28 +-
 .../GridCacheMarshallingNodeJoinSelfTest.java   |  50 ++--
 .../cache/GridCacheMemoryModeSelfTest.java      |  37 +--
 .../GridCacheMissingCommitVersionSelfTest.java  |  33 ++-
 ...GridCacheMixedPartitionExchangeSelfTest.java |  47 ++--
 .../cache/GridCacheMultiUpdateLockSelfTest.java |  46 +--
 ...ridCacheMultinodeUpdateAbstractSelfTest.java |  26 +-
 ...ultinodeUpdateAtomicNearEnabledSelfTest.java |   8 +-
 .../GridCacheMultinodeUpdateAtomicSelfTest.java |   8 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |   4 +-
 ...CacheMultinodeUpdateNearEnabledSelfTest.java |   8 +-
 .../cache/GridCacheMultinodeUpdateSelfTest.java |   8 +-
 .../cache/GridCacheMvccFlagsTest.java           |  16 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |  31 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  29 +-
 .../processors/cache/GridCacheMvccSelfTest.java |  30 +-
 .../GridCacheNearTxStoreExceptionSelfTest.java  |   6 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  40 +--
 .../cache/GridCacheObjectToStringSelfTest.java  |  41 +--
 ...ffHeapAtomicMultiThreadedUpdateSelfTest.java |   6 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |  34 +--
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |  18 +-
 .../processors/cache/GridCacheOffHeapTest.java  |  35 +--
 .../GridCacheOffHeapTieredAbstractSelfTest.java |  49 ++--
 .../GridCacheOffHeapTieredAtomicSelfTest.java   |   6 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |  34 +--
 ...acheOffHeapTieredEvictionAtomicSelfTest.java |   6 +-
 .../GridCacheOffHeapTieredEvictionSelfTest.java |   6 +-
 .../cache/GridCacheOffHeapTieredSelfTest.java   |   6 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |  26 +-
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  40 +--
 .../GridCacheOnCopyFlagAtomicSelfTest.java      |   9 +-
 .../cache/GridCacheOnCopyFlagLocalSelfTest.java |   9 +-
 .../GridCacheOnCopyFlagReplicatedSelfTest.java  |   9 +-
 ...ridCacheOnCopyFlagTxPartitionedSelfTest.java |   9 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |  29 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |  50 ++--
 .../GridCachePartitionedAffinitySpreadTest.java |  19 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |  42 +--
 .../GridCachePartitionedLocalStoreSelfTest.java |  11 +-
 ...chePartitionedOffHeapLocalStoreSelfTest.java |  11 +-
 ...hePartitionedProjectionAffinitySelfTest.java |  31 +-
 .../cache/GridCachePartitionedWritesTest.java   |  28 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |  61 ++--
 .../cache/GridCachePutAllFailoverSelfTest.java  |  79 ++++--
 .../processors/cache/GridCachePutAllTask.java   |  37 ++-
 .../cache/GridCacheQueryEmbeddedValue.java      |   9 +-
 .../GridCacheQueryIndexingDisabledSelfTest.java |  20 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |  33 ++-
 .../GridCacheReferenceCleanupSelfTest.java      |  45 +--
 .../cache/GridCacheReloadSelfTest.java          |  29 +-
 .../GridCacheReplicatedLocalStoreSelfTest.java  |  11 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |  50 ++--
 ...CacheReplicatedTxStoreExceptionSelfTest.java |   8 +-
 ...heReplicatedUsersAffinityMapperSelfTest.java |   7 +-
 .../GridCacheReturnValueTransferSelfTest.java   |  35 ++-
 .../cache/GridCacheSlowTxWarnTest.java          |  26 +-
 .../processors/cache/GridCacheStopSelfTest.java |  35 ++-
 .../cache/GridCacheStorePutxSelfTest.java       |  39 +--
 .../cache/GridCacheStoreValueBytesSelfTest.java |  24 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |  46 +--
 .../cache/GridCacheSwapReloadSelfTest.java      |  54 ++--
 ...acheTcpClientDiscoveryMultiThreadedTest.java |  31 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  32 ++-
 .../processors/cache/GridCacheTestKey.java      |   7 +-
 .../processors/cache/GridCacheTestStore.java    |  45 +--
 .../processors/cache/GridCacheTestValue.java    |   9 +-
 .../processors/cache/GridCacheTestValue2.java   |  11 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |  22 +-
 .../cache/GridCacheTtlManagerLoadTest.java      |  23 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |  35 +--
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |  11 +-
 .../GridCacheTxUsersAffinityMapperSelfTest.java |   7 +-
 .../cache/GridCacheUtilsSelfTest.java           |  18 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |  26 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |  37 +--
 ...istencyTransactionalNearEnabledSelfTest.java |   4 +-
 ...heValueConsistencyTransactionalSelfTest.java |   6 +-
 .../GridCacheVariableTopologySelfTest.java      |  43 +--
 .../cache/GridCacheVersionMultinodeTest.java    |  39 ++-
 .../cache/GridCacheVersionSelfTest.java         |  16 +-
 ...ProjectionForCachesOnDaemonNodeSelfTest.java |  20 +-
 ...teAtomicCacheEntryProcessorNodeJoinTest.java |   6 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |  62 ++--
 .../cache/IgniteCacheAbstractTest.java          |  47 ++--
 ...IgniteCacheAtomicCopyOnReadDisabledTest.java |   6 +-
 .../cache/IgniteCacheAtomicInvokeTest.java      |  14 +-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |  11 +-
 .../IgniteCacheAtomicLocalPeekModesTest.java    |   9 +-
 .../IgniteCacheAtomicLocalStoreValueTest.java   |  11 +-
 ...niteCacheAtomicLocalWithStoreInvokeTest.java |   7 +-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |   4 +-
 ...iteCacheAtomicNearEnabledStoreValueTest.java |   4 +-
 .../IgniteCacheAtomicNearPeekModesTest.java     |   2 +-
 .../cache/IgniteCacheAtomicPeekModesTest.java   |  12 +-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |  14 +-
 ...maryWriteOrderNearEnabledStoreValueTest.java |   4 +-
 ...heAtomicPrimaryWriteOrderStoreValueTest.java |   6 +-
 ...micPrimaryWriteOrderWithStoreInvokeTest.java |   7 +-
 ...IgniteCacheAtomicPutAllFailoverSelfTest.java |   6 +-
 ...gniteCacheAtomicReplicatedPeekModesTest.java |   6 +-
 .../IgniteCacheAtomicStopBusySelfTest.java      |   6 +-
 .../cache/IgniteCacheAtomicStoreValueTest.java  |  14 +-
 ...teCacheConfigurationDefaultTemplateTest.java |  16 +-
 .../IgniteCacheConfigurationTemplateTest.java   |  36 +--
 .../IgniteCacheContainsKeyAbstractSelfTest.java |  23 +-
 ...niteCacheCopyOnReadDisabledAbstractTest.java |  12 +-
 .../cache/IgniteCacheDynamicStopSelfTest.java   |  18 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  71 +++--
 ...IgniteCacheEntryListenerAtomicLocalTest.java |  11 +-
 ...eCacheEntryListenerAtomicReplicatedTest.java |   6 +-
 .../IgniteCacheEntryListenerAtomicTest.java     |  14 +-
 ...eCacheEntryListenerEagerTtlDisabledTest.java |   4 +-
 .../IgniteCacheEntryListenerTxLocalTest.java    |  11 +-
 ...gniteCacheEntryListenerTxReplicatedTest.java |   6 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |  11 +-
 .../IgniteCacheEntryProcessorNodeJoinTest.java  |  49 ++--
 .../IgniteCacheInterceptorSelfTestSuite.java    |   4 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |  47 ++--
 .../cache/IgniteCacheInvokeReadThroughTest.java |  22 +-
 .../IgniteCacheManyAsyncOperationsTest.java     |  26 +-
 .../cache/IgniteCacheNearLockValueSelfTest.java |  45 +--
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |  23 +-
 ...gniteCacheP2pUnmarshallingNearErrorTest.java |   7 +-
 ...CacheP2pUnmarshallingRebalanceErrorTest.java |  11 +-
 .../IgniteCacheP2pUnmarshallingTxErrorTest.java |  25 +-
 .../IgniteCachePartitionMapUpdateTest.java      |  32 ++-
 .../cache/IgniteCachePeekModesAbstractTest.java |  53 ++--
 .../cache/IgniteCachePutAllRestartTest.java     |  40 +--
 .../cache/IgniteCacheStartStopLoadTest.java     |  20 +-
 .../IgniteCacheStoreValueAbstractTest.java      |  46 +--
 .../IgniteCacheTopologySafeGetSelfTest.java     |  44 +--
 ...gniteCacheTransactionalStopBusySelfTest.java |   4 +-
 .../IgniteCacheTxCopyOnReadDisabledTest.java    |   6 +-
 .../cache/IgniteCacheTxInvokeTest.java          |  11 +-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |  11 +-
 .../cache/IgniteCacheTxLocalPeekModesTest.java  |   9 +-
 .../cache/IgniteCacheTxLocalStoreValueTest.java |  11 +-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |   4 +-
 .../IgniteCacheTxNearEnabledStoreValueTest.java |   4 +-
 .../cache/IgniteCacheTxNearPeekModesTest.java   |   2 +-
 .../cache/IgniteCacheTxPeekModesTest.java       |  12 +-
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |  40 +--
 .../IgniteCacheTxReplicatedPeekModesTest.java   |   6 +-
 .../cache/IgniteCacheTxStoreValueTest.java      |  11 +-
 .../cache/IgniteCachingProviderSelfTest.java    |  18 +-
 .../IgniteClientAffinityAssignmentSelfTest.java |  34 +--
 .../IgniteDaemonNodeMarshallerCacheTest.java    |  31 +-
 ...eDynamicCacheStartNoExchangeTimeoutTest.java |  55 ++--
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  57 ++--
 ...niteDynamicCacheWithConfigStartSelfTest.java |  15 +-
 .../IgniteDynamicClientCacheStartSelfTest.java  |  38 +--
 .../cache/IgniteExchangeFutureHistoryTest.java  |  17 +-
 .../cache/IgniteInternalCacheTypesTest.java     |  30 +-
 .../cache/IgnitePutAllLargeBatchSelfTest.java   |  37 ++-
 ...tAllUpdateNonPreloadedPartitionSelfTest.java |  26 +-
 ...teStartCacheInTransactionAtomicSelfTest.java |   6 +-
 .../IgniteStartCacheInTransactionSelfTest.java  |  28 +-
 .../cache/IgniteStaticCacheStartSelfTest.java   |  14 +-
 .../cache/IgniteSystemCacheOnClientTest.java    |  25 +-
 ...gniteTopologyValidatorAbstractCacheTest.java |  20 +-
 ...iteTopologyValidatorAbstractTxCacheTest.java |  12 +-
 ...ValidatorNearPartitionedAtomicCacheTest.java |   4 +-
 ...logyValidatorNearPartitionedTxCacheTest.java |   4 +-
 ...logyValidatorPartitionedAtomicCacheTest.java |  12 +-
 ...TopologyValidatorPartitionedTxCacheTest.java |   4 +-
 ...ologyValidatorReplicatedAtomicCacheTest.java |  12 +-
 ...eTopologyValidatorReplicatedTxCacheTest.java |   4 +-
 .../processors/cache/IgniteTxAbstractTest.java  |  48 ++--
 .../IgniteTxConcurrentGetAbstractTest.java      |  33 ++-
 .../IgniteTxExceptionAbstractSelfTest.java      |  49 ++--
 .../cache/IgniteTxMultiNodeAbstractTest.java    |  65 +++--
 .../IgniteTxMultiThreadedAbstractTest.java      |  36 ++-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |  51 ++--
 .../IgniteTxSingleThreadedAbstractTest.java     |  11 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |  48 ++--
 .../cache/OffHeapTieredTransactionSelfTest.java |  40 +--
 ...IgniteCacheAbstractExecutionContextTest.java |  17 +-
 .../IgniteCacheAtomicExecutionContextTest.java  |  12 +-
 ...niteCacheContinuousExecutionContextTest.java |   5 +-
 ...IgniteCacheIsolatedExecutionContextTest.java |   5 +-
 ...niteCacheP2PDisableExecutionContextTest.java |   4 +-
 ...iteCachePartitionedExecutionContextTest.java |  12 +-
 .../IgniteCachePrivateExecutionContextTest.java |   5 +-
 ...niteCacheReplicatedExecutionContextTest.java |  12 +-
 .../IgniteCacheSharedExecutionContextTest.java  |   5 +-
 .../IgniteCacheTxExecutionContextTest.java      |  12 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  41 ++-
 ...actQueueFailoverDataConsistencySelfTest.java |  41 +--
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   8 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |  11 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |   8 +-
 .../GridCacheMultiNodeDataStructureTest.java    |  11 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  31 +-
 .../GridCacheQueueCleanupSelfTest.java          |  41 +--
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |  36 +--
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  38 ++-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  34 ++-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  28 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |  43 +--
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |  27 +-
 .../GridCacheSetAbstractSelfTest.java           |  45 +--
 .../GridCacheSetFailoverAbstractSelfTest.java   |  36 ++-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |  17 +-
 .../IgniteAtomicsAbstractTest.java              |  15 +-
 .../IgniteClientDataStructuresAbstractTest.java |  30 +-
 .../IgniteClientDataStructuresTest.java         |   2 +-
 ...IgniteClientDiscoveryDataStructuresTest.java |   2 +-
 .../IgniteCollectionAbstractTest.java           |  30 +-
 .../IgniteCountDownLatchAbstractSelfTest.java   |  44 ++-
 .../IgniteDataStructureUniqueNameTest.java      |  42 ++-
 .../IgniteDataStructureWithJobTest.java         |  28 +-
 .../GridCacheLocalAtomicOffheapSetSelfTest.java |   6 +-
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |   9 +-
 .../local/GridCacheLocalAtomicSetSelfTest.java  |  14 +-
 .../GridCacheLocalOffheapQueueApiSelfTest.java  |   6 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |  14 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |   8 +-
 .../local/GridCacheLocalSetSelfTest.java        |  14 +-
 .../local/IgniteLocalAtomicLongApiSelfTest.java |   8 +-
 .../IgniteLocalCountDownLatchSelfTest.java      |  24 +-
 ...artitionedAtomicOffheapQueueApiSelfTest.java |   6 +-
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |   6 +-
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java |   6 +-
 ...dCachePartitionedAtomicQueueApiSelfTest.java |   9 +-
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |   9 +-
 ...micQueueFailoverDataConsistencySelfTest.java |  11 +-
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |   9 +-
 ...itionedAtomicQueueRotativeMultiNodeTest.java |   9 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |  10 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |  10 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  23 +-
 ...chePartitionedAtomicSetFailoverSelfTest.java |  11 +-
 .../GridCachePartitionedAtomicSetSelfTest.java  |   6 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |  10 +-
 ...rtitionedDataStructuresFailoverSelfTest.java |  14 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |  39 +--
 ...artitionedOffHeapValuesQueueApiSelfTest.java |   6 +-
 ...achePartitionedOffHeapValuesSetSelfTest.java |   6 +-
 ...edOffheapDataStructuresFailoverSelfTest.java |   6 +-
 ...hePartitionedOffheapSetFailoverSelfTest.java |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |  14 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  46 +--
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  50 ++--
 ...nedQueueFailoverDataConsistencySelfTest.java |  11 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |  14 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |  14 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |  14 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |  10 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |  10 +-
 ...GridCachePartitionedSetFailoverSelfTest.java |  11 +-
 .../GridCachePartitionedSetSelfTest.java        |  14 +-
 .../IgnitePartitionedAtomicLongApiSelfTest.java |   8 +-
 ...IgnitePartitionedCountDownLatchSelfTest.java |   8 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |  16 +-
 ...cheReplicatedAtomicReferenceApiSelfTest.java |   8 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |   8 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |   8 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |  14 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |  14 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |  14 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |  14 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |   8 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |  10 +-
 .../GridCacheReplicatedSetSelfTest.java         |  14 +-
 .../IgniteReplicatedAtomicLongApiSelfTest.java  |   8 +-
 .../IgniteReplicatedCountDownLatchSelfTest.java |   8 +-
 ...acheAsyncOperationsFailoverAbstractTest.java |  40 +--
 .../CacheAsyncOperationsFailoverAtomicTest.java |   6 +-
 .../CacheAsyncOperationsFailoverTxTest.java     |   6 +-
 .../distributed/CacheAsyncOperationsTest.java   |  43 +--
 ...CacheAtomicNearUpdateTopologyChangeTest.java |  11 +-
 .../CacheGetFutureHangsSelfTest.java            |  35 ++-
 ...CacheLoadingConcurrentGridStartSelfTest.java |  40 +--
 .../CacheNoValueClassOnServerNodeTest.java      |  30 +-
 .../CacheTxNearUpdateTopologyChangeTest.java    |   8 +-
 ...tractDistributedByteArrayValuesSelfTest.java |  32 ++-
 .../GridCacheAbstractJobExecutionTest.java      |  44 +--
 .../GridCacheAbstractNodeRestartSelfTest.java   |  57 ++--
 ...tractPartitionedByteArrayValuesSelfTest.java |  17 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |  32 ++-
 .../GridCacheBasicOpAbstractTest.java           |  45 +--
 .../GridCacheClientModesAbstractSelfTest.java   |  30 +-
 ...ientModesTcpClientDiscoveryAbstractTest.java |  13 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |  31 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |  19 +-
 .../distributed/GridCacheEventAbstractTest.java |  51 ++--
 ...heExpiredEntriesPreloadAbstractSelfTest.java |  36 +--
 .../distributed/GridCacheLockAbstractTest.java  |  50 ++--
 .../distributed/GridCacheMixedModeSelfTest.java |  15 +-
 .../GridCacheModuloAffinityFunction.java        |  21 +-
 .../GridCacheMultiNodeAbstractTest.java         |  46 +--
 .../GridCacheMultiNodeLockAbstractTest.java     |  47 ++--
 ...dCacheMultithreadedFailoverAbstractTest.java |  79 ++++--
 .../GridCacheNodeFailureAbstractTest.java       |  59 ++--
 ...ridCachePartitionNotLoadedEventSelfTest.java |  43 +--
 ...dCachePartitionedAffinityFilterSelfTest.java |  38 +--
 ...chePartitionedReloadAllAbstractSelfTest.java |  51 ++--
 .../GridCachePreloadEventsAbstractSelfTest.java |  41 +--
 .../GridCachePreloadLifecycleAbstractTest.java  |  30 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |  40 +--
 .../GridCacheTransformEventSelfTest.java        |  69 +++--
 .../distributed/IgniteCache150ClientsTest.java  |  44 +--
 .../IgniteCacheAtomicMessageRecoveryTest.java   |   6 +-
 .../IgniteCacheAtomicNodeJoinTest.java          |  11 +-
 .../IgniteCacheAtomicNodeRestartTest.java       |   8 +-
 ...niteCacheClientNodeChangingTopologyTest.java | 120 +++++---
 .../IgniteCacheClientNodeConcurrentStart.java   |  25 +-
 ...teCacheClientNodePartitionsExchangeTest.java |  72 +++--
 .../IgniteCacheClientReconnectTest.java         |  36 +--
 .../distributed/IgniteCacheManyClientsTest.java |  49 ++--
 .../IgniteCacheMessageRecoveryAbstractTest.java |  45 +--
 .../IgniteCacheNearOffheapGetSelfTest.java      |  29 +-
 .../IgniteCacheNodeJoinAbstractTest.java        |  26 +-
 .../IgniteCachePutGetRestartAbstractTest.java   |  42 +--
 .../IgniteCacheServerNodeConcurrentStart.java   |  18 +-
 .../IgniteCacheSizeFailoverTest.java            |  35 +--
 .../IgniteCacheSystemTransactionsSelfTest.java  |  39 +--
 .../IgniteCacheTxFairAffinityNodeJoinTest.java  |   6 +-
 .../IgniteCacheTxMessageRecoveryTest.java       |   6 +-
 ...arDisabledFairAffinityPutGetRestartTest.java |   6 +-
 ...iteCacheTxNearDisabledPutGetRestartTest.java |   4 +-
 .../distributed/IgniteCacheTxNodeJoinTest.java  |   8 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        |  39 +--
 ...iteTxConsistencyRestartAbstractSelfTest.java |  47 ++--
 .../distributed/IgniteTxGetAfterStopTest.java   |  22 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |  57 ++--
 ...cOriginatingNodeFailureAbstractSelfTest.java |  68 +++--
 .../IgniteTxPreloadAbstractTest.java            |  41 +--
 .../IgniteTxTimeoutAbstractTest.java            |  30 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |  18 +-
 ...heAbstractTransformWriteThroughSelfTest.java |  42 +--
 ...acheAtomicExpiredEntriesPreloadSelfTest.java |  13 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |  29 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |  58 ++--
 ...idCacheAtomicNearEnabledFullApiSelfTest.java |   4 +-
 ...EnabledPrimaryWriteOrderFullApiSelfTest.java |   4 +-
 ...eAtomicPrimaryWriteOrderFullApiSelfTest.java |   6 +-
 ...tomicPrimaryWriteOrderReloadAllSelfTest.java |   6 +-
 .../dht/GridCacheAtomicReloadAllSelfTest.java   |   8 +-
 .../dht/GridCacheClientOnlySelfTest.java        |  15 +-
 .../dht/GridCacheColocatedDebugTest.java        |  64 +++--
 .../dht/GridCacheColocatedFailoverSelfTest.java |  10 +-
 ...eColocatedOptimisticTransactionSelfTest.java |  34 +--
 ...ridCacheColocatedPreloadRestartSelfTest.java |   4 +-
 .../GridCacheColocatedPrimarySyncSelfTest.java  |   6 +-
 .../GridCacheColocatedReloadAllSelfTest.java    |   4 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |  10 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |  17 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |  26 +-
 .../GridCacheDaemonNodePartitionedSelfTest.java |   6 +-
 ...cheDhtAtomicEvictionNearReadersSelfTest.java |   6 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |  13 +-
 .../GridCacheDhtClientRemoveFailureTest.java    |   2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  47 ++--
 .../dht/GridCacheDhtEntrySetSelfTest.java       |  10 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  52 ++--
 .../dht/GridCacheDhtEvictionSelfTest.java       |  53 ++--
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |  24 +-
 ...idCacheDhtExpiredEntriesPreloadSelfTest.java |  10 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |  43 +--
 .../dht/GridCacheDhtMappingSelfTest.java        |  30 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |  18 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |  39 +--
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |  65 +++--
 .../GridCacheDhtPreloadDisabledSelfTest.java    |  56 ++--
 .../GridCacheDhtPreloadMessageCountTest.java    |  50 ++--
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |  34 +--
 .../dht/GridCacheDhtPreloadOffHeapSelfTest.java |   8 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |  44 +--
 .../dht/GridCacheDhtPreloadSelfTest.java        |  74 +++--
 .../GridCacheDhtPreloadStartStopSelfTest.java   |  50 ++--
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |  40 +--
 .../dht/GridCacheDhtRemoveFailureTest.java      |  10 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |  42 ++-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |  10 +-
 .../dht/GridCacheGlobalLoadTest.java            |  39 +--
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...ePartitionedNearDisabledFullApiSelfTest.java |   6 +-
 ...achePartitionedNearDisabledLockSelfTest.java |   6 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |  18 +-
 ...nedNearDisabledMultiNodeFullApiSelfTest.java |   6 +-
 ...bledMultiNodeP2PDisabledFullApiSelfTest.java |   6 +-
 ...ionedNearDisabledOffHeapFullApiSelfTest.java |   6 +-
 ...DisabledOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...abledOffHeapTieredAtomicFullApiSelfTest.java |  13 +-
 ...earDisabledOffHeapTieredFullApiSelfTest.java |   6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...NearDisabledOptimisticTxNodeRestartTest.java |   4 +-
 ...isabledTxOriginatingNodeFailureSelfTest.java |   4 +-
 ...dOnlyP2PDisabledByteArrayValuesSelfTest.java |   2 +-
 ...edOnlyP2PEnabledByteArrayValuesSelfTest.java |   2 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |  37 ++-
 ...dCachePartitionedTopologyChangeSelfTest.java |  65 +++--
 ...ransformWriteThroughBatchUpdateSelfTest.java |   2 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |  19 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |  42 +--
 ...IgniteCacheContainsKeyColocatedSelfTest.java |   8 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |  64 +++--
 .../dht/IgniteCacheLockFailoverSelfTest.java    |  24 +-
 .../dht/IgniteCacheMultiTxLockSelfTest.java     |  42 +--
 ...rDisabledPrimaryNodeFailureRecoveryTest.java |   4 +-
 ...rtitionedPrimaryNodeFailureRecoveryTest.java |   4 +-
 ...woBackupsPrimaryNodeFailureRecoveryTest.java |   4 +-
 ...ePrimaryNodeFailureRecoveryAbstractTest.java |  72 +++--
 .../IgniteCachePutRetryAbstractSelfTest.java    |  47 ++--
 .../dht/IgniteCachePutRetryAtomicSelfTest.java  |  34 +--
 ...gniteCachePutRetryTransactionalSelfTest.java |  48 ++--
 ...teTxConsistencyColocatedRestartSelfTest.java |   8 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |  15 +-
 ...cClientInvalidPartitionHandlingSelfTest.java |   2 +-
 .../GridCacheAtomicClientRemoveFailureTest.java |   2 +-
 .../atomic/GridCacheAtomicFailoverSelfTest.java |  16 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  81 +++---
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |  40 +--
 ...AtomicPrimaryWriteOrderFailoverSelfTest.java |   6 +-
 ...tomicPrimaryWriteOrderRemoveFailureTest.java |  16 +-
 .../GridCacheAtomicRemoveFailureTest.java       |  16 +-
 ...idCacheAtomicReplicatedFailoverSelfTest.java |   8 +-
 ...lueConsistencyAtomicNearEnabledSelfTest.java |   4 +-
 ...micPrimaryWriteOrderNearEnabledSelfTest.java |   8 +-
 ...sistencyAtomicPrimaryWriteOrderSelfTest.java |   6 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |   8 +-
 ...CacheContainsKeyColocatedAtomicSelfTest.java |   9 +-
 ...gniteCacheContainsKeyNearAtomicSelfTest.java |   7 +-
 ...PutRetryAtomicPrimaryWriteOrderSelfTest.java |   8 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |   6 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |  43 +--
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |  43 +--
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |   4 +-
 ...micFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |  14 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |  12 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...omicNearEnabledMultiNodeFullApiSelfTest.java |   4 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |   4 +-
 ...ridCacheAtomicNearEvictionEventSelfTest.java |  11 +-
 .../GridCacheAtomicNearEvictionSelfTest.java    |   6 +-
 .../GridCacheAtomicNearMultiNodeSelfTest.java   |   6 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |  27 +-
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../GridCacheAtomicNearReadersSelfTest.java     |   6 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |  14 +-
 .../GridCacheAtomicOffHeapFullApiSelfTest.java  |  12 +-
 ...heAtomicOffHeapMultiNodeFullApiSelfTest.java |  12 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |  16 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |   9 +-
 ...derFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |   6 +-
 ...rderMultiNodeP2PDisabledFullApiSelfTest.java |   6 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |  14 +-
 ...PrimaryWriteOrderOffHeapFullApiSelfTest.java |   6 +-
 ...yWriteOrderOffHeapTieredFullApiSelfTest.java |   6 +-
 ...ityOrderOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...erOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |  43 +--
 .../GridCacheNearEvictionEventSelfTest.java     |   9 +-
 .../near/GridCacheNearEvictionSelfTest.java     |  41 +--
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |   8 +-
 .../near/GridCacheNearJobExecutionSelfTest.java |  13 +-
 .../near/GridCacheNearMetricsSelfTest.java      |  16 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |  49 ++--
 .../near/GridCacheNearMultiNodeSelfTest.java    |  79 ++++--
 .../near/GridCacheNearOneNodeSelfTest.java      |  40 +--
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  61 ++--
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../near/GridCacheNearOnlySelfTest.java         |  16 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |  43 +--
 .../GridCacheNearPartitionedClearSelfTest.java  |  35 +--
 ...ionedP2PDisabledByteArrayValuesSelfTest.java |   2 +-
 ...tionedP2PEnabledByteArrayValuesSelfTest.java |   2 +-
 .../GridCacheNearPreloadRestartSelfTest.java    |   4 +-
 .../near/GridCacheNearPrimarySyncSelfTest.java  |   6 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |  34 ++-
 .../near/GridCacheNearReadersSelfTest.java      |  59 ++--
 .../near/GridCacheNearReloadAllSelfTest.java    |   4 +-
 .../near/GridCacheNearRemoveFailureTest.java    |  11 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |   8 +-
 .../near/GridCacheNearTxForceKeyTest.java       |  25 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |  55 ++--
 ...ssimisticOriginatingNodeFailureSelfTest.java |  15 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |  11 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |  35 +--
 ...rtitionedAffinityHashIdResolverSelfTest.java |  30 +-
 .../GridCachePartitionedAffinitySelfTest.java   |  57 ++--
 ...ionedAtomicGetAndTransformStoreSelfTest.java |   6 +-
 .../near/GridCachePartitionedBasicApiTest.java  |  12 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |  14 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  42 +--
 .../GridCachePartitionedBasicStoreSelfTest.java |   8 +-
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |  19 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |   4 +-
 .../GridCachePartitionedEntryLockSelfTest.java  |   9 +-
 .../near/GridCachePartitionedEventSelfTest.java |  15 +-
 .../GridCachePartitionedEvictionSelfTest.java   |  50 ++--
 ...titionedExplicitLockNodeFailureSelfTest.java |  42 +--
 .../GridCachePartitionedFailoverSelfTest.java   |   8 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |  32 ++-
 ...PartitionedFullApiMultithreadedSelfTest.java |   8 +-
 .../GridCachePartitionedFullApiSelfTest.java    |  23 +-
 ...PartitionedGetAndTransformStoreSelfTest.java |   8 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |  40 +--
 .../GridCachePartitionedIteratorsSelfTest.java  |   8 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |  36 +--
 .../near/GridCachePartitionedLockSelfTest.java  |  14 +-
 .../GridCachePartitionedMetricsSelfTest.java    |  13 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |  72 +++--
 ...achePartitionedMultiNodeFullApiSelfTest.java |  47 ++--
 ...idCachePartitionedMultiNodeLockSelfTest.java |  13 +-
 ...onedMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../GridCachePartitionedMultiNodeSelfTest.java  |  13 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |  44 +--
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |   4 +-
 ...itionedNearOnlyNoPrimaryFullApiSelfTest.java |   4 +-
 .../near/GridCachePartitionedNestedTxTest.java  |  11 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |  13 +-
 .../GridCachePartitionedNodeRestartTest.java    |  15 +-
 ...dCachePartitionedOffHeapFullApiSelfTest.java |   6 +-
 ...titionedOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |   9 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |  18 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  42 +--
 .../GridCachePartitionedStorePutSelfTest.java   |  34 +--
 ...GridCachePartitionedTxConcurrentGetTest.java |  11 +-
 ...GridCachePartitionedTxMultiNodeSelfTest.java |  11 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |  22 +-
 .../near/GridCachePartitionedTxReadTest.java    |   6 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |  49 ++--
 ...achePartitionedTxSingleThreadedSelfTest.java |  26 +-
 .../GridCachePartitionedTxTimeoutSelfTest.java  |  18 +-
 .../near/GridCachePutArrayValueSelfTest.java    |  21 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |  28 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   6 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |  34 +--
 .../IgniteCacheContainsKeyNearSelfTest.java     |   6 +-
 .../near/IgniteCacheNearOnlyTxTest.java         |  34 ++-
 .../near/IgniteCacheNearReadCommittedTest.java  |  19 +-
 .../near/IgniteCacheNearTxRollbackTest.java     |  39 +--
 .../near/IgniteTxReentryNearSelfTest.java       |  15 +-
 .../near/NoneRebalanceModeSelfTest.java         |  15 +-
 ...stractReplicatedByteArrayValuesSelfTest.java |  16 +-
 ...ridCacheAtomicReplicatedMetricsSelfTest.java |  12 +-
 .../GridCacheDaemonNodeReplicatedSelfTest.java  |   6 +-
 ...nedFairAffinityMultiNodeFullApiSelfTest.java |   8 +-
 ...ridCacheReplicatedAtomicFullApiSelfTest.java |   6 +-
 ...catedAtomicGetAndTransformStoreSelfTest.java |   6 +-
 ...eplicatedAtomicMultiNodeFullApiSelfTest.java |  11 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |   6 +-
 .../GridCacheReplicatedBasicApiTest.java        |   9 +-
 .../GridCacheReplicatedBasicOpSelfTest.java     |   9 +-
 .../GridCacheReplicatedBasicStoreSelfTest.java  |   8 +-
 .../GridCacheReplicatedEntrySetSelfTest.java    |   8 +-
 .../GridCacheReplicatedEventSelfTest.java       |   8 +-
 ...ridCacheReplicatedEvictionEventSelfTest.java |   9 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |  31 +-
 .../GridCacheReplicatedFailoverSelfTest.java    |  10 +-
 ...eReplicatedFullApiMultithreadedSelfTest.java |   8 +-
 ...ReplicatedFullApiMultithreadedSelfTest1.java |   4 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |  12 +-
 ...eReplicatedGetAndTransformStoreSelfTest.java |   8 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |  56 ++--
 .../GridCacheReplicatedIteratorsSelfTest.java   |   8 +-
 .../GridCacheReplicatedJobExecutionTest.java    |  11 +-
 .../GridCacheReplicatedLockSelfTest.java        |   8 +-
 .../GridCacheReplicatedMarshallerTxTest.java    |  11 +-
 .../GridCacheReplicatedMetricsSelfTest.java     |   9 +-
 ...CacheReplicatedMultiNodeFullApiSelfTest.java |   2 +-
 ...ridCacheReplicatedMultiNodeLockSelfTest.java |   8 +-
 ...atedMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../GridCacheReplicatedMultiNodeSelfTest.java   |   9 +-
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |   8 +-
 .../GridCacheReplicatedNodeFailureSelfTest.java |  11 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |  13 +-
 ...idCacheReplicatedOffHeapFullApiSelfTest.java |   6 +-
 ...plicatedOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...eReplicatedOffHeapTieredFullApiSelfTest.java |   6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...catedP2PDisabledByteArrayValuesSelfTest.java |   2 +-
 ...icatedP2PEnabledByteArrayValuesSelfTest.java |   2 +-
 ...ridCacheReplicatedPreloadEventsSelfTest.java |   8 +-
 .../GridCacheReplicatedTxConcurrentGetTest.java |  11 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java |  10 +-
 ...GridCacheReplicatedTxMultiNodeBasicTest.java |  10 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |  23 +-
 ...licatedTxOriginatingNodeFailureSelfTest.java |   7 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |  18 +-
 .../GridCacheReplicatedTxReadTest.java          |   6 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |  22 +-
 .../GridCacheReplicatedTxTimeoutSelfTest.java   |  15 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |  43 +--
 .../GridCacheSyncReplicatedPreloadSelfTest.java |  34 +--
 .../replicated/GridReplicatedTxPreloadTest.java |   8 +-
 ...acheAtomicReplicatedNodeRestartSelfTest.java |   6 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |  48 ++--
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |   6 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  68 +++--
 ...eplicatedPreloadStartStopEventsSelfTest.java |  29 +-
 ...GridCacheReplicatedPreloadUndeploysTest.java |  13 +-
 .../cache/eviction/EvictionAbstractTest.java    |  71 +++--
 .../GridCacheBatchEvictUnswapSelfTest.java      |  30 +-
 ...heConcurrentEvictionConsistencySelfTest.java |  52 ++--
 .../GridCacheConcurrentEvictionsSelfTest.java   |  44 +--
 .../GridCacheDistributedEvictionsSelfTest.java  |  45 +--
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |  44 +--
 .../GridCacheEmptyEntriesLocalSelfTest.java     |   6 +-
 ...ridCacheEmptyEntriesPartitionedSelfTest.java |   6 +-
 .../GridCacheEvictionFilterSelfTest.java        |  45 +--
 .../GridCacheEvictionLockUnlockSelfTest.java    |  46 +--
 .../GridCacheEvictionTouchSelfTest.java         |  51 ++--
 .../cache/eviction/GridCacheMockEntry.java      |  15 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |  37 +--
 .../fifo/FifoEvictionPolicySelfTest.java        |   6 +-
 .../eviction/lru/LruEvictionPolicySelfTest.java |  10 +-
 .../lru/LruNearEvictionPolicySelfTest.java      |  38 +--
 .../LruNearOnlyNearEvictionPolicySelfTest.java  |  38 ++-
 .../RandomEvictionPolicyCacheSizeSelfTest.java  |  13 +-
 .../random/RandomEvictionPolicySelfTest.java    |  16 +-
 .../SortedEvictionPolicyPerformanceTest.java    |  26 +-
 .../sorted/SortedEvictionPolicySelfTest.java    |   6 +-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |  14 +-
 ...iteCacheAtomicExpiryPolicyWithStoreTest.java |  12 +-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |  11 +-
 ...AtomicPrimaryWriteOrderExpiryPolicyTest.java |   6 +-
 ...maryWriteOrderWithStoreExpiryPolicyTest.java |   7 +-
 ...teCacheAtomicReplicatedExpiryPolicyTest.java |   6 +-
 ...iteCacheAtomicWithStoreExpiryPolicyTest.java |   7 +-
 .../IgniteCacheClientNearCacheExpiryTest.java   |  29 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  72 +++--
 .../IgniteCacheExpiryPolicyTestSuite.java       |   6 +-
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |  35 +--
 .../expiry/IgniteCacheTtlCleanupSelfTest.java   |  26 +-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |  11 +-
 .../IgniteCacheTxExpiryPolicyWithStoreTest.java |   9 +-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |  11 +-
 ...IgniteCacheTxReplicatedExpiryPolicyTest.java |   6 +-
 .../IgniteCacheTxWithStoreExpiryPolicyTest.java |   7 +-
 .../IgniteCacheAtomicLoadAllTest.java           |  14 +-
 .../IgniteCacheAtomicLoaderWriterTest.java      |  14 +-
 .../IgniteCacheAtomicLocalLoadAllTest.java      |  11 +-
 ...CacheAtomicLocalNoLoadPreviousValueTest.java |  11 +-
 ...IgniteCacheAtomicLocalNoReadThroughTest.java |  11 +-
 ...gniteCacheAtomicLocalNoWriteThroughTest.java |  11 +-
 ...tomicNearEnabledNoLoadPreviousValueTest.java |   4 +-
 ...CacheAtomicNearEnabledNoReadThroughTest.java |   4 +-
 ...acheAtomicNearEnabledNoWriteThroughTest.java |   4 +-
 ...gniteCacheAtomicNoLoadPreviousValueTest.java |  14 +-
 .../IgniteCacheAtomicNoReadThroughTest.java     |  14 +-
 .../IgniteCacheAtomicNoWriteThroughTest.java    |  14 +-
 .../IgniteCacheAtomicStoreSessionTest.java      |  14 +-
 ...eCacheAtomicStoreSessionWriteBehindTest.java |   9 +-
 ...IgniteCacheJdbcBlobStoreNodeRestartTest.java |  14 +-
 .../IgniteCacheLoadAllAbstractTest.java         |  33 ++-
 .../IgniteCacheLoaderWriterAbstractTest.java    |  35 ++-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |  30 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |  40 +--
 .../IgniteCacheNoWriteThroughAbstractTest.java  |  33 ++-
 ...IgniteCacheStoreNodeRestartAbstractTest.java |  12 +-
 .../IgniteCacheStoreSessionAbstractTest.java    |  44 +--
 ...acheStoreSessionWriteBehindAbstractTest.java |  35 ++-
 .../integration/IgniteCacheTxLoadAllTest.java   |  11 +-
 .../IgniteCacheTxLoaderWriterTest.java          |  11 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |  11 +-
 ...niteCacheTxLocalNoLoadPreviousValueTest.java |  11 +-
 .../IgniteCacheTxLocalNoReadThroughTest.java    |  11 +-
 .../IgniteCacheTxLocalNoWriteThroughTest.java   |  11 +-
 ...cheTxNearEnabledNoLoadPreviousValueTest.java |   4 +-
 ...niteCacheTxNearEnabledNoReadThroughTest.java |   4 +-
 ...iteCacheTxNearEnabledNoWriteThroughTest.java |   4 +-
 .../IgniteCacheTxNoLoadPreviousValueTest.java   |  11 +-
 .../IgniteCacheTxNoReadThroughTest.java         |  11 +-
 .../IgniteCacheTxNoWriteThroughTest.java        |  11 +-
 .../IgniteCacheTxStoreSessionTest.java          |  30 +-
 ...gniteCacheTxStoreSessionWriteBehindTest.java |   6 +-
 ...CacheLocalOffHeapAndSwapMetricsSelfTest.java |  17 +-
 ...dCacheAtomicLocalMetricsNoStoreSelfTest.java |   4 +-
 .../GridCacheAtomicLocalMetricsSelfTest.java    |  12 +-
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |   9 +-
 .../local/GridCacheDaemonNodeLocalSelfTest.java |   9 +-
 .../GridCacheLocalAtomicBasicStoreSelfTest.java |   6 +-
 .../GridCacheLocalAtomicFullApiSelfTest.java    |   6 +-
 ...LocalAtomicGetAndTransformStoreSelfTest.java |   6 +-
 ...dCacheLocalAtomicOffHeapFullApiSelfTest.java |   6 +-
 ...LocalAtomicOffHeapTieredFullApiSelfTest.java |   6 +-
 .../local/GridCacheLocalBasicApiSelfTest.java   |   9 +-
 ...cheLocalBasicStoreMultithreadedSelfTest.java |   6 +-
 .../local/GridCacheLocalBasicStoreSelfTest.java |   8 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |  40 +--
 .../local/GridCacheLocalEventSelfTest.java      |   8 +-
 .../GridCacheLocalEvictionEventSelfTest.java    |   9 +-
 ...dCacheLocalFullApiMultithreadedSelfTest.java |   8 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |  25 +-
 ...dCacheLocalGetAndTransformStoreSelfTest.java |   8 +-
 .../GridCacheLocalIsolatedNodesSelfTest.java    |  18 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |   8 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |  27 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |  29 +-
 .../local/GridCacheLocalMetricsSelfTest.java    |   9 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |  36 ++-
 .../GridCacheLocalOffHeapFullApiSelfTest.java   |   4 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |   8 +-
 .../GridCacheLocalTxMultiThreadedSelfTest.java  |  13 +-
 .../cache/local/GridCacheLocalTxReadTest.java   |   6 +-
 .../GridCacheLocalTxSingleThreadedSelfTest.java |  13 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |  36 ++-
 ...OnlyFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...AtomicClientOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...pyOnReadDisabledMultiJvmFullApiSelfTest.java |   4 +-
 ...omicFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 .../GridCacheAtomicMultiJvmFullApiSelfTest.java |   4 +-
 ...tomicMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...tomicNearEnabledMultiJvmFullApiSelfTest.java |   4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |   4 +-
 ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...micOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...rderFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |   4 +-
 ...OrderMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...rityOrderOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...derOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...OnlyFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...pyOnReadDisabledMultiJvmFullApiSelfTest.java |   4 +-
 ...onedFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...CachePartitionedMultiJvmFullApiSelfTest.java |   4 +-
 ...ionedMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...micOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...onedNearDisabledMultiJvmFullApiSelfTest.java |   4 +-
 ...abledMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...rDisabledOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...ledOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...rtitionedOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...nedOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...ReplicatedAtomicMultiJvmFullApiSelfTest.java |   4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |   4 +-
 ...dCacheReplicatedMultiJvmFullApiSelfTest.java |   4 +-
 ...catedMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...plicatedNearOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...eplicatedOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...tedOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...ClientNodePortableMetadataMultinodeTest.java |  47 ++--
 ...GridCacheClientNodePortableMetadataTest.java |  32 ++-
 ...ableObjectsAbstractDataStreamerSelfTest.java |  41 +--
 ...bleObjectsAbstractMultiThreadedSelfTest.java |  45 +--
 ...ridCachePortableObjectsAbstractSelfTest.java |  80 ++++--
 .../GridCachePortableStoreAbstractSelfTest.java |  33 ++-
 .../GridCachePortableStoreObjectsSelfTest.java  |   4 +-
 ...GridCachePortableStorePortablesSelfTest.java |   7 +-
 ...ridPortableCacheEntryMemorySizeSelfTest.java |  19 +-
 ...leDuplicateIndexObjectsAbstractSelfTest.java |  27 +-
 .../DataStreamProcessorPortableSelfTest.java    |  19 +-
 .../GridDataStreamerImplSelfTest.java           |  47 ++--
 ...ridCacheAffinityRoutingPortableSelfTest.java |  13 +-
 ...lyPortableDataStreamerMultiNodeSelfTest.java |   2 +-
 ...rtableDataStreamerMultithreadedSelfTest.java |  13 +-
 ...artitionedOnlyPortableMultiNodeSelfTest.java |   2 +-
 ...tionedOnlyPortableMultithreadedSelfTest.java |  13 +-
 .../GridCacheMemoryModePortableSelfTest.java    |   8 +-
 ...acheOffHeapTieredAtomicPortableSelfTest.java |  11 +-
 ...eapTieredEvictionAtomicPortableSelfTest.java |  13 +-
 ...heOffHeapTieredEvictionPortableSelfTest.java |  13 +-
 .../GridCacheOffHeapTieredPortableSelfTest.java |  11 +-
 ...ateIndexObjectPartitionedAtomicSelfTest.java |   7 +-
 ...xObjectPartitionedTransactionalSelfTest.java |  11 +-
 ...AtomicNearDisabledOffheapTieredSelfTest.java |   2 +-
 ...rtableObjectsAtomicNearDisabledSelfTest.java |  13 +-
 ...tableObjectsAtomicOffheapTieredSelfTest.java |   2 +-
 .../GridCachePortableObjectsAtomicSelfTest.java |  13 +-
 ...tionedNearDisabledOffheapTieredSelfTest.java |   2 +-
 ...eObjectsPartitionedNearDisabledSelfTest.java |  13 +-
 ...ObjectsPartitionedOffheapTieredSelfTest.java |   2 +-
 ...CachePortableObjectsPartitionedSelfTest.java |  13 +-
 ...sNearPartitionedByteArrayValuesSelfTest.java |   8 +-
 ...sPartitionedOnlyByteArrayValuesSelfTest.java |   8 +-
 ...dCachePortableObjectsReplicatedSelfTest.java |  13 +-
 ...CachePortableObjectsAtomicLocalSelfTest.java |   6 +-
 ...rtableObjectsLocalOffheapTieredSelfTest.java |   2 +-
 .../GridCachePortableObjectsLocalSelfTest.java  |  13 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |  45 +--
 .../query/GridCacheSwapScanQuerySelfTest.java   |   2 +-
 .../cache/query/GridCircularQueueTest.java      |   9 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java | 103 ++++---
 ...ontinuousQueryAtomicNearEnabledSelfTest.java |   4 +-
 ...ontinuousQueryAtomicP2PDisabledSelfTest.java |   2 +-
 .../GridCacheContinuousQueryAtomicSelfTest.java |   8 +-
 ...CacheContinuousQueryLocalAtomicSelfTest.java |   6 +-
 .../GridCacheContinuousQueryLocalSelfTest.java  |   6 +-
 ...eContinuousQueryPartitionedOnlySelfTest.java |   8 +-
 ...uousQueryPartitionedP2PDisabledSelfTest.java |   2 +-
 ...CacheContinuousQueryPartitionedSelfTest.java |   6 +-
 ...ContinuousQueryReplicatedAtomicSelfTest.java |   6 +-
 ...nuousQueryReplicatedP2PDisabledSelfTest.java |   2 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |  27 +-
 .../IgniteCacheContinuousQueryClientTest.java   |  40 +--
 ...idCacheWriteBehindStoreAbstractSelfTest.java |  25 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |  46 +--
 .../GridCacheWriteBehindStoreLocalTest.java     |   4 +-
 ...heWriteBehindStoreMultithreadedSelfTest.java |  10 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |  43 +--
 ...ridCacheWriteBehindStorePartitionedTest.java |   4 +-
 ...GridCacheWriteBehindStoreReplicatedTest.java |   4 +-
 .../GridCacheWriteBehindStoreSelfTest.java      |  22 +-
 ...CacheClientWriteBehindStoreAbstractTest.java |  22 +-
 ...teCacheClientWriteBehindStoreAtomicTest.java |   9 +-
 .../IgnteCacheClientWriteBehindStoreTxTest.java |   6 +-
 .../CacheVersionedEntryAbstractTest.java        |  21 +-
 ...nedEntryLocalAtomicSwapDisabledSelfTest.java |   5 +-
 ...ersionedEntryLocalTransactionalSelfTest.java |   5 +-
 ...edEntryPartitionedAtomicOffHeapSelfTest.java |   6 +-
 ...VersionedEntryPartitionedAtomicSelfTest.java |   5 +-
 ...PartitionedTransactionalOffHeapSelfTest.java |   6 +-
 ...edEntryPartitionedTransactionalSelfTest.java |   5 +-
 ...nedEntryReplicatedAtomicOffHeapSelfTest.java |   6 +-
 ...eVersionedEntryReplicatedAtomicSelfTest.java |   5 +-
 ...yReplicatedTransactionalOffHeapSelfTest.java |   6 +-
 ...nedEntryReplicatedTransactionalSelfTest.java |   5 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |  29 +-
 .../closure/GridClosureProcessorRemoteTest.java |  21 +-
 .../closure/GridClosureProcessorSelfTest.java   |  51 ++--
 .../continuous/GridEventConsumeSelfTest.java    |  69 +++--
 .../continuous/GridMessageListenSelfTest.java   |  43 +--
 .../DataStreamProcessorSelfTest.java            |  83 ++++--
 .../datastreamer/DataStreamerImplSelfTest.java  |  36 +--
 .../DataStreamerMultiThreadedSelfTest.java      |  38 +--
 .../DataStreamerMultinodeCreateCacheTest.java   |  25 +-
 .../IgniteDataStreamerPerformanceTest.java      |  34 ++-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  95 +++++--
 .../processors/igfs/IgfsAttributesSelfTest.java |  21 +-
 .../igfs/IgfsBackupFailoverSelfTest.java        |  52 ++--
 .../igfs/IgfsBackupsDualAsyncSelfTest.java      |   6 +-
 .../igfs/IgfsBackupsDualSyncSelfTest.java       |   6 +-
 .../igfs/IgfsBackupsPrimarySelfTest.java        |   6 +-
 ...sCachePerBlockLruEvictionPolicySelfTest.java |  55 ++--
 .../processors/igfs/IgfsCacheSelfTest.java      |  37 +--
 .../igfs/IgfsClientCacheSelfTest.java           |  22 +-
 .../processors/igfs/IgfsCommonAbstractTest.java |   8 +-
 .../igfs/IgfsDataManagerSelfTest.java           |  57 ++--
 .../igfs/IgfsDualAbstractSelfTest.java          |  36 ++-
 .../processors/igfs/IgfsDualAsyncSelfTest.java  |   4 +-
 .../processors/igfs/IgfsDualSyncSelfTest.java   |   4 +-
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |  12 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |  20 +-
 .../processors/igfs/IgfsFileMapSelfTest.java    |  21 +-
 ...IgfsGroupDataBlockKeyMapperHashSelfTest.java |  10 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |  50 ++--
 .../processors/igfs/IgfsMetricsSelfTest.java    |  44 +--
 .../igfs/IgfsModeResolverSelfTest.java          |  17 +-
 .../processors/igfs/IgfsModesSelfTest.java      |  48 ++--
 .../processors/igfs/IgfsOneClientNodeTest.java  |  27 +-
 .../igfs/IgfsPrimaryOffheapTieredSelfTest.java  |   6 +-
 .../igfs/IgfsPrimaryOffheapValuesSelfTest.java  |   6 +-
 .../processors/igfs/IgfsPrimarySelfTest.java    |   4 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  70 +++--
 .../igfs/IgfsProcessorValidationSelfTest.java   |  40 +--
 ...IpcEndpointRegistrationAbstractSelfTest.java |  47 ++--
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |  10 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |  19 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |  76 +++--
 .../processors/igfs/IgfsStartCacheTest.java     |  45 +--
 .../processors/igfs/IgfsStreamsSelfTest.java    |  66 +++--
 .../processors/igfs/IgfsTaskSelfTest.java       |  64 +++--
 .../processors/igfs/IgfsTestInputStream.java    |   5 +-
 .../igfs/UniversalFileSystemAdapter.java        |   8 +-
 .../IgfsAbstractRecordResolverSelfTest.java     |  41 +--
 ...IgfsByteDelimiterRecordResolverSelfTest.java |  10 +-
 .../IgfsFixedLengthRecordResolverSelfTest.java  |  10 +-
 ...sNewLineDelimiterRecordResolverSelfTest.java |  13 +-
 ...fsStringDelimiterRecordResolverSelfTest.java |  14 +-
 .../GridJobMetricsProcessorLoadTest.java        |  10 +-
 .../port/GridPortProcessorSelfTest.java         |  16 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |  45 +--
 .../service/ClosureServiceClientsNodesTest.java |  34 ++-
 .../processors/service/DummyService.java        |  13 +-
 .../service/GridServiceClientNodeTest.java      |  18 +-
 .../GridServiceProcessorAbstractSelfTest.java   |  49 ++--
 ...ServiceProcessorMultiNodeConfigSelfTest.java |  13 +-
 .../GridServiceProcessorMultiNodeSelfTest.java  |  12 +-
 .../GridServiceProcessorProxySelfTest.java      |  16 +-
 .../GridServiceProcessorSingleNodeSelfTest.java |   5 +-
 .../GridServiceReassignmentSelfTest.java        |  22 +-
 .../timeout/GridTimeoutProcessorSelfTest.java   |  25 +-
 .../product/GridProductVersionSelfTest.java     |  12 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |  35 +--
 ...dStartupWithUndefinedIgniteHomeSelfTest.java |  31 +-
 .../internal/util/GridTestClockTimer.java       |   2 +-
 .../util/IgniteExceptionRegistrySelfTest.java   |  15 +-
 .../internal/util/IgniteUtilsSelfTest.java      |  66 +++--
 .../util/future/GridCompoundFutureSelfTest.java |  17 +-
 .../util/future/GridEmbeddedFutureSelfTest.java |  25 +-
 .../util/future/GridFutureAdapterSelfTest.java  |  29 +-
 .../future/GridFutureListenPerformanceTest.java |  19 +-
 .../util/future/GridFutureQueueTest.java        |  10 +-
 .../util/future/IgniteFutureImplTest.java       |  23 +-
 .../nio/GridNioEmbeddedFutureSelfTest.java      |   9 +-
 .../util/future/nio/GridNioFutureSelfTest.java  |  24 +-
 ...GridUnsafeDataOutputArraySizingSelfTest.java |   6 +-
 .../ipc/shmem/IgfsSharedMemoryTestClient.java   |  15 +-
 .../ipc/shmem/IgfsSharedMemoryTestServer.java   |  18 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |  34 ++-
 .../ipc/shmem/IpcSharedMemoryFakeClient.java    |   6 +-
 .../IpcSharedMemoryNativeLoaderSelfTest.java    |  15 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |  28 +-
 .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java |  26 +-
 .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java |  11 +-
 .../LoadWithCorruptedLibFileTestRunner.java     |   6 +-
 .../IpcSharedMemoryBenchmarkParty.java          |   4 +-
 .../IpcSharedMemoryBenchmarkReader.java         |  22 +-
 .../IpcSharedMemoryBenchmarkWriter.java         |  21 +-
 .../nio/GridNioDelimitedBufferSelfTest.java     |   8 +-
 .../internal/util/nio/GridNioSelfTest.java      |  59 ++--
 .../util/nio/GridNioSessionMetaKeySelfTest.java |  13 +-
 .../internal/util/nio/GridNioSslSelfTest.java   |  17 +-
 .../internal/util/nio/GridRoundTripTest.java    |  20 +-
 .../nio/impl/GridNioFilterChainSelfTest.java    |  27 +-
 .../util/offheap/GridByteArrayWrapper.java      |   4 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |  31 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |  12 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |  31 +-
 ...apPartitionedMapPerformanceAbstractTest.java |  25 +-
 .../unsafe/GridOffheapSnapTreeSelfTest.java     |  20 +-
 .../unsafe/GridUnsafeMapPerformanceTest.java    |   6 +-
 .../offheap/unsafe/GridUnsafeMapSelfTest.java   |   6 +-
 .../unsafe/GridUnsafeMemorySelfTest.java        |  23 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |   8 +-
 .../GridUnsafePartitionedMapSelfTest.java       |   6 +-
 .../unsafe/GridUnsafeStripedLruSefTest.java     |  10 +-
 .../tostring/GridToStringBuilderSelfTest.java   |  17 +-
 .../ignite/jvmtest/BlockingQueueTest.java       |  17 +-
 .../ignite/jvmtest/ConcurrentMapTest.java       |  27 +-
 .../org/apache/ignite/jvmtest/FileIOTest.java   |  15 +-
 .../apache/ignite/jvmtest/FileLocksTest.java    |  12 +-
 .../ignite/jvmtest/LinkedHashMapTest.java       |  10 +-
 .../ignite/jvmtest/MultipleFileIOTest.java      |  11 +-
 .../ignite/jvmtest/NetworkFailureTest.java      |  29 +-
 .../QueueSizeCounterMultiThreadedTest.java      |  22 +-
 .../jvmtest/ReadWriteLockMultiThreadedTest.java |  18 +-
 .../org/apache/ignite/jvmtest/RegExpTest.java   |  12 +-
 .../jvmtest/ServerSocketMultiThreadedTest.java  |  23 +-
 .../ignite/lang/GridBasicPerformanceTest.java   |  49 ++--
 .../ignite/lang/GridByteArrayListSelfTest.java  |  17 +-
 .../ignite/lang/GridFuncPerformanceTest.java    |  13 +-
 .../lang/GridFutureListenPerformanceTest.java   |  20 +-
 .../GridMetadataAwareAdapterLoadSelfTest.java   |  13 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  |  10 +-
 .../ignite/lang/GridSetWrapperSelfTest.java     |  16 +-
 .../lang/GridSystemCurrentTimeMillisTest.java   |   2 +-
 .../ignite/lang/GridThreadPriorityTest.java     |   4 +-
 .../apache/ignite/lang/GridTupleSelfTest.java   |  15 +-
 .../org/apache/ignite/lang/GridXSelfTest.java   |  16 +-
 .../apache/ignite/lang/IgniteUuidSelfTest.java  |  20 +-
 ...dBoundedConcurrentLinkedHashMapSelfTest.java |  10 +-
 ...GridBoundedConcurrentOrderedMapSelfTest.java |  14 +-
 .../GridCircularBufferPerformanceTest.java      |  18 +-
 .../lang/utils/GridCircularBufferSelfTest.java  |  13 +-
 .../utils/GridConcurrentHashMapSelfTest.java    |  13 +-
 .../GridConcurrentLinkedHashMapSelfTest.java    |  14 +-
 .../GridConcurrentWeakHashSetSelfTest.java      |  20 +-
 .../lang/utils/GridConsistentHashSelfTest.java  |  23 +-
 .../lang/utils/GridLeanIdentitySetSelfTest.java |  10 +-
 .../lang/utils/GridLeanMapPerformanceTest.java  |   9 +-
 .../ignite/lang/utils/GridLeanMapSelfTest.java  |  16 +-
 .../ignite/lang/utils/GridListSetSelfTest.java  |  15 +-
 .../lang/utils/GridStripedLockSelfTest.java     |  16 +-
 .../ignite/loadtest/GridLoadTestStatistics.java |  16 +-
 .../loadtest/GridSingleExecutionTest.java       |  59 ++--
 ...idFileSwapSpaceSpiMultithreadedLoadTest.java |  33 ++-
 .../loadtests/GridCacheLoadPopulationTask.java  |  20 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |  25 +-
 .../cache/GridCacheAbstractLoadTest.java        |  58 ++--
 .../loadtests/cache/GridCacheBenchmark.java     |  20 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |  32 ++-
 .../loadtests/cache/GridCacheLoadTest.java      |  19 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |  39 ++-
 .../GridCacheWriteBehindStoreLoadTest.java      |  33 +--
 .../capacity/GridCapacityLoadTest.java          |  17 +-
 .../colocation/GridTestCacheStore.java          |  24 +-
 .../loadtests/colocation/GridTestConstants.java |   2 +-
 .../loadtests/colocation/GridTestKey.java       |  11 +-
 .../colocation/GridTestLifecycleBean.java       |  10 +-
 .../loadtests/colocation/GridTestMain.java      |  33 ++-
 .../communication/GridIoManagerBenchmark.java   |  54 ++--
 .../communication/GridIoManagerBenchmark0.java  |  57 ++--
 .../GridTcpCommunicationBenchmark.java          |   2 +-
 .../communication/GridTestMessage.java          |  18 +-
 .../GridContinuousOperationsLoadTest.java       |  60 ++--
 .../GridCachePartitionedAtomicLongLoadTest.java |  42 +--
 .../direct/multisplit/GridLoadTestJob.java      |  11 +-
 .../multisplit/GridLoadTestJobTarget.java       |   2 +-
 .../direct/multisplit/GridLoadTestTask.java     |  23 +-
 .../multisplit/GridMultiSplitsLoadTest.java     |  31 +-
 .../GridMultiSplitsRedeployLoadTest.java        |  22 +-
 .../GridSingleSplitNewNodesTestJobTarget.java   |   6 +-
 .../GridSingleSplitNewNodesTestTask.java        |  24 +-
 ...ridSingleSplitsNewNodesAbstractLoadTest.java |  27 +-
 ...idSingleSplitsNewNodesMulticastLoadTest.java |  10 +-
 .../GridSingleSplitsRedeployLoadTest.java       |  32 ++-
 .../direct/session/GridSessionLoadTest.java     |  20 +-
 .../direct/session/GridSessionLoadTestJob.java  |  13 +-
 .../direct/session/GridSessionLoadTestTask.java |  25 +-
 .../direct/stealing/GridStealingLoadTest.java   |  31 +-
 .../stealing/GridStealingLoadTestJob.java       |  17 +-
 .../stealing/GridStealingLoadTestTask.java      |  20 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |  13 +-
 .../ignite/loadtests/dsi/GridDsiClient.java     |  40 ++-
 .../loadtests/dsi/GridDsiLifecycleBean.java     |  13 +-
 .../ignite/loadtests/dsi/GridDsiMessage.java    |   6 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |  44 +--
 .../ignite/loadtests/dsi/GridDsiRequest.java    |   7 +-
 .../loadtests/dsi/GridDsiRequestTask.java       |  13 +-
 .../ignite/loadtests/dsi/GridDsiResponse.java   |   7 +-
 .../loadtests/dsi/GridDsiResponseTask.java      |  13 +-
 .../ignite/loadtests/dsi/GridDsiSession.java    |   7 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |   8 +-
 ...dBoundedConcurrentLinkedHashSetLoadTest.java |  29 +-
 .../loadtests/hashmap/GridCacheTestContext.java |  45 +--
 .../loadtests/hashmap/GridHashMapLoadTest.java  |  20 +-
 .../job/GridJobExecutionLoadTestClient.java     |  31 +-
 ...GridJobExecutionLoadTestClientSemaphore.java |  40 ++-
 .../job/GridJobExecutionLoadTestJob.java        |  10 +-
 .../job/GridJobExecutionLoadTestServer.java     |   4 +-
 .../job/GridJobExecutionLoadTestTask.java       |  20 +-
 .../job/GridJobExecutionSingleNodeLoadTest.java |  44 ++-
 ...JobExecutionSingleNodeSemaphoreLoadTest.java |  50 ++--
 .../ignite/loadtests/job/GridJobLoadTest.java   |  29 +-
 .../loadtests/job/GridJobLoadTestJob.java       |  23 +-
 .../loadtests/job/GridJobLoadTestParams.java    |   2 +-
 .../loadtests/job/GridJobLoadTestSubmitter.java |  16 +-
 .../loadtests/job/GridJobLoadTestTask.java      |  20 +-
 .../GridConcurrentLinkedHashMapBenchmark.java   |  13 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |   8 +-
 .../mapper/GridContinuousMapperLoadTest2.java   |  13 +-
 .../mapper/GridContinuousMapperTask1.java       |  32 ++-
 .../mapper/GridContinuousMapperTask2.java       |  26 +-
 .../loadtests/mapper/GridNodeStartup.java       |  11 +-
 .../ignite/loadtests/mapper/TestObject.java     |   7 +-
 .../mergesort/GridMergeSortLoadTask.java        |  24 +-
 .../mergesort/GridMergeSortLoadTest.java        |  19 +-
 .../loadtests/nio/GridNioBenchmarkClient.java   |  17 +-
 .../loadtests/nio/GridNioBenchmarkTest.java     |  25 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |  16 +-
 ...apPartitionedMapPerformanceAbstractTest.java |  28 +-
 .../unsafe/GridUnsafeMapPerformanceTest.java    |   6 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |   8 +-
 .../swap/GridSwapEvictAllBenchmark.java         |  45 +--
 .../loadtests/util/GridCumulativeAverage.java   |   2 +-
 .../ignite/loadtests/util/GridLoadTestArgs.java |  14 +-
 .../ignite/logger/java/JavaLoggerTest.java      |  15 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  82 ++++--
 .../GridMarshallerExternalizableBean.java       |  10 +-
 .../GridMarshallerPerformanceTest.java          |  43 ++-
 .../marshaller/GridMarshallerResourceBean.java  |  37 +--
 .../GridMarshallerTestAbstractBean.java         |   2 +-
 .../marshaller/GridMarshallerTestBean.java      |   9 +-
 .../GridMarshallerTestInheritedBean.java        |   2 +-
 .../marshaller/MarshallerContextTestImpl.java   |  15 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |   7 +-
 .../OptimizedMarshallerEnumSelfTest.java        |   6 +-
 .../OptimizedMarshallerNodeFailoverTest.java    |  39 +--
 .../optimized/OptimizedMarshallerSelfTest.java  |  21 +-
 ...arshallerSerialPersistentFieldsSelfTest.java |  12 +-
 .../optimized/OptimizedMarshallerTest.java      |  40 ++-
 .../OptimizedObjectStreamSelfTest.java          |  73 +++--
 .../TestTcpDiscoveryIpFinderAdapter.java        |  11 +-
 ...GridMessagingNoPeerClassLoadingSelfTest.java |  20 +-
 .../ignite/messaging/GridMessagingSelfTest.java |  62 ++--
 .../IgniteMessagingWithClientTest.java          |  39 +--
 .../p2p/GridAbstractMultinodeRedeployTest.java  |  24 +-
 ...MultinodeRedeployContinuousModeSelfTest.java |   6 +-
 ...idMultinodeRedeployIsolatedModeSelfTest.java |   6 +-
 ...ridMultinodeRedeployPrivateModeSelfTest.java |   6 +-
 ...GridMultinodeRedeploySharedModeSelfTest.java |   6 +-
 .../ignite/p2p/GridP2PClassLoadingSelfTest.java |  36 ++-
 .../GridP2PContinuousDeploymentSelfTest.java    |  25 +-
 .../GridP2PDifferentClassLoaderSelfTest.java    |  19 +-
 .../p2p/GridP2PDoubleDeploymentSelfTest.java    |  23 +-
 .../p2p/GridP2PHotRedeploymentSelfTest.java     |  15 +-
 .../p2p/GridP2PJobClassLoaderSelfTest.java      |  22 +-
 .../p2p/GridP2PLocalDeploymentSelfTest.java     |  33 ++-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |  31 +-
 .../ignite/p2p/GridP2PNodeLeftSelfTest.java     |  17 +-
 .../p2p/GridP2PRecursionTaskSelfTest.java       |  25 +-
 .../p2p/GridP2PRemoteClassLoadersSelfTest.java  |  32 ++-
 .../p2p/GridP2PSameClassLoaderSelfTest.java     |  19 +-
 .../org/apache/ignite/p2p/GridP2PTestJob.java   |  17 +-
 .../org/apache/ignite/p2p/GridP2PTestTask.java  |  22 +-
 .../p2p/GridP2PTestTaskExecutionTest.java       |  12 +-
 .../ignite/p2p/GridP2PTimeoutSelfTest.java      |  22 +-
 .../ignite/p2p/GridP2PUndeploySelfTest.java     |  27 +-
 .../ignite/p2p/GridSwapSpaceCustomKey.java      |   7 +-
 .../ignite/p2p/GridSwapSpaceCustomValue.java    |   7 +-
 ...SessionCancelSiblingsFromFutureSelfTest.java |  44 ++-
 ...ridSessionCancelSiblingsFromJobSelfTest.java |  49 ++--
 ...idSessionCancelSiblingsFromTaskSelfTest.java |  47 ++--
 .../GridSessionCheckpointAbstractSelfTest.java  |  36 ++-
 .../session/GridSessionCheckpointSelfTest.java  |  15 +-
 .../GridSessionCollisionSpiSelfTest.java        |  37 ++-
 ...idSessionFutureWaitJobAttributeSelfTest.java |  37 ++-
 ...dSessionFutureWaitTaskAttributeSelfTest.java |  38 ++-
 .../session/GridSessionJobFailoverSelfTest.java |  31 +-
 ...GridSessionJobWaitTaskAttributeSelfTest.java |  41 ++-
 .../ignite/session/GridSessionLoadSelfTest.java |  42 ++-
 .../GridSessionSetFutureAttributeSelfTest.java  |  44 ++-
 ...nSetFutureAttributeWaitListenerSelfTest.java |  42 ++-
 .../GridSessionSetJobAttribute2SelfTest.java    |  28 +-
 ...GridSessionSetJobAttributeOrderSelfTest.java |  31 +-
 .../GridSessionSetJobAttributeSelfTest.java     |  41 ++-
 ...sionSetJobAttributeWaitListenerSelfTest.java |  43 ++-
 .../GridSessionSetTaskAttributeSelfTest.java    |  35 ++-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |  35 ++-
 .../GridSessionWaitAttributeSelfTest.java       |  43 ++-
 .../ignite/session/GridThreadSerialNumber.java  |   2 +-
 .../spi/GridSpiLocalHostInjectionTest.java      |  16 +-
 .../spi/GridSpiStartStopAbstractTest.java       |   4 +-
 .../org/apache/ignite/spi/GridTcpForwarder.java |  15 +-
 .../spi/GridTcpSpiForwardingSelfTest.java       |  35 ++-
 .../GridCheckpointSpiAbstractTest.java          |   6 +-
 .../spi/checkpoint/GridCheckpointTestState.java |   4 +-
 .../cache/CacheCheckpointSpiConfigSelfTest.java |   5 +-
 .../CacheCheckpointSpiSecondCacheSelfTest.java  |  19 +-
 .../cache/CacheCheckpointSpiSelfTest.java       |   6 +-
 .../CacheCheckpointSpiStartStopSelfTest.java    |   6 +-
 .../jdbc/JdbcCheckpointSpiConfigSelfTest.java   |  19 +-
 .../JdbcCheckpointSpiCustomConfigSelfTest.java  |   8 +-
 .../JdbcCheckpointSpiDefaultConfigSelfTest.java |   8 +-
 .../JdbcCheckpointSpiStartStopSelfTest.java     |   8 +-
 ...GridSharedFsCheckpointSpiConfigSelfTest.java |   8 +-
 ...redFsCheckpointSpiMultiThreadedSelfTest.java |  26 +-
 ...heckpointSpiMultipleDirectoriesSelfTest.java |  19 +-
 .../GridSharedFsCheckpointSpiSelfTest.java      |  15 +-
 ...dSharedFsCheckpointSpiStartStopSelfTest.java |   6 +-
 .../spi/collision/GridCollisionTestContext.java |   5 +-
 .../collision/GridTestCollisionJobContext.java  |  12 +-
 .../collision/GridTestCollisionTaskSession.java |  15 +-
 ...GridFifoQueueCollisionSpiConfigSelfTest.java |   5 +-
 .../GridFifoQueueCollisionSpiSelfTest.java      |  17 +-
 ...dFifoQueueCollisionSpiStartStopSelfTest.java |   6 +-
 ...bStealingCollisionSpiAttributesSelfTest.java |  36 ++-
 ...idJobStealingCollisionSpiConfigSelfTest.java |   5 +-
 ...alingCollisionSpiCustomTopologySelfTest.java |  42 +--
 .../GridJobStealingCollisionSpiSelfTest.java    |  47 ++--
 ...obStealingCollisionSpiStartStopSelfTest.java |  18 +-
 ...PriorityQueueCollisionSpiConfigSelfTest.java |   5 +-
 .../GridPriorityQueueCollisionSpiSelfTest.java  |  27 +-
 ...orityQueueCollisionSpiStartStopSelfTest.java |   6 +-
 .../GridAbstractCommunicationSelfTest.java      |  47 ++--
 .../communication/GridCacheMessageSelfTest.java |  46 +--
 .../spi/communication/GridTestMessage.java      |  13 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |  53 ++--
 .../GridTcpCommunicationSpiAbstractTest.java    |  20 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |  59 ++--
 .../GridTcpCommunicationSpiConfigSelfTest.java  |   5 +-
 .../tcp/GridTcpCommunicationSpiLanTest.java     |  41 +--
 ...cpCommunicationSpiMultithreadedSelfTest.java |  68 +++--
 ...pCommunicationSpiMultithreadedShmemTest.java |   2 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |  51 ++--
 ...tionSpiRecoveryFailureDetectionSelfTest.java |   4 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |  56 ++--
 .../GridTcpCommunicationSpiShmemSelfTest.java   |   4 +-
 .../tcp/GridTcpCommunicationSpiSslSelfTest.java |   4 +-
 ...ridTcpCommunicationSpiStartStopSelfTest.java |   9 +-
 ...unicationSpiTcpFailureDetectionSelfTest.java |   6 +-
 ...cpCommunicationSpiTcpNoDelayOffSelfTest.java |   2 +-
 .../tcp/GridTcpCommunicationSpiTcpSelfTest.java |   4 +-
 .../tcp/IgniteCacheSslStartStopSelfTest.java    |  12 +-
 ...CommunicationRecoveryAckClosureSelfTest.java |  54 ++--
 .../local/GridLocalDeploymentSpiSelfTest.java   |  27 +-
 ...GridLocalDeploymentSpiStartStopSelfTest.java |   6 +-
 .../AbstractDiscoveryRandomStartStopTest.java   |  23 +-
 .../discovery/AbstractDiscoverySelfTest.java    |  53 ++--
 .../spi/discovery/AbstractDiscoveryTest.java    |  22 +-
 ...ClusterMetricsSnapshotSerializeSelfTest.java |   9 +-
 ...pClientDiscoveryMarshallerCheckSelfTest.java |  18 +-
 ...lientDiscoverySpiFailureTimeoutSelfTest.java |  18 +-
 .../tcp/TcpClientDiscoverySpiMulticastTest.java |  17 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |  94 +++++--
 .../tcp/TcpDiscoveryConcurrentStartTest.java    |  19 +-
 .../TcpDiscoveryMarshallerCheckSelfTest.java    |  18 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |  37 ++-
 ...DiscoveryNodeConfigConsistentIdSelfTest.java |  13 +-
 .../TcpDiscoveryNodeConsistentIdSelfTest.java   |  14 +-
 .../discovery/tcp/TcpDiscoveryRestartTest.java  |  41 +--
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  85 ++++--
 .../tcp/TcpDiscoverySnapshotHistoryTest.java    |  15 +-
 .../tcp/TcpDiscoverySpiConfigSelfTest.java      |   6 +-
 .../TcpDiscoverySpiFailureTimeoutSelfTest.java  |  34 ++-
 .../tcp/TcpDiscoverySpiRandomStartStopTest.java |  10 +-
 .../discovery/tcp/TcpDiscoverySpiSelfTest.java  |  11 +-
 .../tcp/TcpDiscoverySpiSslSelfTest.java         |   2 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |  20 +-
 .../tcp/TcpDiscoverySpiWildcardSelfTest.java    |  10 +-
 .../discovery/tcp/TcpDiscoverySslSelfTest.java  |   6 +-
 .../TcpDiscoveryIpFinderAbstractSelfTest.java   |  19 +-
 .../jdbc/TcpDiscoveryJdbcIpFinderSelfTest.java  |   8 +-
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |  12 +-
 .../TcpDiscoverySharedFsIpFinderSelfTest.java   |   9 +-
 .../vm/TcpDiscoveryVmIpFinderSelfTest.java      |  10 +-
 ...MemoryEventStorageMultiThreadedSelfTest.java |  17 +-
 ...GridMemoryEventStorageSpiConfigSelfTest.java |   5 +-
 .../GridMemoryEventStorageSpiSelfTest.java      |  17 +-
 ...dMemoryEventStorageSpiStartStopSelfTest.java |   6 +-
 .../spi/failover/GridFailoverTestContext.java   |  11 +-
 .../GridAlwaysFailoverSpiConfigSelfTest.java    |   5 +-
 .../always/GridAlwaysFailoverSpiSelfTest.java   |  26 +-
 .../GridAlwaysFailoverSpiStartStopSelfTest.java |   8 +-
 ...ridJobStealingFailoverSpiConfigSelfTest.java |   5 +-
 ...idJobStealingFailoverSpiOneNodeSelfTest.java |  25 +-
 .../GridJobStealingFailoverSpiSelfTest.java     |  35 ++-
 ...JobStealingFailoverSpiStartStopSelfTest.java |  18 +-
 .../never/GridNeverFailoverSpiSelfTest.java     |  19 +-
 .../GridNeverFailoverSpiStartStopSelfTest.java  |   8 +-
 ...dAdaptiveLoadBalancingSpiConfigSelfTest.java |   5 +-
 ...iveLoadBalancingSpiMultipleNodeSelfTest.java |  22 +-
 .../GridAdaptiveLoadBalancingSpiSelfTest.java   |  23 +-
 ...aptiveLoadBalancingSpiStartStopSelfTest.java |   6 +-
 ...alancingNotPerTaskMultithreadedSelfTest.java |  28 +-
 ...dRobinLoadBalancingSpiLocalNodeSelfTest.java |  15 +-
 ...inLoadBalancingSpiMultipleNodesSelfTest.java |  28 +-
 ...RobinLoadBalancingSpiNotPerTaskSelfTest.java |  34 ++-
 ...dRobinLoadBalancingSpiStartStopSelfTest.java |   6 +-
 ...nLoadBalancingSpiTopologyChangeSelfTest.java |  26 +-
 .../roundrobin/GridRoundRobinTestUtils.java     |  15 +-
 ...tedRandomLoadBalancingSpiConfigSelfTest.java |   5 +-
 ...dWeightedRandomLoadBalancingSpiSelfTest.java |  18 +-
 ...RandomLoadBalancingSpiStartStopSelfTest.java |   6 +-
 ...dRandomLoadBalancingSpiWeightedSelfTest.java |  28 +-
 .../GridSwapSpaceSpiAbstractSelfTest.java       |  40 ++-
 .../file/GridFileSwapCompactionSelfTest.java    |  18 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |  34 ++-
 .../inmemory/GridTestSwapSpaceSpi.java          |  40 ++-
 .../noop/GridNoopSwapSpaceSpiSelfTest.java      |  14 +-
 .../startup/GridRandomCommandLineLoader.java    |  54 ++--
 .../ignite/startup/GridVmNodesStarter.java      |  47 ++--
 .../cmdline/GridCommandLineLoaderTest.java      |  17 +-
 .../GridCommandLineTransformerSelfTest.java     |   9 +-
 .../startup/servlet/GridServletLoaderTest.java  |  21 +-
 .../stream/socket/SocketStreamerSelfTest.java   |  52 ++--
 .../ignite/testframework/GridFileLock.java      |  16 +-
 .../testframework/GridJarClassLoader.java       |  18 +-
 .../ignite/testframework/GridLoadTestUtils.java |  22 +-
 .../testframework/GridSpiTestContext.java       |  64 +++--
 .../ignite/testframework/GridStringLogger.java  |   8 +-
 .../testframework/GridTestClassLoader.java      |  13 +-
 .../GridTestExternalClassLoader.java            |  19 +-
 .../ignite/testframework/GridTestNode.java      |  24 +-
 .../GridTestSafeThreadFactory.java              |  26 +-
 .../ignite/testframework/GridTestThread.java    |   4 +-
 .../ignite/testframework/GridTestUtils.java     | 104 ++++---
 .../config/GridTestProperties.java              |  24 +-
 .../http/GridEmbeddedHttpServer.java            |  20 +-
 .../testframework/junits/GridAbstractTest.java  | 123 +++++---
 .../junits/GridTestKernalContext.java           |  24 +-
 .../ignite/testframework/junits/IgniteMock.java |  49 +++-
 .../junits/IgniteTestResources.java             |  38 +--
 .../cache/GridAbstractCacheStoreSelfTest.java   |  44 +--
 .../junits/cache/TestCacheSession.java          |  13 +-
 .../cache/TestThreadLocalCacheSession.java      |  11 +-
 .../junits/common/GridAbstractExamplesTest.java |   9 +-
 .../GridAbstractLifecycleAwareSelfTest.java     |  14 +-
 .../junits/common/GridCommonAbstractTest.java   |  96 ++++---
 .../junits/common/GridCommonTest.java           |   9 +-
 .../logger/GridLog4jRollingFileAppender.java    |  18 +-
 .../junits/logger/GridTestLog4jLogger.java      |  49 ++--
 .../junits/multijvm/AffinityProcessProxy.java   |  18 +-
 .../multijvm/IgniteCacheProcessProxy.java       |  50 ++--
 .../multijvm/IgniteClusterProcessProxy.java     |  31 +-
 .../multijvm/IgniteEventsProcessProxy.java      |  22 +-
 .../junits/multijvm/IgniteNodeRunner.java       |  46 +--
 .../junits/multijvm/IgniteProcessProxy.java     |  83 ++++--
 .../junits/spi/GridSpiAbstractConfigTest.java   |  13 +-
 .../junits/spi/GridSpiAbstractTest.java         |  66 +++--
 .../testframework/junits/spi/GridSpiTest.java   |  16 +-
 .../junits/spi/GridSpiTestConfig.java           |   8 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |  47 ++--
 .../IgniteCacheDataStructuresSelfTestSuite.java |  67 ++++-
 .../IgniteCacheEvictionSelfTestSuite.java       |  32 ++-
 .../IgniteCacheFailoverTestSuite.java           |  38 ++-
 .../IgniteCacheFailoverTestSuite2.java          |  21 +-
 ...IgniteCacheFullApiMultiJvmSelfTestSuite.java |  46 ++-
 .../IgniteCacheFullApiSelfTestSuite.java        |  86 +++++-
 .../IgniteCacheIteratorsSelfTestSuite.java      |  10 +-
 .../IgniteCacheMetricsSelfTestSuite.java        |  21 +-
 .../IgniteCacheNearOnlySelfTestSuite.java       |   9 +-
 ...niteCacheP2pUnmarshallingErrorTestSuite.java |  14 +-
 .../testsuites/IgniteCacheRestartTestSuite.java |  18 +-
 .../IgniteCacheTcpClientDiscoveryTestSuite.java |   8 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java | 125 ++++++--
 .../testsuites/IgniteCacheTestSuite2.java       | 110 +++++++-
 .../testsuites/IgniteCacheTestSuite3.java       |  67 ++++-
 .../testsuites/IgniteCacheTestSuite4.java       | 110 +++++++-
 .../IgniteCacheTxRecoverySelfTestSuite.java     |  16 +-
 .../IgniteCacheWriteBehindTestSuite.java        |  15 +-
 .../testsuites/IgniteClientNodesTestSuite.java  |   8 +-
 .../IgniteClientReconnectTestSuite.java         |  16 +-
 .../testsuites/IgniteClientTestSuite.java       |   6 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |  62 +++-
 .../IgniteContinuousTaskSelfTestSuite.java      |   9 +-
 .../IgniteExternalizableSelfTestSuite.java      |   6 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |  43 ++-
 .../IgniteIpcSharedMemorySelfTestSuite.java     |   9 +-
 .../IgniteJobMetricsSelfTestSuite.java          |   6 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |  55 ++--
 .../testsuites/IgniteLangSelfTestSuite.java     |  34 ++-
 .../testsuites/IgniteLoggingSelfTestSuite.java  |   5 +-
 .../IgniteMarshallerSelfTestSuite.java          |  20 +-
 .../testsuites/IgniteP2PSelfTestSuite.java      |  21 +-
 .../IgnitePortableCacheFullApiTestSuite.java    |   9 +-
 .../IgnitePortableCacheTestSuite.java           |  43 ++-
 .../IgnitePortableObjectsTestSuite.java         |  36 ++-
 .../testsuites/IgniteRestHandlerTestSuite.java  |   6 +-
 .../IgniteSpiCheckpointSelfTestSuite.java       |  19 +-
 .../IgniteSpiCollisionSelfTestSuite.java        |  18 +-
 .../IgniteSpiCommunicationSelfTestSuite.java    |  18 +-
 .../IgniteSpiDeploymentSelfTestSuite.java       |   7 +-
 .../IgniteSpiDiscoverySelfTestSuite.java        |  31 +-
 .../IgniteSpiEventStorageSelfTestSuite.java     |   9 +-
 .../IgniteSpiFailoverSelfTestSuite.java         |  16 +-
 .../IgniteSpiIndexingSelfTestSuite.java         |   6 +-
 .../IgniteSpiLoadBalancingSelfTestSuite.java    |  22 +-
 .../IgniteSpiSwapSpaceSelfTestSuite.java        |   9 +-
 .../ignite/testsuites/IgniteSpiTestSuite.java   |   6 +-
 .../testsuites/IgniteStartUpTestSuite.java      |   6 +-
 .../testsuites/IgniteStreamSelfTestSuite.java   |   7 +-
 .../IgniteTaskSessionSelfTestSuite.java         |  24 +-
 .../IgniteTimeoutProcessorSelfTestSuite.java    |   7 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |  41 +--
 .../GridThreadPoolExecutorServiceSelfTest.java  |  21 +-
 .../apache/ignite/thread/GridThreadTest.java    |   9 +-
 ...dConcurrentLinkedDequeMultiThreadedTest.java |  19 +-
 .../util/GridConcurrentLinkedDequeSelfTest.java |  11 +-
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |  34 ++-
 .../apache/ignite/util/GridIndexFillTest.java   |  21 +-
 .../apache/ignite/util/GridLogThrottleTest.java |   7 +-
 .../ignite/util/GridLongListSelfTest.java       |   8 +-
 .../apache/ignite/util/GridQueueSelfTest.java   |   9 +-
 .../apache/ignite/util/GridRandomSelfTest.java  |  13 +-
 .../ignite/util/GridSnapshotLockSelfTest.java   |  20 +-
 .../util/GridSpinReadWriteLockSelfTest.java     |  14 +-
 .../util/GridStringBuilderFactorySelfTest.java  |   9 +-
 .../util/GridTopologyHeapSizeSelfTest.java      |  30 +-
 .../apache/ignite/util/GridTransientTest.java   |  12 +-
 .../ignite/util/TestTcpCommunicationSpi.java    |  17 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |  17 +-
 .../tests/p2p/CacheDeploymentTestKey.java       |   2 +-
 .../tests/p2p/CacheDeploymentTestTask1.java     |  23 +-
 .../tests/p2p/CacheDeploymentTestTask2.java     |  22 +-
 .../tests/p2p/CacheDeploymentTestTask3.java     |  23 +-
 .../tests/p2p/CacheDeploymentTestValue.java     |   4 +-
 .../tests/p2p/CacheDeploymentTestValue2.java    |   2 +-
 .../ignite/tests/p2p/ExcludeNodeFilter.java     |  11 +-
 .../p2p/GridCacheDeploymentTestValue3.java      |   7 +-
 .../tests/p2p/GridEventConsumeFilter.java       |   6 +-
 .../GridEventConsumeProjectionPredicate.java    |   6 +-
 .../tests/p2p/GridExternalAffinityFunction.java |  21 +-
 .../p2p/GridExternalAffinityKeyMapper.java      |   4 +-
 .../tests/p2p/GridP2PAwareTestUserResource.java |  11 +-
 .../p2p/GridP2PContinuousDeploymentTask1.java   |  20 +-
 .../p2p/GridP2PContinuousDeploymentTask2.java   |  16 +-
 .../p2p/GridP2PEventFilterExternalPath1.java    |  11 +-
 .../p2p/GridP2PEventFilterExternalPath2.java    |  11 +-
 .../tests/p2p/GridSingleSplitTestJobTarget.java |   2 +-
 .../tests/p2p/GridTestMessageListener.java      |  15 +-
 .../ignite/tests/p2p/GridTestMessageTopic.java  |   4 +-
 .../ignite/tests/p2p/JobStealingTask.java       |  27 +-
 .../tests/p2p/P2PTestTaskExternalPath1.java     |  31 +-
 .../tests/p2p/P2PTestTaskExternalPath2.java     |  31 +-
 .../ignite/tests/p2p/SingleSplitTestTask.java   |  14 +-
 .../ignite/tests/p2p/TestUserResource.java      |   4 +-
 .../CacheNoValueClassOnServerTestClient.java    |  17 +-
 .../apache/ignite/tests/p2p/cache/Person.java   |   4 +-
 .../p2p/startcache/CacheAllNodesFilter.java     |   6 +-
 .../CacheConfigurationP2PTestClient.java        |  20 +-
 .../tests/p2p/startcache/Organization1.java     |   9 +-
 .../tests/p2p/startcache/Organization2.java     |   9 +-
 .../deployment/uri/tasks/GarHelloWorldBean.java |  10 +-
 .../deployment/uri/tasks/GarHelloWorldTask.java |  24 +-
 .../GridUriDeploymentAbstractTestTask.java      |  10 +-
 .../uri/tasks/GridUriDeploymentDependency1.java |  10 +-
 .../uri/tasks/GridUriDeploymentDependency2.java |  10 +-
 .../tasks/GridUriDeploymentInnerTestTask.java   |  10 +-
 .../GridUriDeploymentInterfaceTestTask.java     |   4 +-
 .../GridUriDeploymentNonePublicTestTask.java    |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask0.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask1.java   |  15 +-
 .../uri/tasks/GridUriDeploymentTestTask2.java   |  15 +-
 .../uri/tasks/GridUriDeploymentTestTask3.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask4.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask5.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask6.java   |  10 +-
 .../GridUriDeploymentTestWithNameTask0.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask3.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask4.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask5.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask6.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask7.java     |  11 +-
 .../gce/TcpDiscoveryGoogleStorageIpFinder.java  |  53 ++--
 ...pDiscoveryGoogleStorageIpFinderSelfTest.java |  11 +-
 .../ignite/testsuites/IgniteGCETestSuite.java   |   6 +-
 .../query/h2/opt/GridH2SpatialIndex.java        |  43 ++-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |  40 +--
 .../testsuites/GeoSpatialIndexingTestSuite.java |   6 +-
 .../fs/IgniteHadoopFileSystemCounterWriter.java |  31 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  65 +++--
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |  97 +++++--
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    | 102 +++++--
 .../IgniteHadoopClientProtocolProvider.java     |  40 +--
 .../mapreduce/IgniteHadoopMapReducePlanner.java |  51 ++--
 .../processors/hadoop/HadoopClassLoader.java    |  47 +++-
 .../processors/hadoop/HadoopComponent.java      |   5 +-
 .../processors/hadoop/HadoopContext.java        |  25 +-
 .../processors/hadoop/HadoopDefaultJobInfo.java |  20 +-
 .../internal/processors/hadoop/HadoopImpl.java  |  12 +-
 .../hadoop/HadoopMapReduceCounterGroup.java     |  14 +-
 .../hadoop/HadoopMapReduceCounters.java         |  30 +-
 .../processors/hadoop/HadoopProcessor.java      |  32 ++-
 .../internal/processors/hadoop/HadoopSetup.java |  37 ++-
 .../hadoop/HadoopTaskCancelledException.java    |   4 +-
 .../internal/processors/hadoop/HadoopUtils.java |  32 ++-
 .../hadoop/SecondaryFileSystemProvider.java     |  29 +-
 .../hadoop/counter/HadoopCounterAdapter.java    |  12 +-
 .../hadoop/counter/HadoopCountersImpl.java      |  23 +-
 .../hadoop/counter/HadoopLongCounter.java       |   7 +-
 .../counter/HadoopPerformanceCounter.java       |  29 +-
 .../hadoop/fs/HadoopFileSystemCacheUtils.java   |  23 +-
 .../hadoop/fs/HadoopFileSystemsUtils.java       |   8 +-
 .../hadoop/fs/HadoopLazyConcurrentMap.java      |  18 +-
 .../hadoop/fs/HadoopLocalFileSystemV1.java      |   8 +-
 .../hadoop/fs/HadoopLocalFileSystemV2.java      |  18 +-
 .../processors/hadoop/fs/HadoopParameters.java  |   2 +-
 .../hadoop/fs/HadoopRawLocalFileSystem.java     |  30 +-
 .../processors/hadoop/igfs/HadoopIgfs.java      |  20 +-
 .../igfs/HadoopIgfsCommunicationException.java  |   4 +-
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |  21 +-
 .../processors/hadoop/igfs/HadoopIgfsEx.java    |   9 +-
 .../hadoop/igfs/HadoopIgfsFuture.java           |   6 +-
 .../hadoop/igfs/HadoopIgfsInProc.java           |  38 ++-
 .../hadoop/igfs/HadoopIgfsInputStream.java      |  23 +-
 .../processors/hadoop/igfs/HadoopIgfsIo.java    |  10 +-
 .../processors/hadoop/igfs/HadoopIgfsIpcIo.java |  53 ++--
 .../hadoop/igfs/HadoopIgfsIpcIoListener.java    |   2 +-
 .../hadoop/igfs/HadoopIgfsJclLogger.java        |  13 +-
 .../hadoop/igfs/HadoopIgfsOutProc.java          |  61 ++--
 .../hadoop/igfs/HadoopIgfsOutputStream.java     |  14 +-
 .../hadoop/igfs/HadoopIgfsProperties.java       |  13 +-
 .../hadoop/igfs/HadoopIgfsProxyInputStream.java |  12 +-
 .../igfs/HadoopIgfsProxyOutputStream.java       |  10 +-
 ...fsSecondaryFileSystemPositionedReadable.java |  13 +-
 .../hadoop/igfs/HadoopIgfsStreamDelegate.java   |   4 +-
 .../igfs/HadoopIgfsStreamEventListener.java     |   4 +-
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |  21 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |  43 +--
 .../hadoop/jobtracker/HadoopJobMetadata.java    |  30 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     | 108 +++++--
 .../hadoop/message/HadoopMessage.java           |   4 +-
 .../planner/HadoopDefaultMapReducePlan.java     |  12 +-
 .../hadoop/proto/HadoopClientProtocol.java      |  59 ++--
 .../proto/HadoopProtocolJobCountersTask.java    |  12 +-
 .../proto/HadoopProtocolJobStatusTask.java      |  19 +-
 .../hadoop/proto/HadoopProtocolKillJobTask.java |  12 +-
 .../proto/HadoopProtocolNextTaskIdTask.java     |   7 +-
 .../proto/HadoopProtocolSubmitJobTask.java      |  16 +-
 .../hadoop/proto/HadoopProtocolTaskAdapter.java |  31 +-
 .../proto/HadoopProtocolTaskArguments.java      |  13 +-
 .../hadoop/shuffle/HadoopShuffle.java           |  37 ++-
 .../hadoop/shuffle/HadoopShuffleAck.java        |  15 +-
 .../hadoop/shuffle/HadoopShuffleJob.java        |  64 +++--
 .../hadoop/shuffle/HadoopShuffleMessage.java    |  25 +-
 .../HadoopConcurrentHashMultimap.java           |  29 +-
 .../shuffle/collections/HadoopHashMultimap.java |  12 +-
 .../collections/HadoopHashMultimapBase.java     |  15 +-
 .../shuffle/collections/HadoopMultimap.java     |  13 +-
 .../shuffle/collections/HadoopMultimapBase.java |  33 ++-
 .../shuffle/collections/HadoopSkipList.java     |  29 +-
 .../shuffle/streams/HadoopDataInStream.java     |  11 +-
 .../shuffle/streams/HadoopDataOutStream.java    |  13 +-
 .../shuffle/streams/HadoopOffheapBuffer.java    |   2 +-
 .../HadoopEmbeddedTaskExecutor.java             |  25 +-
 .../taskexecutor/HadoopExecutorService.java     |  27 +-
 .../hadoop/taskexecutor/HadoopRunnableTask.java |  36 ++-
 .../taskexecutor/HadoopTaskExecutorAdapter.java |  14 +-
 .../hadoop/taskexecutor/HadoopTaskState.java    |   2 +-
 .../hadoop/taskexecutor/HadoopTaskStatus.java   |  14 +-
 .../external/HadoopExternalTaskExecutor.java    |  70 +++--
 .../external/HadoopExternalTaskMetadata.java    |   9 +-
 .../external/HadoopJobInfoUpdateRequest.java    |  18 +-
 .../external/HadoopPrepareForJobRequest.java    |  18 +-
 .../external/HadoopProcessDescriptor.java       |   9 +-
 .../external/HadoopProcessStartedAck.java       |  11 +-
 .../external/HadoopTaskExecutionRequest.java    |  20 +-
 .../external/HadoopTaskFinishedMessage.java     |  16 +-
 .../child/HadoopChildProcessRunner.java         |  58 ++--
 .../child/HadoopExternalProcessStarter.java     |  31 +-
 .../HadoopAbstractCommunicationClient.java      |   8 +-
 .../HadoopCommunicationClient.java              |   8 +-
 .../HadoopExternalCommunication.java            |  74 +++--
 .../HadoopHandshakeTimeoutException.java        |   6 +-
 .../communication/HadoopIpcToNioAdapter.java    |  27 +-
 .../communication/HadoopMarshallerFilter.java   |  12 +-
 .../communication/HadoopMessageListener.java    |   6 +-
 .../HadoopTcpNioCommunicationClient.java        |  14 +-
 .../hadoop/v1/HadoopV1CleanupTask.java          |  16 +-
 .../processors/hadoop/v1/HadoopV1Counter.java   |  15 +-
 .../processors/hadoop/v1/HadoopV1MapTask.java   |  25 +-
 .../hadoop/v1/HadoopV1OutputCollector.java      |  21 +-
 .../hadoop/v1/HadoopV1Partitioner.java          |  10 +-
 .../hadoop/v1/HadoopV1ReduceTask.java           |  18 +-
 .../processors/hadoop/v1/HadoopV1Reporter.java  |  10 +-
 .../processors/hadoop/v1/HadoopV1SetupTask.java |  14 +-
 .../processors/hadoop/v1/HadoopV1Splitter.java  |  25 +-
 .../processors/hadoop/v1/HadoopV1Task.java      |  18 +-
 .../processors/hadoop/v2/HadoopDaemon.java      |   5 +-
 .../hadoop/v2/HadoopExternalSplit.java          |  10 +-
 .../hadoop/v2/HadoopNativeCodeLoader.java       |   6 +-
 .../hadoop/v2/HadoopSerializationWrapper.java   |  19 +-
 .../hadoop/v2/HadoopShutdownHookManager.java    |   8 +-
 .../hadoop/v2/HadoopSplitWrapper.java           |  11 +-
 .../hadoop/v2/HadoopV2CleanupTask.java          |  13 +-
 .../processors/hadoop/v2/HadoopV2Context.java   |  33 ++-
 .../processors/hadoop/v2/HadoopV2Counter.java   |  11 +-
 .../processors/hadoop/v2/HadoopV2Job.java       |  85 ++++--
 .../hadoop/v2/HadoopV2JobResourceManager.java   |  39 +--
 .../processors/hadoop/v2/HadoopV2MapTask.java   |  19 +-
 .../hadoop/v2/HadoopV2Partitioner.java          |  10 +-
 .../hadoop/v2/HadoopV2ReduceTask.java           |  14 +-
 .../processors/hadoop/v2/HadoopV2SetupTask.java |  13 +-
 .../processors/hadoop/v2/HadoopV2Splitter.java  |  28 +-
 .../processors/hadoop/v2/HadoopV2Task.java      |  20 +-
 .../hadoop/v2/HadoopV2TaskContext.java          |  83 ++++--
 .../hadoop/v2/HadoopWritableSerialization.java  |  17 +-
 .../HadoopClientProtocolEmbeddedSelfTest.java   |   4 +-
 .../hadoop/HadoopClientProtocolSelfTest.java    |  59 ++--
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |  25 +-
 .../igfs/Hadoop1OverIgfsDualAsyncTest.java      |   2 +-
 .../igfs/Hadoop1OverIgfsDualSyncTest.java       |   2 +-
 ...oopFileSystemUniversalFileSystemAdapter.java |  19 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |  99 ++++---
 ...Igfs20FileSystemLoopbackPrimarySelfTest.java |   8 +-
 ...oopIgfs20FileSystemShmemPrimarySelfTest.java |   8 +-
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |  62 ++--
 .../igfs/HadoopIgfsDualAsyncSelfTest.java       |   4 +-
 .../ignite/igfs/HadoopIgfsDualSyncSelfTest.java |   4 +-
 ...oopSecondaryFileSystemConfigurationTest.java |  70 +++--
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |  25 +-
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |  50 ++--
 .../IgniteHadoopFileSystemAbstractSelfTest.java | 106 ++++---
 .../IgniteHadoopFileSystemClientSelfTest.java   |  57 ++--
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |  52 ++--
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |  51 ++--
 .../IgniteHadoopFileSystemLoggerSelfTest.java   |  42 ++-
 ...niteHadoopFileSystemLoggerStateSelfTest.java |  46 +--
 ...adoopFileSystemLoopbackAbstractSelfTest.java |   6 +-
 ...SystemLoopbackEmbeddedDualAsyncSelfTest.java |   4 +-
 ...eSystemLoopbackEmbeddedDualSyncSelfTest.java |   4 +-
 ...leSystemLoopbackEmbeddedPrimarySelfTest.java |   4 +-
 ...SystemLoopbackEmbeddedSecondarySelfTest.java |   4 +-
 ...SystemLoopbackExternalDualAsyncSelfTest.java |   4 +-
 ...eSystemLoopbackExternalDualSyncSelfTest.java |   4 +-
 ...leSystemLoopbackExternalPrimarySelfTest.java |   4 +-
 ...SystemLoopbackExternalSecondarySelfTest.java |   4 +-
 ...teHadoopFileSystemSecondaryModeSelfTest.java |  47 ++--
 ...teHadoopFileSystemShmemAbstractSelfTest.java |  19 +-
 ...ileSystemShmemEmbeddedDualAsyncSelfTest.java |   4 +-
 ...FileSystemShmemEmbeddedDualSyncSelfTest.java |   4 +-
 ...pFileSystemShmemEmbeddedPrimarySelfTest.java |   4 +-
 ...ileSystemShmemEmbeddedSecondarySelfTest.java |   4 +-
 ...ileSystemShmemExternalDualAsyncSelfTest.java |   4 +-
 ...FileSystemShmemExternalDualSyncSelfTest.java |   4 +-
 ...pFileSystemShmemExternalPrimarySelfTest.java |   4 +-
 ...ileSystemShmemExternalSecondarySelfTest.java |   4 +-
 .../hadoop/HadoopAbstractSelfTest.java          |  38 +--
 .../hadoop/HadoopAbstractWordCountTest.java     |  19 +-
 .../hadoop/HadoopClassLoaderTest.java           |   6 +-
 .../hadoop/HadoopCommandLineTest.java           |  48 ++--
 .../HadoopDefaultMapReducePlannerSelfTest.java  |  62 ++--
 .../hadoop/HadoopFileSystemsTest.java           |  21 +-
 .../processors/hadoop/HadoopGroupingTest.java   |  43 ++-
 .../hadoop/HadoopJobTrackerSelfTest.java        |  44 +--
 .../hadoop/HadoopMapReduceEmbeddedSelfTest.java |  34 ++-
 .../processors/hadoop/HadoopMapReduceTest.java  |  78 +++--
 .../hadoop/HadoopPopularWordsTest.java          |  40 +--
 .../HadoopSerializationWrapperSelfTest.java     |  21 +-
 .../processors/hadoop/HadoopSharedMap.java      |   7 +-
 .../hadoop/HadoopSortingExternalTest.java       |   7 +-
 .../processors/hadoop/HadoopSortingTest.java    |  50 +++-
 .../hadoop/HadoopSplitWrapperSelfTest.java      |  22 +-
 .../processors/hadoop/HadoopStartup.java        |   6 +-
 .../hadoop/HadoopTaskExecutionSelfTest.java     |  60 ++--
 .../hadoop/HadoopTasksAllVersionsTest.java      |  22 +-
 .../processors/hadoop/HadoopTasksV1Test.java    |  15 +-
 .../processors/hadoop/HadoopTasksV2Test.java    |  26 +-
 .../hadoop/HadoopTestRoundRobinMrPlanner.java   |  19 +-
 .../hadoop/HadoopTestTaskContext.java           |  25 +-
 .../processors/hadoop/HadoopTestUtils.java      |  19 +-
 .../processors/hadoop/HadoopV2JobSelfTest.java  |  30 +-
 .../hadoop/HadoopValidationSelfTest.java        |   4 +-
 .../hadoop/examples/HadoopWordCount1.java       |  14 +-
 .../hadoop/examples/HadoopWordCount1Map.java    |  17 +-
 .../hadoop/examples/HadoopWordCount1Reduce.java |  16 +-
 .../hadoop/examples/HadoopWordCount2.java       |  18 +-
 .../hadoop/examples/HadoopWordCount2Mapper.java |  15 +-
 .../examples/HadoopWordCount2Reducer.java       |  13 +-
 .../collections/HadoopAbstractMapTest.java      |  29 +-
 .../HadoopConcurrentHashMultimapSelftest.java   |  41 ++-
 .../collections/HadoopHashMapSelfTest.java      |  25 +-
 .../collections/HadoopSkipListSelfTest.java     |  46 ++-
 .../streams/HadoopDataStreamSelfTest.java       |  11 +-
 .../taskexecutor/HadoopExecutorServiceTest.java |  15 +-
 .../HadoopExternalTaskExecutionSelfTest.java    |  46 +--
 .../HadoopExternalCommunicationSelfTest.java    |  30 +-
 .../testsuites/IgniteHadoopTestSuite.java       |  85 ++++--
 .../IgniteIgfsLinuxAndMacOSTestSuite.java       |  20 +-
 .../HibernateAbstractRegionAccessStrategy.java  |   9 +-
 .../HibernateAccessStrategyAdapter.java         |  33 ++-
 .../hibernate/HibernateCollectionRegion.java    |  14 +-
 .../cache/hibernate/HibernateEntityRegion.java  |  15 +-
 .../hibernate/HibernateGeneralDataRegion.java   |  15 +-
 .../hibernate/HibernateNaturalIdRegion.java     |  15 +-
 .../HibernateNonStrictAccessStrategy.java       |  23 +-
 .../hibernate/HibernateQueryResultsRegion.java  |  10 +-
 .../HibernateReadOnlyAccessStrategy.java        |  14 +-
 .../HibernateReadWriteAccessStrategy.java       |  26 +-
 .../ignite/cache/hibernate/HibernateRegion.java |  14 +-
 .../cache/hibernate/HibernateRegionFactory.java |  31 +-
 .../hibernate/HibernateTimestampsRegion.java    |   8 +-
 .../HibernateTransactionalAccessStrategy.java   |  14 +-
 .../HibernateTransactionalDataRegion.java       |  22 +-
 .../hibernate/CacheHibernateBlobStore.java      |  57 ++--
 .../hibernate/CacheHibernateBlobStoreEntry.java |   7 +-
 .../CacheHibernateBlobStoreFactory.java         |  24 +-
 .../CacheHibernateStoreSessionListener.java     |  32 ++-
 .../HibernateL2CacheConfigurationSelfTest.java  |  57 ++--
 .../hibernate/HibernateL2CacheSelfTest.java     |  78 +++--
 .../HibernateL2CacheTransactionalSelfTest.java  |  34 +--
 .../CacheHibernateBlobStoreNodeRestartTest.java |  12 +-
 .../CacheHibernateBlobStoreSelfTest.java        |  15 +-
 .../CacheHibernateStoreFactorySelfTest.java     |  42 ++-
 ...heHibernateStoreSessionListenerSelfTest.java |  36 ++-
 .../testsuites/IgniteHibernateTestSuite.java    |  13 +-
 .../query/h2/GridH2ResultSetIterator.java       |  16 +-
 .../processors/query/h2/IgniteH2Indexing.java   | 196 +++++++++----
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  30 +-
 .../processors/query/h2/opt/GridH2Cursor.java   |  12 +-
 .../query/h2/opt/GridH2IndexBase.java           |  24 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |  19 +-
 .../query/h2/opt/GridH2KeyValueRowOnheap.java   |   8 +-
 .../processors/query/h2/opt/GridH2Row.java      |   6 +-
 .../query/h2/opt/GridH2RowDescriptor.java       |  16 +-
 .../processors/query/h2/opt/GridH2Table.java    |  58 ++--
 .../query/h2/opt/GridH2TreeIndex.java           |  41 +--
 .../processors/query/h2/opt/GridH2Utils.java    |  10 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |  19 +-
 .../query/h2/opt/GridLuceneDirectory.java       |  21 +-
 .../processors/query/h2/opt/GridLuceneFile.java |  10 +-
 .../query/h2/opt/GridLuceneIndex.java           |  64 +++--
 .../query/h2/opt/GridLuceneInputStream.java     |  13 +-
 .../query/h2/opt/GridLuceneLockFactory.java     |  10 +-
 .../query/h2/opt/GridLuceneOutputStream.java    |   9 +-
 .../query/h2/opt/GridSearchRowPointer.java      |   6 +-
 .../query/h2/sql/GridSqlAggregateFunction.java  |  12 +-
 .../processors/query/h2/sql/GridSqlAlias.java   |   7 +-
 .../processors/query/h2/sql/GridSqlColumn.java  |   4 +-
 .../processors/query/h2/sql/GridSqlConst.java   |   7 +-
 .../processors/query/h2/sql/GridSqlElement.java |   5 +-
 .../query/h2/sql/GridSqlFunction.java           |  22 +-
 .../query/h2/sql/GridSqlFunctionType.java       |   4 +-
 .../processors/query/h2/sql/GridSqlJoin.java    |  10 +-
 .../query/h2/sql/GridSqlOperation.java          |   6 +-
 .../query/h2/sql/GridSqlOperationType.java      |   5 +-
 .../query/h2/sql/GridSqlParameter.java          |   4 +-
 .../query/h2/sql/GridSqlPlaceholder.java        |   4 +-
 .../processors/query/h2/sql/GridSqlQuery.java   |   9 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  80 +++++-
 .../query/h2/sql/GridSqlQuerySplitter.java      |  31 +-
 .../processors/query/h2/sql/GridSqlSelect.java  |   9 +-
 .../query/h2/sql/GridSqlSortColumn.java         |   2 +-
 .../query/h2/sql/GridSqlSubquery.java           |   4 +-
 .../processors/query/h2/sql/GridSqlTable.java   |   9 +-
 .../processors/query/h2/sql/GridSqlType.java    |   8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   |   9 +-
 .../processors/query/h2/sql/GridSqlValue.java   |   2 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |  97 ++++---
 .../query/h2/twostep/GridMergeIndex.java        |  44 +--
 .../h2/twostep/GridMergeIndexUnsorted.java      |  25 +-
 .../query/h2/twostep/GridMergeTable.java        |  22 +-
 .../h2/twostep/GridReduceQueryExecutor.java     | 114 +++++---
 .../query/h2/twostep/GridResultPage.java        |  27 +-
 .../query/h2/twostep/GridThreadLocalTable.java  |  33 ++-
 .../query/h2/twostep/msg/GridH2Array.java       |  26 +-
 .../query/h2/twostep/msg/GridH2Boolean.java     |  13 +-
 .../query/h2/twostep/msg/GridH2Byte.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Bytes.java       |  13 +-
 .../query/h2/twostep/msg/GridH2CacheObject.java |  19 +-
 .../query/h2/twostep/msg/GridH2Date.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Decimal.java     |  16 +-
 .../query/h2/twostep/msg/GridH2Double.java      |  13 +-
 .../query/h2/twostep/msg/GridH2Float.java       |  13 +-
 .../query/h2/twostep/msg/GridH2Geometry.java    |  15 +-
 .../query/h2/twostep/msg/GridH2Integer.java     |  13 +-
 .../query/h2/twostep/msg/GridH2JavaObject.java  |  13 +-
 .../query/h2/twostep/msg/GridH2Long.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Null.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Short.java       |  13 +-
 .../query/h2/twostep/msg/GridH2String.java      |  13 +-
 .../query/h2/twostep/msg/GridH2Time.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Timestamp.java   |  13 +-
 .../query/h2/twostep/msg/GridH2Uuid.java        |  13 +-
 .../h2/twostep/msg/GridH2ValueMessage.java      |  15 +-
 .../twostep/msg/GridH2ValueMessageFactory.java  |  19 +-
 .../CacheAbstractQueryMetricsSelfTest.java      |  25 +-
 .../cache/CacheConfigurationP2PTest.java        |  36 +--
 .../cache/CacheConfigurationP2PTestServer.java  |  13 +-
 .../cache/CacheLocalQueryMetricsSelfTest.java   |   4 +-
 ...titionedQueryMetricsDistributedSelfTest.java |   4 +-
 ...chePartitionedQueryMetricsLocalSelfTest.java |   4 +-
 ...plicatedQueryMetricsDistributedSelfTest.java |   4 +-
 ...acheReplicatedQueryMetricsLocalSelfTest.java |   4 +-
 ...CacheScanPartitionQueryFallbackSelfTest.java |  66 +++--
 .../cache/GridCacheCrossCacheQuerySelfTest.java |  45 +--
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  64 +++--
 .../cache/GridCacheOffHeapSelfTest.java         |  61 ++--
 .../GridCacheOffheapIndexEntryEvictTest.java    |  42 +--
 .../cache/GridCacheOffheapIndexGetSelfTest.java |  46 +--
 .../GridCacheQueryIndexDisabledSelfTest.java    |  32 ++-
 .../GridCacheQuerySerializationSelfTest.java    |  37 +--
 .../cache/GridCacheQuerySimpleBenchmark.java    |  46 +--
 .../cache/GridCacheQueryTestValue.java          |   8 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |  34 ++-
 .../processors/cache/GridCacheSwapSelfTest.java |  63 +++--
 .../cache/GridIndexingWithNoopSwapSelfTest.java |  38 +--
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  73 +++--
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 120 +++++---
 .../IgniteCacheCollocatedQuerySelfTest.java     |  40 +--
 ...acheConfigurationPrimitiveTypesSelfTest.java |  19 +-
 .../IgniteCacheFieldsQueryNoDataSelfTest.java   |  26 +-
 .../cache/IgniteCacheLargeResultSelfTest.java   |  29 +-
 .../cache/IgniteCacheOffheapEvictQueryTest.java |  50 ++--
 ...CacheOffheapTieredMultithreadedSelfTest.java |  44 +--
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   9 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |  59 ++--
 ...teCacheQueryEvictsMultiThreadedSelfTest.java |   2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |  26 +-
 .../cache/IgniteCacheQueryLoadSelfTest.java     |  52 ++--
 ...QueryMultiThreadedOffHeapTieredSelfTest.java |   7 +-
 .../IgniteCacheQueryMultiThreadedSelfTest.java  |  66 +++--
 ...QueryOffheapEvictsMultiThreadedSelfTest.java |   2 +-
 ...eCacheQueryOffheapMultiThreadedSelfTest.java |   2 +-
 ...gniteCacheSqlQueryMultiThreadedSelfTest.java |  47 ++--
 ...ClientReconnectCacheQueriesFailoverTest.java |  37 ++-
 .../cache/IgniteClientReconnectQueriesTest.java |  44 +--
 .../IgniteCacheAtomicFieldsQuerySelfTest.java   |  16 +-
 ...cheAtomicNearEnabledFieldsQuerySelfTest.java |   4 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |   8 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |   8 +-
 ...lientQueryReplicatedNodeRestartSelfTest.java |  64 +++--
 ...artitionedFieldsQueryP2PEnabledSelfTest.java |   4 +-
 ...niteCachePartitionedFieldsQuerySelfTest.java |  13 +-
 ...achePartitionedQueryP2PDisabledSelfTest.java |   4 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |  26 +-
 .../IgniteCacheQueryNodeRestartSelfTest.java    |  53 ++--
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |  56 ++--
 ...ReplicatedFieldsQueryP2PEnabledSelfTest.java |   4 +-
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |  25 +-
 ...CacheReplicatedQueryP2PDisabledSelfTest.java |   4 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |  74 +++--
 .../IgniteCacheLocalAtomicQuerySelfTest.java    |   6 +-
 .../IgniteCacheLocalFieldsQuerySelfTest.java    |   8 +-
 .../local/IgniteCacheLocalQuerySelfTest.java    |  22 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |  54 ++--
 ...ridCacheReduceFieldsQueryAtomicSelfTest.java |   8 +-
 ...GridCacheReduceFieldsQueryLocalSelfTest.java |   6 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |  15 +-
 ...acheReduceFieldsQueryReplicatedSelfTest.java |   6 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |  62 ++--
 .../CacheTtlOffheapAtomicAbstractSelfTest.java  |   4 +-
 .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java |   4 +-
 ...acheTtlOffheapAtomicPartitionedSelfTest.java |   4 +-
 ...TtlOffheapTransactionalAbstractSelfTest.java |   4 +-
 ...cheTtlOffheapTransactionalLocalSelfTest.java |   4 +-
 .../CacheTtlOnheapAtomicAbstractSelfTest.java   |   4 +-
 .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java  |   4 +-
 ...eTtlOnheapTransactionalAbstractSelfTest.java |   4 +-
 ...acheTtlOnheapTransactionalLocalSelfTest.java |   4 +-
 ...lOnheapTransactionalPartitionedSelfTest.java |   4 +-
 .../query/IgniteSqlSplitterSelfTest.java        |  34 ++-
 .../query/h2/GridH2IndexRebuildTest.java        |  33 ++-
 .../query/h2/GridH2IndexingInMemSelfTest.java   |   2 +-
 .../query/h2/GridH2IndexingOffheapSelfTest.java |   2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  47 ++--
 .../query/h2/opt/GridH2TableSelfTest.java       |  42 ++-
 .../h2/sql/AbstractH2CompareQueryTest.java      |  46 +--
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  34 ++-
 .../query/h2/sql/GridQueryParsingTest.java      |  52 ++--
 .../query/h2/sql/H2CompareBigQueryTest.java     |  26 +-
 .../loadtests/h2indexing/GridTestEntity.java    |   7 +-
 .../loadtests/h2indexing/GridTreeBenchmark.java |  16 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |  56 ++--
 .../IgniteCacheQuerySelfTestSuite.java          |  81 +++++-
 .../IgniteCacheWithIndexingTestSuite.java       |  23 +-
 .../IgniteH2IndexingSpiTestSuite.java           |  10 +-
 .../IgnitePortableCacheQueryTestSuite.java      |  42 ++-
 .../org/apache/ignite/logger/jcl/JclLogger.java |   9 +-
 .../apache/ignite/logger/jcl/JclLoggerTest.java |  10 +-
 .../ignite/testsuites/IgniteJclTestSuite.java   |   6 +-
 .../apache/ignite/stream/jms11/JmsStreamer.java |  31 +-
 .../ignite/stream/jms11/MessageTransformer.java |   7 +-
 .../stream/jms11/IgniteJmsStreamerTest.java     |  50 ++--
 .../ignite/stream/jms11/TestTransformers.java   |  11 +-
 .../apache/ignite/cache/jta/CacheTmLookup.java  |  11 +-
 .../cache/jta/jndi/CacheJndiTmLookup.java       |  16 +-
 .../jta/reflect/CacheReflectionTmLookup.java    |  13 +-
 .../processors/cache/jta/CacheJtaManager.java   |  23 +-
 .../cache/jta/GridCacheXAResource.java          |  28 +-
 ...CacheJtaConfigurationValidationSelfTest.java |  22 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |  31 +-
 .../cache/GridCacheReplicatedJtaSelfTest.java   |   6 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |  31 +-
 .../ignite/testsuites/IgniteJtaTestSuite.java   |   9 +-
 .../ignite/stream/kafka/KafkaStreamer.java      |  27 +-
 .../kafka/IgniteKafkaStreamerSelfTestSuite.java |   4 +-
 .../stream/kafka/KafkaEmbeddedBroker.java       |  43 +--
 .../kafka/KafkaIgniteStreamerSelfTest.java      |  42 +--
 .../ignite/stream/kafka/SimplePartitioner.java  |   6 +-
 .../log4j/Log4JDailyRollingFileAppender.java    |  12 +-
 .../Log4JExternallyRolledFileAppender.java      |  11 +-
 .../ignite/logger/log4j/Log4JFileAppender.java  |  12 +-
 .../apache/ignite/logger/log4j/Log4JLogger.java |  49 ++--
 .../ignite/logger/log4j/Log4jFileAware.java     |   4 +-
 .../logger/log4j/Log4jNodeIdFilePath.java       |  15 +-
 .../logger/log4j/Log4jRollingFileAppender.java  |  12 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |  24 +-
 .../logger/log4j/GridLog4jInitializedTest.java  |  10 +-
 .../logger/log4j/GridLog4jLoggingFileTest.java  |  13 +-
 .../logger/log4j/GridLog4jLoggingPathTest.java  |   8 +-
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |  13 +-
 .../log4j/GridLog4jNotInitializedTest.java      |   8 +-
 .../ignite/testsuites/IgniteLog4jTestSuite.java |   8 +-
 .../ignite/logger/log4j2/Log4J2Logger.java      |  56 ++--
 .../ignite/logger/log4j2/package-info.java      |   2 +-
 .../log4j2/GridLog4j2CorrectFileNameTest.java   |   3 +-
 .../log4j2/GridLog4j2InitializedTest.java       |   3 +-
 .../log4j2/GridLog4j2LoggingFileTest.java       |   5 +-
 .../logger/log4j2/Log4j2LoggerSelfTest.java     |  27 +-
 .../log4j2/Log4j2LoggerVerboseModeSelfTest.java |  22 +-
 .../ignite/logger/log4j2/package-info.java      |   2 +-
 .../testsuites/IgniteLog4j2TestSuite.java       |   6 +-
 .../apache/ignite/mesos/ClusterProperties.java  |  19 +-
 .../apache/ignite/mesos/IgniteFramework.java    |  19 +-
 .../apache/ignite/mesos/IgniteScheduler.java    |  21 +-
 .../org/apache/ignite/mesos/IgniteTask.java     |   2 +-
 .../ignite/mesos/resource/IgniteProvider.java   |  16 +-
 .../ignite/mesos/resource/JettyServer.java      |   8 +-
 .../ignite/mesos/resource/ResourceHandler.java  |  22 +-
 .../ignite/mesos/resource/ResourceProvider.java |  16 +-
 .../org/apache/ignite/IgniteMesosTestSuite.java |   6 +-
 .../ignite/mesos/IgniteSchedulerSelfTest.java   |  16 +-
 .../platform/PlatformAbstractBootstrap.java     |  12 +-
 .../platform/PlatformAbstractPredicate.java     |   7 +-
 .../platform/PlatformAbstractTarget.java        |  19 +-
 .../processors/platform/PlatformBootstrap.java  |   4 +-
 .../platform/PlatformBootstrapFactory.java      |   2 +-
 .../processors/platform/PlatformException.java  |   8 +-
 .../platform/PlatformExtendedException.java     |   4 +-
 .../processors/platform/PlatformIgnition.java   |  27 +-
 .../platform/PlatformNoCallbackException.java   |   4 +-
 .../platform/cache/PlatformCache.java           |  64 +++--
 .../cache/PlatformCacheEntryFilterImpl.java     |  16 +-
 .../cache/PlatformCacheEntryProcessor.java      |  32 ++-
 .../platform/cache/PlatformCacheIterator.java   |  14 +-
 .../PlatformCachePartialUpdateException.java    |  15 +-
 .../cache/affinity/PlatformAffinity.java        |  29 +-
 .../query/PlatformAbstractQueryCursor.java      |  16 +-
 .../query/PlatformContinuousQueryImpl.java      |  33 ++-
 .../PlatformContinuousQueryRemoteFilter.java    |  31 +-
 .../cache/query/PlatformFieldsQueryCursor.java  |  11 +-
 .../cache/query/PlatformQueryCursor.java        |  11 +-
 .../cache/store/PlatformCacheStore.java         |   2 +-
 .../cache/store/PlatformCacheStoreCallback.java |   8 +-
 .../platform/cluster/PlatformClusterGroup.java  |  22 +-
 .../cluster/PlatformClusterNodeFilter.java      |  20 +-
 .../platform/compute/PlatformAbstractJob.java   |  24 +-
 .../platform/compute/PlatformAbstractTask.java  |  27 +-
 .../PlatformBalancingMultiClosureTask.java      |  23 +-
 ...tformBalancingSingleClosureAffinityTask.java |  22 +-
 .../PlatformBalancingSingleClosureTask.java     |  22 +-
 .../PlatformBroadcastingMultiClosureTask.java   |  20 +-
 .../PlatformBroadcastingSingleClosureTask.java  |  19 +-
 .../platform/compute/PlatformClosureJob.java    |  20 +-
 .../platform/compute/PlatformCompute.java       |  32 ++-
 .../platform/compute/PlatformFullJob.java       |  21 +-
 .../platform/compute/PlatformFullTask.java      |  33 ++-
 .../compute/PlatformNativeException.java        |  12 +-
 .../datastreamer/PlatformDataStreamer.java      |  34 ++-
 .../datastreamer/PlatformStreamReceiver.java    |  30 +-
 .../platform/dotnet/PlatformDotNetService.java  |   4 +-
 .../dotnet/PlatformDotNetServiceImpl.java       |   6 +-
 .../platform/events/PlatformEventFilter.java    |  19 +-
 .../platform/events/PlatformEvents.java         |  27 +-
 .../lifecycle/PlatformLifecycleBean.java        |   9 +-
 .../platform/memory/PlatformAbstractMemory.java |   2 +-
 .../PlatformBigEndianInputStreamImpl.java       |   2 +-
 .../PlatformBigEndianOutputStreamImpl.java      |   3 +-
 .../platform/memory/PlatformExternalMemory.java |   8 +-
 .../memory/PlatformInputStreamImpl.java         |  16 +-
 .../memory/PlatformMemoryManagerImpl.java       |  10 +-
 .../platform/memory/PlatformMemoryPool.java     |  11 +-
 .../platform/memory/PlatformMemoryUtils.java    |   9 +-
 .../memory/PlatformOutputStreamImpl.java        |  12 +-
 .../platform/memory/PlatformPooledMemory.java   |   5 +-
 .../platform/memory/PlatformUnpooledMemory.java |   4 +-
 .../messaging/PlatformMessageFilter.java        |  19 +-
 .../messaging/PlatformMessageLocalFilter.java   |  15 +-
 .../platform/messaging/PlatformMessaging.java   |  18 +-
 .../services/PlatformAbstractService.java       |  28 +-
 .../platform/services/PlatformServices.java     |  30 +-
 .../transactions/PlatformTransactions.java      |  30 +-
 .../platform/utils/PlatformFutureUtils.java     |  17 +-
 .../platform/utils/PlatformReaderBiClosure.java |   6 +-
 .../platform/utils/PlatformReaderClosure.java   |   4 +-
 .../platform/utils/PlatformUtils.java           |  46 ++-
 .../platform/utils/PlatformWriterBiClosure.java |   4 +-
 .../platform/utils/PlatformWriterClosure.java   |   4 +-
 .../http/jetty/GridJettyJsonConfig.java         |   9 +-
 .../http/jetty/GridJettyRestHandler.java        |  72 +++--
 .../http/jetty/GridJettyRestProtocol.java       |  59 ++--
 .../schedule/IgniteScheduleProcessor.java       |  26 +-
 .../processors/schedule/ScheduleFutureImpl.java |  56 ++--
 .../schedule/GridScheduleSelfTest.java          |  31 +-
 .../testsuites/IgniteSchedulerTestSuite.java    |   6 +-
 .../ignite/schema/generator/CodeGenerator.java  |  36 ++-
 .../ignite/schema/generator/XmlGenerator.java   |  51 ++--
 .../apache/ignite/schema/model/IndexItem.java   |   2 +-
 .../ignite/schema/model/PojoDescriptor.java     |  54 +++-
 .../apache/ignite/schema/model/PojoField.java   |  58 +++-
 .../ignite/schema/model/SchemaDescriptor.java   |   5 +-
 .../schema/parser/DatabaseMetadataParser.java   |  29 +-
 .../apache/ignite/schema/parser/DbColumn.java   |   2 +-
 .../apache/ignite/schema/parser/DbTable.java    |   6 +-
 .../parser/dialect/DB2MetadataDialect.java      |   6 +-
 .../parser/dialect/DatabaseMetadataDialect.java |  16 +-
 .../parser/dialect/JdbcMetadataDialect.java     |  19 +-
 .../parser/dialect/MySQLMetadataDialect.java    |  10 +-
 .../parser/dialect/OracleMetadataDialect.java   |  42 ++-
 .../ignite/schema/ui/ConfirmCallable.java       |  14 +-
 .../org/apache/ignite/schema/ui/Controls.java   |  63 +++--
 .../org/apache/ignite/schema/ui/GridPaneEx.java |  13 +-
 .../org/apache/ignite/schema/ui/MessageBox.java |  35 ++-
 .../apache/ignite/schema/ui/ModalDialog.java    |   4 +-
 .../ignite/schema/ui/SchemaImportApp.java       | 119 ++++++--
 .../ignite/schema/ui/TextColumnValidator.java   |   2 +-
 .../schema/test/AbstractSchemaImportTest.java   |  32 ++-
 .../test/generator/CodeGeneratorTest.java       |   7 +-
 .../schema/test/generator/XmlGeneratorTest.java |  14 +-
 .../test/parser/DbMetadataParserTest.java       |  17 +-
 .../testsuites/IgniteSchemaImportTestSuite.java |   9 +-
 .../apache/ignite/logger/slf4j/Slf4jLogger.java |   9 +-
 .../ignite/spark/JavaIgniteRDDSelfTest.java     |  36 +--
 .../java/org/apache/ignite/IgniteSpring.java    |  15 +-
 .../org/apache/ignite/IgniteSpringBean.java     |  40 +--
 .../apache/ignite/cache/spring/SpringCache.java |   8 +-
 .../ignite/cache/spring/SpringCacheManager.java |  21 +-
 .../spring/CacheSpringStoreSessionListener.java |  33 ++-
 .../GridResourceSpringBeanInjector.java         |  17 +-
 .../resource/GridSpringResourceContextImpl.java |  10 +-
 .../util/spring/IgniteSpringHelperImpl.java     |  59 ++--
 .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java |  27 +-
 .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java |  26 +-
 ...CacheSpringStoreSessionListenerSelfTest.java |  36 ++-
 .../ignite/internal/GridFactorySelfTest.java    |  92 +++---
 .../GridSpringBeanSerializationSelfTest.java    |  21 +-
 .../internal/IgniteDynamicCacheConfigTest.java  |  20 +-
 .../apache/ignite/internal/TestNodeFilter.java  |   6 +-
 .../resource/GridLoggerInjectionSelfTest.java   |  21 +-
 .../resource/GridResourceProcessorSelfTest.java |  41 ++-
 .../resource/GridResourceTestUtils.java         |   4 +-
 .../resource/GridServiceInjectionSelfTest.java  |  16 +-
 .../processors/resource/TestClosure.java        |  12 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |  50 ++--
 .../spring/GridSpringCacheManagerSelfTest.java  |  19 +-
 .../ignite/spring/GridSpringCacheTestKey.java   |   4 +-
 .../spring/GridSpringCacheTestKeyGenerator.java |   7 +-
 .../spring/GridSpringCacheTestService.java      |   9 +-
 .../GridSpringDynamicCacheTestService.java      |   9 +-
 .../IgniteExcludeInConfigurationTest.java       |  21 +-
 .../IgniteStartFromStreamConfigurationTest.java |  18 +-
 .../testsuites/IgniteResourceSelfTestSuite.java |   8 +-
 .../testsuites/IgniteSpringTestSuite.java       |  19 +-
 .../util/nodestart/IgniteSshHelperImpl.java     |   2 +-
 .../util/nodestart/StartNodeCallableImpl.java   |  39 ++-
 .../internal/IgniteNodeStartUtilsSelfTest.java  |  25 +-
 ...gniteProjectionStartStopRestartSelfTest.java |  62 ++--
 .../IgniteStartStopRestartTestSuite.java        |   3 +-
 .../ant/beautifier/GridJavadocAntTask.java      |  27 +-
 .../GridJavadocCharArrayLexReader.java          |   2 +-
 .../tools/ant/beautifier/GridJavadocToken.java  |   2 +-
 .../ant/beautifier/GridJavadocTokenType.java    |   2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |  27 +-
 .../ignite/tools/javadoc/IgniteLinkTaglet.java  |  11 +-
 .../util/antgar/IgniteDeploymentGarAntTask.java |  15 +-
 .../uri/GridUriDeploymentClassLoader.java       |  15 +-
 .../GridUriDeploymentClassLoaderFactory.java    |  16 +-
 .../uri/GridUriDeploymentDiscovery.java         |  18 +-
 .../uri/GridUriDeploymentFileProcessor.java     |  42 +--
 .../GridUriDeploymentFileProcessorResult.java   |  11 +-
 .../GridUriDeploymentFileResourceLoader.java    |   9 +-
 .../uri/GridUriDeploymentJarVerifier.java       |  26 +-
 .../uri/GridUriDeploymentSpringDocument.java    |  17 +-
 .../uri/GridUriDeploymentSpringParser.java      |  20 +-
 .../uri/GridUriDeploymentUnitDescriptor.java    |  28 +-
 .../uri/GridUriDeploymentUriParser.java         |   6 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |  66 +++--
 .../deployment/uri/UriDeploymentSpiMBean.java   |   9 +-
 .../uri/scanners/GridDeploymentFileHandler.java |   4 +-
 .../GridDeploymentFolderScannerHelper.java      |   5 +-
 .../GridUriDeploymentScannerListener.java       |   7 +-
 .../uri/scanners/UriDeploymentScanner.java      |   4 +-
 .../scanners/UriDeploymentScannerContext.java   |  12 +-
 .../scanners/UriDeploymentScannerManager.java   |  18 +-
 .../scanners/file/UriDeploymentFileScanner.java |  32 ++-
 .../scanners/http/UriDeploymentHttpScanner.java |  58 ++--
 .../GridTaskUriDeploymentDeadlockSelfTest.java  |  32 +--
 .../ignite/p2p/GridP2PDisabledSelfTest.java     |  24 +-
 .../uri/GridUriDeploymentAbstractSelfTest.java  |  10 +-
 ...loymentClassLoaderMultiThreadedSelfTest.java |  15 +-
 .../GridUriDeploymentClassLoaderSelfTest.java   |  17 +-
 ...riDeploymentClassloaderRegisterSelfTest.java |  29 +-
 .../uri/GridUriDeploymentConfigSelfTest.java    |   8 +-
 .../GridUriDeploymentFileProcessorSelfTest.java |  19 +-
 .../uri/GridUriDeploymentMd5CheckSelfTest.java  |  21 +-
 ...loymentMultiScannersErrorThrottlingTest.java |  11 +-
 .../GridUriDeploymentMultiScannersSelfTest.java |  13 +-
 .../uri/GridUriDeploymentSimpleSelfTest.java    |  27 +-
 .../file/GridFileDeploymentSelfTest.java        |  14 +-
 .../GridFileDeploymentUndeploySelfTest.java     |  19 +-
 .../http/GridHttpDeploymentSelfTest.java        |  29 +-
 .../testsuites/IgniteToolsSelfTestSuite.java    |   6 +-
 .../IgniteUriDeploymentTestSuite.java           |  20 +-
 .../apache/ignite/tools/GridToolsSelfTest.java  |  23 +-
 .../visor/plugin/VisorExtensionPoint.java       |   4 +-
 .../ignite/visor/plugin/VisorPluggableTab.java  |   5 +-
 .../apache/ignite/visor/plugin/VisorPlugin.java |   6 +-
 .../visor/plugin/VisorPluginComponent.java      |   4 +-
 .../plugin/VisorPluginComponentsFactory.java    |   6 +-
 .../visor/plugin/VisorPluginLogPanel.java       |   2 +-
 .../ignite/visor/plugin/VisorPluginModel.java   |  12 +-
 .../visor/plugin/VisorPluginNodesPanel.java     |   5 +-
 .../visor/plugin/VisorSelectionListener.java    |   4 +-
 .../visor/plugin/VisorTopologyListener.java     |   4 +-
 .../ignite/cache/websession/WebSession.java     |  30 +-
 .../cache/websession/WebSessionFilter.java      |  64 +++--
 .../cache/websession/WebSessionListener.java    |  36 ++-
 .../servlet/ServletContextListenerStartup.java  |  32 ++-
 .../ignite/startup/servlet/ServletStartup.java  |  28 +-
 .../IgniteWebSessionSelfTestSuite.java          |   8 +-
 .../internal/websession/WebSessionSelfTest.java |  46 +--
 .../websession/WebSessionServerStart.java       |  22 +-
 .../internal/websession/WebSessionTest.java     |  11 +-
 .../yardstick/IgniteAbstractBenchmark.java      |  25 +-
 .../yardstick/IgniteBenchmarkArguments.java     |  12 +-
 .../org/apache/ignite/yardstick/IgniteNode.java |  40 +--
 .../cache/IgniteCacheAbstractBenchmark.java     |   8 +-
 .../yardstick/cache/IgniteGetBenchmark.java     |   7 +-
 .../cache/IgniteGetOffHeapBenchmark.java        |   6 +-
 .../cache/IgniteGetOffHeapValuesBenchmark.java  |   6 +-
 .../cache/IgniteJdbcSqlQueryBenchmark.java      |  21 +-
 .../yardstick/cache/IgnitePutAllBenchmark.java  |  15 +-
 .../cache/IgnitePutAllTxBenchmark.java          |  15 +-
 .../yardstick/cache/IgnitePutBenchmark.java     |   9 +-
 .../yardstick/cache/IgnitePutGetBenchmark.java  |   9 +-
 .../cache/IgnitePutGetOffHeapBenchmark.java     |   6 +-
 .../IgnitePutGetOffHeapValuesBenchmark.java     |   6 +-
 .../cache/IgnitePutGetTxBenchmark.java          |  11 +-
 .../cache/IgnitePutGetTxOffHeapBenchmark.java   |   6 +-
 .../IgnitePutGetTxOffHeapValuesBenchmark.java   |   6 +-
 .../cache/IgnitePutIndexedValue1Benchmark.java  |   9 +-
 .../cache/IgnitePutIndexedValue2Benchmark.java  |   9 +-
 .../cache/IgnitePutIndexedValue8Benchmark.java  |   9 +-
 .../cache/IgnitePutOffHeapBenchmark.java        |   6 +-
 .../cache/IgnitePutOffHeapValuesBenchmark.java  |   6 +-
 .../yardstick/cache/IgnitePutTxBenchmark.java   |   9 +-
 .../cache/IgnitePutTxOffHeapBenchmark.java      |   6 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java      |   6 +-
 .../cache/IgniteSqlQueryBenchmark.java          |  23 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |  23 +-
 .../IgniteSqlQueryJoinOffHeapBenchmark.java     |   6 +-
 .../cache/IgniteSqlQueryOffHeapBenchmark.java   |   6 +-
 .../cache/IgniteSqlQueryPutBenchmark.java       |  18 +-
 .../IgniteSqlQueryPutOffHeapBenchmark.java      |   6 +-
 .../yardstick/cache/model/Organization.java     |  10 +-
 .../ignite/yardstick/cache/model/Person.java    |  10 +-
 .../ignite/yardstick/cache/model/Person1.java   |   7 +-
 .../ignite/yardstick/cache/model/Person2.java   |   7 +-
 .../ignite/yardstick/cache/model/Person8.java   |   7 +-
 .../ignite/yardstick/cache/model/SampleKey.java |   7 +-
 .../yardstick/cache/model/SampleValue.java      |   7 +-
 .../jdbc/IgniteJdbcStoreAbstractBenchmark.java  |  20 +-
 .../store/jdbc/IgniteJdbcStoreGetBenchmark.java |   9 +-
 .../jdbc/IgniteJdbcStoreGetTxBenchmark.java     |   9 +-
 .../store/jdbc/IgniteJdbcStorePutBenchmark.java |  10 +-
 .../jdbc/IgniteJdbcStorePutGetBenchmark.java    |  10 +-
 .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java  |  10 +-
 .../jdbc/IgniteJdbcStorePutTxBenchmark.java     |  10 +-
 .../compute/IgniteAffinityCallBenchmark.java    |  11 +-
 .../yardstick/compute/IgniteApplyBenchmark.java |  18 +-
 .../compute/IgniteBroadcastBenchmark.java       |   9 +-
 .../compute/IgniteExecuteBenchmark.java         |   9 +-
 .../yardstick/compute/IgniteRunBenchmark.java   |  18 +-
 .../yardstick/compute/model/NoopCallable.java   |  10 +-
 .../yardstick/compute/model/NoopTask.java       |  21 +-
 .../apache/ignite/yarn/ApplicationMaster.java   |  45 ++-
 .../apache/ignite/yarn/ClusterProperties.java   |  15 +-
 .../org/apache/ignite/yarn/IgniteContainer.java |   5 +-
 .../org/apache/ignite/yarn/IgniteProvider.java  |  24 +-
 .../apache/ignite/yarn/IgniteYarnClient.java    |  39 ++-
 .../ignite/yarn/utils/IgniteYarnUtils.java      |  15 +-
 .../org/apache/ignite/IgniteYarnTestSuite.java  |   6 +-
 .../yarn/IgniteApplicationMasterSelfTest.java   |  52 ++--
 .../zk/TcpDiscoveryZookeeperIpFinder.java       |  48 ++--
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |  31 +-
 4526 files changed, 56197 insertions(+), 37288 deletions(-)
----------------------------------------------------------------------



[26/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index 6aebe70..420d011 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -17,26 +17,53 @@
 
 package org.apache.ignite.internal.processors.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.util.*;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
+import org.apache.ignite.internal.processors.cache.CacheStoreBalancingWrapper;
+import org.apache.ignite.internal.processors.cache.CacheStorePartialUpdateException;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.GridSetWrapper;
+import org.apache.ignite.internal.util.lang.GridInClosure3;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Store manager.
@@ -1234,4 +1261,4 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
index 5ce42f9..468945b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
@@ -17,27 +17,38 @@
 
 package org.apache.ignite.internal.processors.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.integration.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static javax.cache.Cache.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedHashMap;
+
+import static javax.cache.Cache.Entry;
 
 /**
  * Internal wrapper for a {@link CacheStore} that enables write-behind logic.
@@ -1012,4 +1023,4 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
             return S.toString(StatefulValue.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
index 4e43d97..11cd3fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
@@ -17,19 +17,31 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction managed by cache ({@code 'Ex'} stands for external).
@@ -710,4 +722,4 @@ public interface IgniteInternalTx extends AutoCloseable, GridTimeoutObject {
      * @param topVer New topology version.
      */
     public void onRemap(AffinityTopologyVersion topVer);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
index 7d9bcf0..c0c2284 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.IgniteTransactionsEx;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionMetrics;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 
 /**
  * Grid transactions implementation.
@@ -199,4 +203,4 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
         if (!ctx.transactional())
             throw new IgniteException("Failed to start transaction on non-transactional cache: " + ctx.name());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
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 a76a46c..1ad1064 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
@@ -17,37 +17,86 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
+import org.apache.ignite.internal.processors.cache.version.GridCachePlainVersionedEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionedEntryEx;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.RELOAD;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
+import static org.apache.ignite.transactions.TransactionState.ACTIVE;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
+import static org.apache.ignite.transactions.TransactionState.MARKED_ROLLBACK;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK;
 
 /**
  * Managed transaction adapter.
@@ -2161,4 +2210,4 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter
             return S.toString(TxShadow.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 e7a11d0..3c33d19 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
@@ -17,27 +17,44 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteExternalizableExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.SKIP_STORE_FLAG_MASK;
 
 /**
  * Transaction entry. Note that it is essential that this class does not override
@@ -1021,4 +1038,4 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
         return GridToStringBuilder.toString(IgniteTxEntry.class, this, "xidVer", tx == null ? "null" : tx.xidVersion());
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 227cb34..d64b26e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -17,31 +17,69 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryFuture;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryResponse;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxRemoteAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxRemote;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFutureAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxRemote;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.USER_FINISH;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK;
 
 /**
  * Isolated logic to process cache messages.
@@ -1340,4 +1378,4 @@ public class IgniteTxHandler {
 
         fut.onResult(nodeId, res);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
index bbb7559..e346c87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Cache transaction key. This wrapper is needed because same keys may be enlisted in the same transaction
@@ -184,4 +186,4 @@ public class IgniteTxKey implements Message {
     @Override public String toString() {
         return S.toString(IgniteTxKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index a32e7b1..97e88a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -17,39 +17,102 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.CacheException;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
+import org.apache.ignite.internal.processors.cache.CacheLazyEntry;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheIndexUpdateException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.GridCacheUpdateTxResult;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.GPC;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiClosure;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.RELOAD;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_PRIMARY;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK;
+import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
 
 /**
  * Transaction adapter for cache transactions.
@@ -3722,4 +3785,4 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
          */
         abstract T finish(T t) throws IgniteCheckedException;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
index 14562ab..6f72290 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Local transaction API.
@@ -170,4 +174,4 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
         boolean deserializePortable,
         boolean skipVals,
         IgniteBiInClosure<KeyCacheObject, Object> c);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 630330e..b28225d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -17,41 +17,88 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.*;
-import static org.apache.ignite.internal.util.GridConcurrentFactory.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.managers.communication.GridIoPolicy;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedManagerAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheMappedVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxFinishSync;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryFuture;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxRemoteAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxRemote;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MAX_COMPLETED_TX_COUNT;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SLOW_TX_WARN_TIMEOUT;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_TX_SALVAGE_TIMEOUT;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.RECOVERY_FINISH;
+import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.USER_FINISH;
+import static org.apache.ignite.internal.util.GridConcurrentFactory.newMap;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionState.ACTIVE;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
+import static org.apache.ignite.transactions.TransactionState.MARKED_ROLLBACK;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
 
 /**
  * Cache transaction manager.
@@ -2166,4 +2213,4 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxMap.java
index 410e2d1..6408573 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxMap.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.apache.ignite.internal.util.GridSerializableIterator;
+import org.apache.ignite.internal.util.GridSerializableSet;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid cache transaction read or write set.
@@ -184,4 +191,4 @@ public class IgniteTxMap extends AbstractMap<IgniteTxKey, IgniteTxEntry> impleme
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         throw new IllegalStateException("Transaction view map should never be serialized: " + this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java
index 9e9e5bf..9660e4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 
 /**
  * Local transaction API.
@@ -44,4 +43,4 @@ public interface IgniteTxRemoteEx extends IgniteInternalTx {
      * @return {@code True} if entry was found.
      */
     public boolean setWriteValue(IgniteTxEntry e);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java
index 2d01693..783796b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.transactions.TransactionMetrics;
 
 /**
  * Tx metrics adapter.
@@ -116,4 +119,4 @@ public class TransactionMetricsAdapter implements TransactionMetrics, Externaliz
     @Override public String toString() {
         return S.toString(TransactionMetricsAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxy.java
index 4611081..3f40cab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxy.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.transactions.*;
+import org.apache.ignite.transactions.Transaction;
 
 /**
  * Marker interface for transaction proxy.
  */
 public interface TransactionProxy extends Transaction {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
index 9346e43..6134b9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java
@@ -17,18 +17,30 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
 
 /**
  * Cache transaction proxy.
@@ -325,4 +337,4 @@ public class TransactionProxyImpl<K, V> implements TransactionProxy, Externaliza
     @Override public String toString() {
         return S.toString(TransactionProxyImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
index 4c41e21..ab20f8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
@@ -17,16 +17,25 @@
 
 package org.apache.ignite.internal.processors.cache.transactions;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
 
 /**
  * Auxiliary class to hold value, value-has-been-set flag, value update operation, value bytes.
@@ -234,4 +243,4 @@ public class TxEntryValueHolder implements Message {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
index 1fe4c9e..0fb3ebf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Cache version conflict resolver.
@@ -37,4 +37,4 @@ public interface CacheVersionConflictResolver {
         GridCacheVersionedEntryEx<K, V> newEntry,
         boolean atomicVerComparator
     ) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
index 4f13ae7..c0eb4db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Plain versioned entry.
@@ -128,4 +128,4 @@ public class GridCachePlainVersionedEntry<K, V> implements GridCacheVersionedEnt
     @Override public String toString() {
         return S.toString(GridCachePlainVersionedEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index 86a9b1b..113ad3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Raw versioned entry.
@@ -379,4 +384,4 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen
             "valBytesLen", valBytes != null ? valBytes.length : "n/a",
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 a72c5c2..fd695f9 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
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Grid unique version.
@@ -343,4 +347,4 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
     @Override public String toString() {
         return S.toString(GridCacheVersion.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAware.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAware.java
index 0c0a270..d298a90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAware.java
@@ -27,4 +27,4 @@ public interface GridCacheVersionAware {
      * @return Cache entry version.
      */
     public GridCacheVersion version();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
index 94a611e..3849bf5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Conflict context implementation.
@@ -193,4 +195,4 @@ public class GridCacheVersionConflictContext<K, V> {
         /** Merge. */
         MERGE
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 5e848d5..6642219 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
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Extended cache version which also has additional DR version.
@@ -155,4 +158,4 @@ public class GridCacheVersionEx extends GridCacheVersion {
 
         drVer.writeExternal(out);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index ecf79c9..36f1c36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -17,18 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedManagerAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  * Makes sure that cache lock order values come in proper sequence.
@@ -281,4 +281,4 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
         else
             return last;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionable.java
index 5dde4ea..bd3ca52 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionable.java
@@ -25,4 +25,4 @@ public interface GridCacheVersionable {
      * @return Version.
      */
     public GridCacheVersion version();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
index bc79831..06e7999 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.version;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache entry along with version information.
@@ -78,4 +78,4 @@ public interface GridCacheVersionedEntry<K, V> {
      * @return Entry's global time in initiator data center
      */
     public long globalTime();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntryEx.java
index cc22eb4..8e55cf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntryEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntryEx.java
@@ -26,4 +26,4 @@ public interface GridCacheVersionedEntryEx<K, V> extends GridCacheVersionedEntry
      * @return {@code True} if entry is new.
      */
     public boolean isStartVersion();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
index b9b6132..ecbe294 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.internal.processors.cacheobject;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache objects processor.
@@ -160,4 +164,4 @@ public interface IgniteCacheObjectProcessor extends GridProcessor {
      * @return {@code True} if object is of known immutable type.
      */
     public boolean immutable(Object obj);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index e8f7781..6e7fadd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -17,22 +17,34 @@
 
 package org.apache.ignite.internal.processors.cacheobject;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMemoryMode.*;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
 
 /**
  *
@@ -380,4 +392,4 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
             return new CacheObjectByteArrayImpl(valCpy);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
index 2264c90..1e675b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.processors.clock;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Snapshot of time deltas for given topology.
@@ -228,4 +232,4 @@ public class GridClockDeltaSnapshot {
             return sum / vals.length;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
index 23bc179..110e46c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.processors.clock;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Message containing time delta map for all nodes.
@@ -143,4 +146,4 @@ public class GridClockDeltaSnapshotMessage implements Message {
     @Override public String toString() {
         return S.toString(GridClockDeltaSnapshotMessage.class, this);
     }
-}
+}
\ No newline at end of file


[05/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
index e5533ef..9ec84f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
@@ -17,19 +17,31 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
 
 /**
  * Tests runtime exception.
@@ -298,4 +310,4 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
             return true;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
index 7ce72d0..66e9cf4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVTS_DISCOVERY;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  * Starts two grids on the same vm, checks topologies of each grid and discovery
@@ -104,4 +109,4 @@ public class GridSameVmStartupSelfTest extends GridCommonAbstractTest {
 
         assert G.allGrids().isEmpty();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
index 3ec3278..7e368cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.messaging.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P2;
+import org.apache.ignite.messaging.MessagingListenActor;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test for {@link org.apache.ignite.IgniteCluster}.
@@ -172,4 +174,4 @@ public class GridSelfTest extends ClusterGroupAbstractTest {
 
         assertEquals(1, grid(0).cluster().forOthers(node1, node2, node3).nodes().size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
index 20688cb..8d5301c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
@@ -17,18 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.deployment.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.deployment.DeploymentListener;
+import org.apache.ignite.spi.deployment.DeploymentResource;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.spi.eventstorage.EventStorageSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Tests exceptions that are thrown by event storage and deployment spi.
@@ -175,4 +182,4 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
             super(msg, cause);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index 839e0ac..ce78c5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -17,20 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.apache.ignite.transactions.Transaction;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Checks basic node start/stop operations.
@@ -182,4 +183,4 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
             assert e instanceof IllegalStateException : "Wrong exception type.";
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
index bf24941..0cfd80e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import org.apache.ignite.internal.util.typedef.G;
 
 /**
  * Ignite startup.
@@ -54,4 +55,4 @@ public class GridStartupMain {
 
         G.stop(true);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
index ccd331f..a58362b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Ignite startup.
@@ -66,4 +68,4 @@ public class GridStartupTest extends GridCommonAbstractTest {
 
         G.stop(true);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithCancelSelfTest.java
index 35b3481..5cc9e9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithCancelSelfTest.java
@@ -17,16 +17,22 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Tests grid stop with jobs canceling.
@@ -119,4 +125,4 @@ public class GridStopWithCancelSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
index 03635e7..4ece66c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
@@ -17,19 +17,37 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeUserUndeclaredException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Tests waiting for unfinished tasks while stopping the grid.
@@ -260,4 +278,4 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
             return res.get(0).getData();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java
index d1a0669..7af987c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java
@@ -17,20 +17,31 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskMapAsync;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFutureCancelledException;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_CANCELLED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_JOB_REJECTED;
 
 /**
  * Test for task cancellation issue.
@@ -180,4 +191,4 @@ public class GridTaskCancelSingleNodeSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java
index 3ae94b3..8f551b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java
@@ -17,14 +17,27 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * {@link org.apache.ignite.compute.ComputeTaskContinuousMapper} test.
@@ -327,4 +340,4 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
             return argument(0);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
index 3dcc8f8..418a01e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
@@ -17,20 +17,24 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.lang.GridAbsClosureX;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Tests for {@code GridProjection.withXXX(..)} methods.
@@ -166,4 +170,4 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
             return F.first(results).getData();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
index e12ae60..31d0ffa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Task execution test.
@@ -65,4 +68,4 @@ public class GridTaskExecutionSelfTest extends GridCommonAbstractTest {
 
         info("Task result: " + fut.get());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
index 7ddd966..f1ae478 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
@@ -17,22 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
 
 /**
  *
@@ -167,4 +171,4 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java
index 28a7758..7736895 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java
@@ -17,14 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test for task failover.
@@ -113,4 +120,4 @@ public class GridTaskFailoverSelfTest extends GridCommonAbstractTest {
             return res;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
index f02899f..c0714ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
@@ -17,17 +17,27 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteState;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test for task future when grid stops.
@@ -210,4 +220,4 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
             return !Thread.currentThread().isInterrupted() ? 0 : 1;
         }
    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
index 3bdeb10..4074712 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Task instance execution test.
@@ -118,4 +125,4 @@ public class GridTaskInstanceExecutionSelfTest extends GridCommonAbstractTest {
             return super.reduce(results);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstantiationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstantiationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstantiationSelfTest.java
index a879289..b50bcb6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstantiationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstantiationSelfTest.java
@@ -17,15 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Tests instantiation of various task types (defined as private inner class, without default constructor, non-public
@@ -114,4 +120,4 @@ public class GridTaskInstantiationSelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
index 68579a3..146f562 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
@@ -17,23 +17,33 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.collision.fifoqueue.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.events.EventType.EVTS_JOB_EXECUTION;
+import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED_OVER;
+import static org.apache.ignite.events.EventType.EVT_JOB_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 
 /**
  * Test that rejected job is not failed over.
@@ -157,4 +167,4 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
index dd9cb9d..68ff069 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
@@ -17,15 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * This test checks that GridTaskListener is only called once per task.
@@ -103,4 +111,4 @@ public class GridTaskListenerSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
index 09d17bf..ecf69e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
@@ -17,18 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskMapAsync;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -138,4 +145,4 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java
index 1b1a347..b8c54e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Tests for {@link org.apache.ignite.compute.ComputeTaskName} annotation.
@@ -119,4 +125,4 @@ public class GridTaskNameAnnotationSelfTest extends GridCommonAbstractTest {
             return getClass().getClassLoader();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
index 6e25aaa..143cca8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskNoResultCache;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  *
@@ -125,4 +132,4 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
             return jobs;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
index 491bcf5..7fcd9eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
@@ -17,20 +17,32 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.ComputeTaskTimeoutException;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.PE;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT;
 
 /**
  *
@@ -220,4 +232,4 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
index 7a90e6d..9ee7402 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.UUID;
+import org.apache.ignite.GridTestIoUtils;
+import org.apache.ignite.IgniteExternalizableAbstractTest;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
 
 /**
  * Grid topic externalization test.
@@ -162,4 +162,4 @@ public class GridTopicExternalizableSelfTest extends IgniteExternalizableAbstrac
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
index bf499c3..b6109f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Update notifier test.
@@ -137,4 +138,4 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     };
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
index 2071b6e..d383ad6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER;
 
 /**
  * Tests version methods.
@@ -65,4 +65,4 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
                 System.clearProperty(IGNITE_UPDATE_NOTIFIER);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index 38522af..3a6d04f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -17,34 +17,42 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.net.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.IOException;
+import java.net.Socket;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
 
 /**
  *
@@ -361,4 +369,4 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
                 log.error(s);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
index 37773cd..a5f617d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
@@ -17,23 +17,44 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-
-import javax.cache.*;
-import javax.cache.processor.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import javax.cache.CacheException;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
 
 /**
  *
@@ -843,4 +864,4 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
----------------------------------------------------------------------
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 bb568ab..55dbb57 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
@@ -17,11 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteAtomicReference;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteCountDownLatch;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -669,4 +675,4 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr
         assertTrue(srvLatch.await(1000));
         assertTrue(clientLatch.await(1000));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 073f6f3..807027c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -17,41 +17,71 @@
 
 package org.apache.ignite.internal;
 
-import junit.framework.*;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.CacheException;
+import junit.framework.AssertionFailedError;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -1200,4 +1230,4 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
index ed811d9..f6f038d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
@@ -440,4 +444,4 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA
 
         assertEquals("1", clientQueue.poll());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
index e9667a1..a9d4b7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -189,4 +192,4 @@ public class IgniteClientReconnectComputeTest extends IgniteClientReconnectAbstr
 
         assertTrue((Boolean)fut.get(2, TimeUnit.SECONDS));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
index 2bfdc85b..dc94c96 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
@@ -17,21 +17,24 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.ContinuousQuery;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.util.typedef.P2;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.IgniteInstanceResource;
 
-import javax.cache.event.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDiscoveryStateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDiscoveryStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDiscoveryStateTest.java
index feeebe5..c071ee2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDiscoveryStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDiscoveryStateTest.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
 
 /**
  *
@@ -120,4 +124,4 @@ public class IgniteClientReconnectDiscoveryStateTest extends IgniteClientReconne
 
         assertEquals(10, cluster.nodeLocalMap().get("locMapKey"));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
index 1b6523a..f050c72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
@@ -17,21 +17,27 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
 
 /**
  *
@@ -228,4 +234,4 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl
             stop.set(true);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
index ab0e726..6b15b22 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
@@ -17,17 +17,27 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  *
@@ -224,4 +234,4 @@ public class IgniteClientReconnectFailoverTest extends IgniteClientReconnectFail
             return 1;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
index 31b4192..4db523d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.service.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.services.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteServices;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.processors.service.DummyService;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceContext;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -257,4 +262,4 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst
             return ignite.cluster().topologyVersion();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
index 98c3d0f..7a8f8fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
 
 /**
  *
@@ -103,4 +106,4 @@ public class IgniteClientReconnectStopTest extends IgniteClientReconnectAbstract
             log.info("Expected reconnect exception: " + e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
index a4cf77f..cc492e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.testframework.*;
-
-import javax.cache.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import javax.cache.CacheException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
@@ -230,4 +234,4 @@ public class IgniteClientReconnectStreamerTest extends IgniteClientReconnectAbst
 
         streamer.close();
     }
-}
+}
\ No newline at end of file


[27/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetaDataKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetaDataKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetaDataKey.java
index d2d53cd..2a98778 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetaDataKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetaDataKey.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.portable;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Key for portable meta data.
@@ -77,4 +79,4 @@ class PortableMetaDataKey extends GridCacheUtilityKey<PortableMetaDataKey> imple
     @Override public String toString() {
         return S.toString(PortableMetaDataKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
index 2d2db1b..5f9dc61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.Query;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
+import org.apache.ignite.cache.query.annotations.QueryTextField;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Main API for configuring and executing cache queries.
@@ -285,4 +289,4 @@ public interface CacheQuery<T> {
      * Resets metrics for this query.
      */
     public void resetMetrics();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
index fe2fb8e..d6c56e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.lang.*;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Special version of bi-predicate for cache scan queries with close callback.
@@ -27,4 +27,4 @@ public interface CacheQueryCloseableScanBiPredicate<K, V> extends IgniteBiPredic
      * Callback invoked when predicate is not longer needed.
      */
     public void onClose();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryFuture.java
index b81f2e2..bb342b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryFuture.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache query future returned by query execution.
@@ -63,4 +62,4 @@ public interface CacheQueryFuture<T> extends IgniteInternalFuture<Collection<T>>
      * @throws IgniteCheckedException {@inheritDoc}
      */
     @Override public boolean cancel() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryType.java
index fa0f3df..bb8bc33 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryType.java
@@ -44,4 +44,4 @@ public enum CacheQueryType {
 
     /** SPI query. */
     SPI
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
index 7ad8994..e62ee75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.future.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.jetbrains.annotations.Nullable;
 
 /**
 * Distributed fields query future.
@@ -94,4 +96,4 @@ public class GridCacheDistributedFieldsQueryFuture
     @Override boolean fields() {
         return true;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
index 9fe316c..32a4599 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
@@ -17,15 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Distributed query future.
@@ -248,4 +253,4 @@ public class GridCacheDistributedQueryFuture<K, V, R> extends GridCacheQueryFutu
 
         qryMgr.removeQueryFuture(reqId);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 316713f..d1fdfcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -17,26 +17,42 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedSet;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_CACHE;
 
 /**
  * Distributed query manager.
@@ -804,4 +820,4 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
             return S.toString(CancelMessageId.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
index e6d545a..deea867 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.future.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.jetbrains.annotations.Nullable;
 
 /**
 * Local fields query future.
@@ -74,4 +75,4 @@ public class GridCacheLocalFieldsQueryFuture
     @Override boolean fields() {
         return true;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
index 66db0f7..91fc194 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.marshaller.Marshaller;
 
 /**
  * Local query future.
@@ -127,4 +127,4 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap
             );
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java
index 9e1af79..4e72f97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.jetbrains.annotations.*;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
 
 /**
  * Local query manager.
@@ -141,4 +142,4 @@ public class GridCacheLocalQueryManager<K, V> extends GridCacheQueryManager<K, V
         throw new IgniteException("Distributed queries are not available for local cache " +
             "(use 'CacheQuery.execute(grid.forLocal())' instead) [cacheName=" + cctx.name() + ']');
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 90f9b9e..a016037 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -17,28 +17,47 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.Query;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnreservedPartitionException;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SCAN;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SET;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SPI;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL_FIELDS;
 
 /**
  * Query adapter.
@@ -681,4 +700,4 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
             return fut.next();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryBean.java
index 47dc942..5a4d693 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryBean.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Query execution bean.
@@ -87,4 +88,4 @@ public class GridCacheQueryBean {
     @Override public String toString() {
         return S.toString(GridCacheQueryBean.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
index 15eb368..fd8c4d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Error future.
@@ -47,4 +46,4 @@ public class GridCacheQueryErrorFuture<T> extends GridFinishedFuture<Collection<
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
index ed5ad77..9a83ce9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
@@ -17,19 +17,34 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Query future adapter.
@@ -564,4 +579,4 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda
         X.println(">>>  keysSize: " + keys.size());
         X.println(">>>  cnt: " + cnt);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java
index c81e854..8d2e67d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Query information (local or distributed).
@@ -167,4 +167,4 @@ class GridCacheQueryInfo {
     @Override public String toString() {
         return S.toString(GridCacheQueryInfo.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index bfe5ecc..4206230 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -17,45 +17,114 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.indexing.*;
-
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridClosureCallMode.*;
-import static org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
-import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.sql.SQLException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.CacheQueryExecutedEvent;
+import org.apache.ignite.events.CacheQueryReadEvent;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheMetricsImpl;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CachePeekModes;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheOffheapSwapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheSwapEntryImpl;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnreservedPartitionException;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.datastructures.GridCacheSetItemKey;
+import org.apache.ignite.internal.processors.datastructures.GridSetQueryPredicate;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.processors.query.GridQueryFieldsResult;
+import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
+import org.apache.ignite.internal.processors.query.GridQueryIndexType;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.GridEmptyCloseableIterator;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.GridSpiCloseableIteratorWrapper;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridIterator;
+import org.apache.ignite.internal.util.lang.GridIteratorAdapter;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
+import org.apache.ignite.spi.indexing.IndexingQueryFilter;
+import org.apache.ignite.spi.indexing.IndexingSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_OBJECT_READ;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
+import static org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.NONE;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SCAN;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SPI;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL_FIELDS;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.TEXT;
 
 /**
  * Query and index manager.
@@ -3051,4 +3120,4 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
             incMeta,
             keepPortable);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetadataAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetadataAware.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetadataAware.java
index e47f845..f5943a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetadataAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetadataAware.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.query.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
 
 /**
  * Metadata-aware interface.
@@ -30,4 +29,4 @@ public interface GridCacheQueryMetadataAware {
      * @return Future to retrieve metadata.
      */
     public IgniteInternalFuture<List<GridQueryFieldMetadata>> metadata();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
index 7dca343..fe219a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Adapter for {@link QueryMetrics}.
@@ -147,4 +149,4 @@ public class GridCacheQueryMetricsAdapter implements QueryMetrics, Externalizabl
     @Override public String toString() {
         return S.toString(GridCacheQueryMetricsAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsKey.java
index ebbf039..75ba5e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsKey.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Immutable query metrics key used to group metrics.
@@ -114,4 +116,4 @@ class GridCacheQueryMetricsKey implements Externalizable {
         cls = (Class<?>)in.readObject();
         clause = U.readString(in);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 76ddebd..c21ac66 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
@@ -17,22 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SCAN;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SET;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SPI;
 
 /**
  * Query request.
@@ -749,4 +756,4 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
     @Override public String toString() {
         return S.toString(GridCacheQueryRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
index 95f7dfa..3e4cdeb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Query request.
@@ -335,4 +341,4 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach
     @Override public String toString() {
         return S.toString(GridCacheQueryResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
index 2529172..2c1a4f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.util.tostring.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Map;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 
 /**
  * Class to store query results returned by remote nodes. It's required to fully
@@ -111,4 +113,4 @@ public class GridCacheQueryResponseEntry<K, V> implements Map.Entry<K, V>, Exter
     @Override public String toString() {
         return "[" + key + "=" + val + "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java
index 5805725..7e6d30e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines different cache query types. For more information on cache query types
@@ -67,4 +67,4 @@ public enum GridCacheQueryType {
     @Nullable public static GridCacheQueryType fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
index c9ab0e4..6b3ed68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.Collection;
 
 /**
  * Ignite index descriptor.
@@ -56,4 +56,4 @@ public interface GridCacheSqlIndexMetadata extends Externalizable {
      * @return {@code True} if index is unique, {@code false} otherwise.
      */
     public boolean unique();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
index 7f25490..dae034c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.spi.indexing.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.spi.indexing.IndexingSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Metadata for Ignite cache.
@@ -86,4 +86,4 @@ public interface GridCacheSqlMetadata extends Externalizable {
      * @see GridCacheSqlIndexMetadata
      */
     public Collection<GridCacheSqlIndexMetadata> indexes(String type);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index c0db018..be7bbe9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.LinkedHashMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Query.
@@ -220,4 +222,4 @@ public class GridCacheSqlQuery implements Message {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index 83a79e3..4b5fe22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Two step map-reduce style query.
@@ -125,4 +126,4 @@ public class GridCacheTwoStepQuery {
     @Override public String toString() {
         return S.toString(GridCacheTwoStepQuery.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryCursorEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryCursorEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryCursorEx.java
index 5e19b99..95c4195 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryCursorEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryCursorEx.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
 
 /**
  * Extended query cursor interface allowing for "getAll" to output data into destination other than Collection.
@@ -51,4 +50,4 @@ public interface QueryCursorEx<T> extends QueryCursor<T> {
          */
         public void consume(T val) throws IgniteCheckedException;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index 02ec7ac..a4b35eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache.query.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.event.*;
-import java.nio.*;
+import java.nio.ByteBuffer;
+import javax.cache.event.EventType;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Continuous query entry.
@@ -291,4 +296,4 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
     @Override public String toString() {
         return S.toString(CacheContinuousQueryEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
index 4a0d6f7..7417138 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.query.continuous;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.*;
-import javax.cache.event.*;
+import javax.cache.Cache;
+import javax.cache.event.CacheEntryEvent;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Continuous query event.
@@ -95,4 +95,4 @@ class CacheContinuousQueryEvent<K, V> extends CacheEntryEvent<K, V> {
             "newVal", getValue(),
             "oldVal", getOldValue());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
index de7953a..c17433c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.cache.query.continuous;
 
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
 
 /**
  * Extended continuous query filter.
@@ -28,4 +28,4 @@ public interface CacheContinuousQueryFilterEx<K, V> extends CacheEntryEventSeria
      * Callback for query unregister event.
      */
     public void onQueryUnregister();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 879c30c..be3cdbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -17,26 +17,41 @@
 
 package org.apache.ignite.internal.processors.cache.query.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.event.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.UUID;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryUpdatedListener;
 import javax.cache.event.EventType;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.CacheQueryExecutedEvent;
+import org.apache.ignite.events.CacheQueryReadEvent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
+import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_OBJECT_READ;
 
 /**
  * Continuous query handler.
@@ -533,4 +548,4 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
             depInfo = (GridDeploymentInfo)in.readObject();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
index a21213f..a3c19a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java
@@ -49,4 +49,4 @@ interface CacheContinuousQueryListener<K, V> {
      * @return Whether to notify on existing entries.
      */
     public boolean notifyExisting();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
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 6277c5d..da02b97 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
@@ -17,29 +17,54 @@
 
 package org.apache.ignite.internal.processors.cache.query.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.resources.*;
-import org.jsr166.*;
-
-import javax.cache.configuration.*;
-import javax.cache.event.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static javax.cache.event.EventType.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.cache.configuration.CacheEntryListenerConfiguration;
+import javax.cache.event.CacheEntryCreatedListener;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryEventFilter;
+import javax.cache.event.CacheEntryExpiredListener;
+import javax.cache.event.CacheEntryListener;
+import javax.cache.event.CacheEntryRemovedListener;
+import javax.cache.event.CacheEntryUpdatedListener;
+import javax.cache.event.EventType;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cache.query.ContinuousQuery;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.resources.LoggerResource;
+import org.jsr166.ConcurrentHashMap8;
+
+import static javax.cache.event.EventType.CREATED;
+import static javax.cache.event.EventType.EXPIRED;
+import static javax.cache.event.EventType.REMOVED;
+import static javax.cache.event.EventType.UPDATED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_OBJECT_READ;
+import static org.apache.ignite.internal.GridTopic.TOPIC_CACHE;
 
 /**
  * Continuous queries manager.
@@ -786,4 +811,4 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 6111acd..a8b2da4 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
@@ -17,22 +17,34 @@
 
 package org.apache.ignite.internal.processors.cache.query.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata;
+import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task that gets metadata for JDBC adapter.
@@ -170,4 +182,4 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
             return packet;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 144480f..5c60762 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
@@ -17,28 +17,46 @@
 
 package org.apache.ignite.internal.processors.cache.query.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
-
-import java.math.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.typedef.CAX;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Task for JDBC adapter.
@@ -386,4 +404,4 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
             return iter;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
index 7d01682..717c82c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.query.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task to validate connection. Checks that cache with provided name exists in grid.
@@ -59,4 +62,4 @@ public class GridCacheQueryJdbcValidationTask extends ComputeTaskSplitAdapter<St
     @Override public Boolean reduce(List<ComputeJobResult> results) {
         return F.first(results).getData();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheLocalStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheLocalStore.java
index 928abdc..ace7f95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheLocalStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheLocalStore.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.store;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotation for local {@link org.apache.ignite.cache.store.CacheStore} implementation. "Local" here means that there is no global
@@ -28,4 +32,4 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE})
 public @interface CacheLocalStore {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
index f11df41..6f73ad4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.store;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.marshaller.portable.*;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Default store manager implementation.
@@ -56,4 +56,4 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter {
     @Override protected boolean convertPortable() {
         return !(cfg.isKeepPortableInStore() && ctx.config().getMarshaller() instanceof PortableMarshaller);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
index a14df6c..f5fc473 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.internal.processors.cache.GridCacheManager;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.lang.GridInClosure3;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache store manager interface.
@@ -184,4 +186,4 @@ public interface CacheStoreManager<K, V> extends GridCacheManager<K, V> {
      * @throws IgniteCheckedException If failed.
      */
     public void forceFlush() throws IgniteCheckedException;
-}
+}
\ No newline at end of file


[38/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java
index 1840786..92bbb93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.client.util;
 
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  * Wrapper around concurrent map.
@@ -110,4 +113,4 @@ public class GridConcurrentHashSet<E> extends AbstractSet<E> {
     @Override public String toString() {
         return map.keySet().toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 6f79267..9039ed8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -17,22 +17,48 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.executor.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteEvents;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.IgniteServices;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteComputeImpl;
+import org.apache.ignite.internal.IgniteEventsImpl;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgniteMessagingImpl;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.IgniteServicesImpl;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.executor.GridExecutorService;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
 
 /**
  *
@@ -1028,4 +1054,4 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
                 "', p='" + p.getClass().getName() + "']";
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java
index 4601273..636a6ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception defines illegal call on empty projection. Thrown by projection when operation
@@ -52,4 +52,4 @@ public class ClusterGroupEmptyCheckedException extends ClusterTopologyCheckedExc
     public ClusterGroupEmptyCheckedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
index fcd8611..59da7cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java
@@ -17,11 +17,9 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Internal projection interface.
@@ -43,4 +41,4 @@ public interface ClusterGroupEx extends ClusterGroup {
      * @return Cluster group.
      */
     public ClusterGroup forCacheNodes(@Nullable String cacheName, boolean affNodes, boolean nearNodes, boolean clientNodes);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
index 4abf1f8..4890231 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
@@ -17,13 +17,19 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Implementation for node-local storage.
@@ -98,4 +104,3 @@ public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> impl
         return S.toString(ClusterNodeLocalMapImpl.class, this);
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
index 39301b3..4e9190b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterStartNodeResult;
 
 /**
  * Implementation for cluster start node result. 
@@ -84,4 +84,4 @@ public class ClusterStartNodeResultImpl implements ClusterStartNodeResult {
     public void setError(String error) {
         this.error = error;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java
index 2d7b0de..9e4bab4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception is used to indicate error with grid topology (e.g., crashed node, etc.).
@@ -64,4 +64,4 @@ public class ClusterTopologyCheckedException extends IgniteCheckedException {
     public void retryReadyFuture(IgniteInternalFuture<?> readyFut) {
         this.readyFut = readyFut;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java
index 1812112..3b300b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java
@@ -37,4 +37,4 @@ public class ClusterTopologyServerNotFoundException extends ClusterTopologyCheck
     public ClusterTopologyServerNotFoundException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
index 51cf523..fb9b190 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -17,16 +17,28 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterStartNodeResult;
+import org.apache.ignite.internal.AsyncSupportAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -309,4 +321,4 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
     protected Object readResolve() throws ObjectStreamException {
         return cluster.withAsync();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java
index 4c06031..87b5d9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCluster;
 
 /**
  *
  */
 public interface IgniteClusterEx extends IgniteCluster, ClusterGroupEx {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index 0287ca7..98d8c5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -17,26 +17,54 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.nodestart.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.*;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterStartNodeResult;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteComponentType;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.nodestart.IgniteRemoteStartSpecification;
+import org.apache.ignite.internal.util.nodestart.IgniteSshHelper;
+import org.apache.ignite.internal.util.nodestart.StartNodeCallable;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
+import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.parseFile;
+import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.specifications;
 
 /**
  *
@@ -538,4 +566,4 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
     public String toString() {
         return "IgniteCluster [igniteName=" + ctx.gridName() + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java
index bd81bc3..ca7487d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
 
 /**
  * Special kill task that never fails over jobs.
@@ -100,4 +104,4 @@ class IgniteKillTask extends ComputeTaskAdapter<Boolean, Void> {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java
index f12e671..7a2b437 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.compute;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception indicates that grid task was cancelled.
@@ -55,4 +55,4 @@ public class ComputeTaskCancelledCheckedException extends IgniteCheckedException
     public ComputeTaskCancelledCheckedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java
index 6635640..aad2add 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.compute;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception indicates that task execution timed out. It is thrown from
@@ -58,4 +58,4 @@ public class ComputeTaskTimeoutCheckedException extends IgniteCheckedException {
     public ComputeTaskTimeoutCheckedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
index 02b6be9..cf56430 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
@@ -17,16 +17,26 @@
 
 package org.apache.ignite.internal.direct;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import sun.misc.*;
-import sun.nio.ch.*;
-
-import java.lang.reflect.*;
-import java.nio.*;
-import java.util.*;
+import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import sun.misc.Unsafe;
+import sun.nio.ch.DirectBuffer;
 
 /**
  * Portable stream based on {@link ByteBuffer}.
@@ -1486,4 +1496,4 @@ public class DirectByteBufferStream {
          */
         public T create(int len);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
index 91fb43f..7eaab76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.internal.direct;
 
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message reader implementation.
@@ -292,4 +298,4 @@ public class DirectMessageReader implements MessageReader {
     @Override public void incrementState() {
         state++;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index 593f34f..ea0f37e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.internal.direct;
 
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message writer implementation.
@@ -256,4 +260,4 @@ public class DirectMessageWriter implements MessageWriter {
     @Override public void reset() {
         state.reset();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
index f9ab9af..7b4cd9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.direct;
 
-import java.util.*;
+import java.util.Arrays;
 
 /**
  * Writer state.
@@ -120,4 +120,4 @@ public class DirectMessageWriterState {
 
         stack[0] = INIT_VAL;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
index 779b54d..b3c6a2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.events;
 
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Custom event.
@@ -84,4 +85,4 @@ public class DiscoveryCustomEvent extends DiscoveryEvent {
     @Override public String toString() {
         return S.toString(DiscoveryCustomEvent.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
index e1ce58d..860504f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
@@ -17,19 +17,38 @@
 
 package org.apache.ignite.internal.executor;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.GridClosureCallMode.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
 
 /**
  * An {@link ExecutorService} that executes each submitted task in grid
@@ -714,4 +733,4 @@ public class GridExecutorService implements ExecutorService, Externalizable {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
index de9bd68..ce7107d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
@@ -17,17 +17,35 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.igfs.IgfsCorruptedFileException;
+import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException;
+import org.apache.ignite.igfs.IgfsException;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsInvalidHdfsVersionException;
+import org.apache.ignite.igfs.IgfsParentNotDirectoryException;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathAlreadyExistsException;
+import org.apache.ignite.igfs.IgfsPathNotFoundException;
+import org.apache.ignite.igfs.IgfsPathSummary;
+import org.apache.ignite.internal.processors.igfs.IgfsBlockLocationImpl;
+import org.apache.ignite.internal.processors.igfs.IgfsFileImpl;
+import org.apache.ignite.internal.processors.igfs.IgfsHandshakeResponse;
+import org.apache.ignite.internal.processors.igfs.IgfsInputStreamDescriptor;
+import org.apache.ignite.internal.processors.igfs.IgfsStatus;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.CONTROL_RESPONSE;
 
 /**
  * IGFS path command response.
@@ -630,4 +648,4 @@ public class IgfsControlResponse extends IgfsMessage {
     @Override public String toString() {
         return S.toString(IgfsControlResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java
index bfd0c71..9542b35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInput;
 
 /**
  * Data input stream implementing object input but throwing exceptions on object methods.
@@ -37,4 +40,4 @@ public class IgfsDataInputStream extends DataInputStream implements ObjectInput
     @Override public Object readObject() throws ClassNotFoundException, IOException {
         throw new IOException("This method must not be invoked on IGFS data input stream.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java
index deb6ac3..0431892 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import java.io.*;
+import java.io.DataOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
 
 /**
  * Data output stream implementing ObjectOutput but throwing exceptions on methods working with objects.
@@ -40,4 +44,4 @@ public class IgfsDataOutputStream extends DataOutputStream implements ObjectOutp
     @Override public void writeObject(Object obj) throws IOException {
         throw new IOException("This method must not be invoked on IGFS data output stream.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
index ec8ef6e..21da5b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.HANDSHAKE;
 
 /**
  * Handshake request.
@@ -90,4 +90,4 @@ public class IgfsHandshakeRequest extends IgfsMessage {
     @Override public String toString() {
         return S.toString(IgfsHandshakeRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
index f92d9cc..e39319b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Grid file system commands to call remotely.
@@ -95,4 +96,4 @@ public enum IgfsIpcCommand {
     public static IgfsIpcCommand valueOf(int ordinal) {
         return ALL.get(ordinal);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
index defbbbc..4a0d99b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
@@ -17,16 +17,28 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
 
 /**
  * IGFS client logger writing data to the file.
@@ -766,4 +778,4 @@ public final class IgfsLogger {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
index 6a6f22a..1dba21c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
@@ -17,15 +17,21 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.AFFINITY;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_CREATE;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_READ;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.READ_BLOCK;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.SET_TIMES;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.WRITE_BLOCK;
 
 /**
  * Implementation of IGFS client message marshaller.
@@ -342,4 +348,4 @@ public class IgfsMarshaller {
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
index 54c8d5b..c94d394 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
@@ -38,4 +38,4 @@ public abstract class IgfsMessage {
     public void command(IgfsIpcCommand cmd) {
         this.cmd = cmd;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java
index 2f6e6e5..8f5d234 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.processors.igfs.IgfsUtils;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Single path command message. This is a plain bean.
@@ -257,4 +256,4 @@ public class IgfsPathControlRequest extends IgfsMessage {
     public final void userName(String userName) {
         this.userName = IgfsUtils.fixUserName(userName);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
index 0f632f6..a1cc3c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*;
+import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.STATUS;
 
 /**
  * IGFS status (total/used/free space) request.
@@ -32,4 +32,4 @@ public class IgfsStatusRequest extends IgfsMessage {
     @Override public void command(IgfsIpcCommand cmd) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java
index df848a3..0f43924 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.igfs.common;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Read block request.
@@ -98,4 +98,4 @@ public class IgfsStreamControlRequest extends IgfsMessage {
         return S.toString(IgfsStreamControlRequest.class, this, "cmd", command(),
             "dataLen", data == null ? 0 : data.length);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
index 6e73b1f..0116ace 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
@@ -17,15 +17,42 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import org.apache.ignite.internal.client.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.sql.ResultSet.*;
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteJdbcDriver.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.Executor;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientDisconnectedException;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientFutureTimeoutException;
+
+import static java.sql.ResultSet.CONCUR_READ_ONLY;
+import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
+import static java.sql.ResultSet.TYPE_FORWARD_ONLY;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.IgniteJdbcDriver.PROP_CACHE;
+import static org.apache.ignite.IgniteJdbcDriver.PROP_HOST;
+import static org.apache.ignite.IgniteJdbcDriver.PROP_NODE_ID;
+import static org.apache.ignite.IgniteJdbcDriver.PROP_PORT;
 
 /**
  * JDBC connection implementation.
@@ -544,4 +571,4 @@ public class JdbcConnection implements Connection {
     JdbcStatement createStatement0() throws SQLException {
         return (JdbcStatement)createStatement();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java
index 33d82ec..36fa0aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java
@@ -88,4 +88,4 @@ public class JdbcConnectionInfo {
     public void cacheName(String cacheName) {
         this.cacheName = cacheName;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
index d13fe04..df26412 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
@@ -17,15 +17,25 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.sql.*;
-import java.util.*;
-
-import static java.sql.Connection.*;
-import static java.sql.ResultSet.*;
-import static java.sql.RowIdLifetime.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.RowIdLifetime;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static java.sql.Connection.TRANSACTION_NONE;
+import static java.sql.ResultSet.CONCUR_READ_ONLY;
+import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
+import static java.sql.RowIdLifetime.ROWID_UNSUPPORTED;
 
 /**
  * JDBC database metadata implementation.
@@ -1310,4 +1320,4 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
         return str != null && (ptrn == null ||
             str.toUpperCase().matches(ptrn.toUpperCase().replace("%", ".*").replace("_", ".")));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java
index 8403d5a..6dfaa18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java
@@ -17,12 +17,27 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import java.io.*;
-import java.math.*;
-import java.net.*;
-import java.sql.*;
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.Date;
-import java.util.*;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
 
 /**
  * JDBC prepared statement implementation.
@@ -408,4 +423,4 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
 
         args[paramIdx - 1] = val;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java
index ba09e1d..1566006 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java
@@ -17,15 +17,35 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.math.*;
-import java.net.*;
-import java.sql.*;
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.Date;
-import java.util.*;
+import java.sql.NClob;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * JDBC result set implementation.
@@ -1516,4 +1536,4 @@ public class JdbcResultSet implements ResultSet {
         if (curr == null)
             throw new SQLException("Result set is not positioned on a row.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java
index 32da631..afe1d28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.List;
 
 /**
  * JDBC result set metadata implementation.
@@ -167,4 +168,4 @@ public class JdbcResultSetMetadata implements ResultSetMetaData {
     @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface == ResultSetMetaData.class;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java
index 6637bf5..caa8495 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java
@@ -17,13 +17,22 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.sql.*;
-import java.util.*;
-
-import static java.sql.ResultSet.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static java.sql.ResultSet.CONCUR_READ_ONLY;
+import static java.sql.ResultSet.FETCH_FORWARD;
+import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
+import static java.sql.ResultSet.TYPE_FORWARD_ONLY;
 
 /**
  * JDBC statement implementation.
@@ -445,4 +454,4 @@ public class JdbcStatement implements Statement {
         if (closed)
             throw new SQLException("Statement is closed.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
index 19575b2..46e3cfa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java
@@ -17,16 +17,33 @@
 
 package org.apache.ignite.internal.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
-
-import static java.sql.Types.*;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+
+import static java.sql.Types.BIGINT;
+import static java.sql.Types.BINARY;
+import static java.sql.Types.BOOLEAN;
+import static java.sql.Types.DATE;
+import static java.sql.Types.DOUBLE;
+import static java.sql.Types.FLOAT;
+import static java.sql.Types.INTEGER;
+import static java.sql.Types.OTHER;
+import static java.sql.Types.SMALLINT;
+import static java.sql.Types.TIME;
+import static java.sql.Types.TIMESTAMP;
+import static java.sql.Types.TINYINT;
+import static java.sql.Types.VARCHAR;
 
 /**
  * Utility methods for JDBC driver.
@@ -229,4 +246,4 @@ class JdbcUtils {
             float.class.getName().equals(cls) ||
             double.class.getName().equals(cls));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
index a71a6b8..ff99919 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.managers;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 
 /**
  * This interface defines life-cycle for kernal manager. Managers provide layer of indirection
@@ -41,4 +41,4 @@ public interface GridManager extends GridComponent {
      * This method executed after manager started SPI.
      */
     public void onAfterSpiStart();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 298ff24..1fd5bff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -17,30 +17,49 @@
 
 package org.apache.ignite.internal.managers;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.*;
-
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
-
-import static java.util.Arrays.*;
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.expiry.TouchedExpiryPolicy;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.timeout.GridSpiTimeoutObject;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.apache.ignite.spi.IgnitePortProtocol;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.spi.IgniteSpiTimeoutObject;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.Arrays.asList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
 
 /**
  * Convenience adapter for grid managers.
@@ -607,4 +626,4 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
     @Override public final String toString() {
         return S.toString(GridManagerAdapter.class, this, "name", getClass().getName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
index ce2a36c..ac7c99a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
@@ -17,31 +17,44 @@
 
 package org.apache.ignite.internal.managers.checkpoint;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeTaskSessionScope;
+import org.apache.ignite.events.CheckpointEvent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.GridTaskSessionInternal;
+import org.apache.ignite.internal.SkipDaemon;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.communication.GridIoPolicy;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_LOADED;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_REMOVED;
+import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_SAVED;
+import static org.apache.ignite.internal.GridTopic.TOPIC_CHECKPOINT;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q;
 
 /**
  * This class defines a checkpoint manager.
@@ -480,4 +493,4 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
index fdc3ee6..86d2d6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.managers.checkpoint;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * This class defines checkpoint request.
@@ -169,4 +170,4 @@ public class GridCheckpointRequest implements Message {
     @Override public String toString() {
         return S.toString(GridCheckpointRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java
index 93f651e..f10490a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.managers.collision;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.job.*;
-import org.apache.ignite.spi.collision.*;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.internal.GridJobSessionImpl;
+import org.apache.ignite.internal.processors.job.GridJobWorker;
+import org.apache.ignite.spi.collision.CollisionJobContext;
 
 /**
  * Adapter for {@link org.apache.ignite.spi.collision.CollisionJobContext}.
@@ -59,4 +60,4 @@ public abstract class GridCollisionJobContextAdapter implements CollisionJobCont
     @Override public ComputeJob getJob() {
         return jobWorker.getJob();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
index 9eca079..40901b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.managers.collision;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.collision.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.SkipDaemon;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines a collision manager.
@@ -128,4 +131,4 @@ public class GridCollisionManager extends GridManagerAdapter<CollisionSpi> {
             });
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java
index 5246108..8e44db9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * Node disconnect listener interface.
@@ -31,4 +31,4 @@ public interface GridDisconnectListener {
      * @param nodeId Node ID for which connection was closed.
      */
     public void onNodeDisconnected(UUID nodeId);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
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 6698f4f..aa73296 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
@@ -17,42 +17,86 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.direct.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.util.nio.GridNioBackPressureControl.*;
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTopic;
+import org.apache.ignite.internal.IgniteComponentType;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.direct.DirectMessageReader;
+import org.apache.ignite.internal.direct.DirectMessageWriter;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.IoPool;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.CommunicationListener;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.thread.IgniteThreadPoolExecutor;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_COMM_USER;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.AFFINITY_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MANAGEMENT_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MARSH_CACHE_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.P2P_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.isReservedGridIoPolicy;
+import static org.apache.ignite.internal.util.nio.GridNioBackPressureControl.threadProcessingMessage;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q_OPTIMIZED_RMV;
 
 /**
  * Grid communication manager.
@@ -2386,4 +2430,4 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             return S.toString(DelayedMessage.class, this, super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
index 844b62b..c83a281 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Wrapper for all grid messages.
@@ -319,4 +320,4 @@ public class GridIoMessage implements Message {
     @Override public String toString() {
         return S.toString(GridIoMessage.class, this);
     }
-}
+}
\ No newline at end of file


[35/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 8378553..0e74bcd 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
@@ -17,13 +17,18 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Object wrapper containing serialized byte array of original object and deployment information.
@@ -151,4 +156,4 @@ class GridAffinityMessage implements Externalizable {
     @Override public String toString() {
         return S.toString(GridAffinityMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index aac63c8..996edd7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -17,33 +17,57 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridClosureCallMode.*;
-import static org.apache.ignite.internal.processors.affinity.GridAffinityUtils.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
+import static org.apache.ignite.internal.processors.affinity.GridAffinityUtils.affinityJob;
+import static org.apache.ignite.internal.processors.affinity.GridAffinityUtils.unmarshall;
 
 /**
  * Data affinity processor.
@@ -876,4 +900,4 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
             return ctx.discovery().topologyVersion();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
index 91cb567..10bfa72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
@@ -17,21 +17,30 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity utility methods.
@@ -187,4 +196,4 @@ class GridAffinityUtils {
             topVer = (AffinityTopologyVersion)in.readObject();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
index 97494e8..4706996 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Exception thrown when atomic operation timeout occurs.
@@ -44,4 +44,4 @@ public class CacheAtomicUpdateTimeoutCheckedException extends IgniteCheckedExcep
     public CacheAtomicUpdateTimeoutCheckedException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index 3ef2889..71c684a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-
-import javax.cache.*;
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import javax.cache.Cache;
+import org.apache.ignite.cache.CacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 
 /**
  *
@@ -104,4 +106,4 @@ public class CacheEntryImpl<K, V> implements Cache.Entry<K, V>, Externalizable {
     public String toString() {
         return "Entry [key=" + key + ", val=" + val + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
index eabd2af..36d27ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Map;
+import javax.cache.Cache;
+import org.apache.ignite.cache.CacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionAware;
 
 /**
  *
@@ -62,4 +61,4 @@ public class CacheEntryImpl0<K, V> implements Cache.Entry<K, V> {
     public String toString() {
         return "CacheEntry [key=" + getKey() + ", val=" + getValue() + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index f674ba5..f3e6c18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.cache.CacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 
 /**
  *
@@ -80,4 +81,4 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
         return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ", topVer=" + ver.topologyVersion() +
             ", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ", updateTime=" + ver.globalTime() + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
index e346ec2..55bc2a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -108,4 +111,4 @@ public class CacheEntryInfoCollection implements Message {
     @Override public byte fieldsCount() {
         return 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
index 53e5ce3..61cbb9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  *
@@ -42,4 +42,4 @@ public interface CacheEntryPredicate extends IgnitePredicate<GridCacheEntryEx>,
      * @param locked Entry locked
      */
     public void entryLocked(boolean locked);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
index 6253fcf..10e4787 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -93,4 +94,4 @@ public abstract class CacheEntryPredicateAdapter implements CacheEntryPredicate
             throw new IgniteException(e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
index 03ff850..e89fff4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -135,4 +136,4 @@ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter
     @Override public String toString() {
         return S.toString(CacheEntryPredicateContainsValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
index 210cc70..cac0435 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
@@ -28,4 +28,4 @@ public class CacheEntryPredicateHasValue extends CacheEntryPredicateAdapter {
     @Override public boolean apply(GridCacheEntryEx e) {
         return peekVisibleValue(e) != null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
index 4c8917f..2790170 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
@@ -28,4 +28,4 @@ public class CacheEntryPredicateNoValue extends CacheEntryPredicateAdapter {
     @Override public boolean apply(GridCacheEntryEx e) {
         return peekVisibleValue(e) == null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
index 23ec70a..a243c4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -149,4 +149,4 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate {
     @Override public byte fieldsCount() {
         return 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
index cd038b1..7cea4f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Entry wrapper that never obscures obsolete entries from user.
@@ -230,4 +231,4 @@ public class CacheEvictableEntryImpl<K, V> implements EvictableEntry<K, V> {
     @Override public String toString() {
         return S.toString(CacheEvictableEntryImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
index 434a241..7bfdcb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -179,4 +180,4 @@ public class CacheEvictionEntry implements Message {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
index 7b3a998e..bee1427 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.nio.*;
+import java.nio.ByteBuffer;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -210,4 +212,4 @@ public class CacheInvokeDirectResult implements Message {
     @Override public String toString() {
         return S.toString(CacheInvokeDirectResult.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
index 711b598..f87dadd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.cache.CacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implementation of {@link MutableEntry} passed to the {@link EntryProcessor#process(MutableEntry, Object...)}.
@@ -149,4 +149,4 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
         /** */
         REMOVE
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 21dad67..8d6d905 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
@@ -17,11 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.processor.*;
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Implementation of {@link EntryProcessorResult}.
@@ -105,4 +110,4 @@ public class CacheInvokeResult<T> implements EntryProcessorResult<T>, Externaliz
     @Override public String toString() {
         return S.toString(CacheInvokeResult.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIteratorConverter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIteratorConverter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIteratorConverter.java
index 9df9849..38b755c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIteratorConverter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIteratorConverter.java
@@ -36,4 +36,4 @@ public abstract class CacheIteratorConverter <T, V> {
      * @param item Item to remove.
      */
     protected abstract void remove(T item);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
index d0f0d4f..1301f1a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -130,4 +130,4 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
     public String toString() {
         return S.toString(CacheLazyEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
index 718cba4..2e8dc9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.NotNull;
 
 /**
  *
@@ -201,4 +202,4 @@ class CacheLockImpl<K, V> implements Lock {
     @Override public String toString() {
         return S.toString(CacheLockImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 74ba100..1554e07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -17,16 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.*;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Adapter for cache metrics.
@@ -908,4 +905,4 @@ public class CacheMetricsImpl implements CacheMetrics {
     @Override public String toString() {
         return S.toString(CacheMetricsImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java
index 966027a..822240e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.mxbean.CacheMetricsMXBean;
 
 /**
  * Management bean that provides access to {@link IgniteCache IgniteCache}.
@@ -407,4 +407,4 @@ class CacheMetricsMXBeanImpl implements CacheMetricsMXBean {
     @Override public boolean isWriteThrough() {
         return cache.metrics0().isWriteThrough();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
----------------------------------------------------------------------
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 cf16d9d..fc7e9a7 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
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Metrics snapshot.
@@ -964,4 +966,4 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable {
         writeBehindCriticalOverflowCnt = in.readInt();
         writeBehindErrorRetryCnt = in.readInt();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
index 2f77e86..d870a6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -70,4 +70,4 @@ public interface CacheObject extends Message {
      * @throws IgniteCheckedException If failed.
      */
     public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
index 6b2f46d..a3f37f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -115,4 +118,4 @@ public abstract class CacheObjectAdapter implements CacheObject, Externalizable
     public String toString() {
         return getClass().getSimpleName() + " [val=" + val + ", hasValBytes=" + (valBytes != null) + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
index ecd4c43..32f5f88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache object over byte array.
@@ -153,4 +157,4 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable {
     public String toString() {
         return "CacheObjectByteArrayImpl [arrLen" + (val != null ? val.length : 0) + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index e85a04a..7d7cbec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
 
 /**
  *
@@ -127,4 +126,4 @@ public class CacheObjectContext {
     public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable) {
         return col;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
index 96603f9..83a80b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -126,4 +127,4 @@ public class CacheObjectImpl extends CacheObjectAdapter {
     @Override public CacheObject prepareForCache(CacheObjectContext ctx) {
         return this;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
index 343a2f0..d551258 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache operation context.
@@ -201,4 +200,4 @@ public class CacheOperationContext implements Serializable {
     @Override public String toString() {
         return S.toString(CacheOperationContext.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
index 9e765d9..6d5d3f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.version.CacheVersionConflictResolver;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * OS conflict resolver manager.
@@ -61,4 +61,4 @@ public class CacheOsConflictResolutionManager<K ,V> implements CacheConflictReso
     @Override public void onDisconnected(IgniteFuture<?> reconnectFut) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java
index ab38e5f..9d2686c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 
 /**
  * Exception thrown from non-transactional cache in case when update succeeded only partially.
@@ -89,4 +90,4 @@ public class CachePartialUpdateCheckedException extends IgniteCheckedException {
     @Override public String getMessage() {
         return super.getMessage() + ": " + failedKeys;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePeekModes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePeekModes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePeekModes.java
index 7c5b1e8..32358e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePeekModes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePeekModes.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CachePeekMode;
 
 /**
  *
@@ -25,4 +25,4 @@ import org.apache.ignite.cache.*;
 public class CachePeekModes {
     /** */
     public static final CachePeekMode[] ONHEAP_ONLY = {CachePeekMode.ONHEAP};
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
index 7bbf08b..93075f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Cache store wrapper that ensures that there will be no more that one thread loading value from underlying store.
@@ -302,4 +306,4 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> {
             return get().get(key);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStorePartialUpdateException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStorePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStorePartialUpdateException.java
index f7fca59..0b7f95b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStorePartialUpdateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStorePartialUpdateException.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  *
@@ -48,4 +47,4 @@ public class CacheStorePartialUpdateException extends IgniteCheckedException {
     public Collection<Object> failedKeys() {
         return failedKeys;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java
index 954bfe5..4886e61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MARSH_CACHE_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
 
 /**
  *
@@ -72,4 +74,3 @@ public enum CacheType {
         return userCache;
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
index 3fbc99d..4c48e74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jsr166.*;
-
-import java.lang.ref.*;
-import java.util.*;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * @param <V> Type for cache query future.
@@ -230,4 +233,4 @@ public class CacheWeakQueryIteratorsHolder<V> {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
index 1e8184d..c7af64f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache change batch.
@@ -114,4 +115,4 @@ public class DynamicCacheChangeBatch implements DiscoveryCustomMessage {
     @Override public String toString() {
         return S.toString(DynamicCacheChangeBatch.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index 7af1572..e552dd6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Cache start/stop request.
@@ -235,4 +235,4 @@ public class DynamicCacheChangeRequest implements Serializable {
     @Override public String toString() {
         return S.toString(DynamicCacheChangeRequest.class, this, "cacheName", cacheName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
index 9c6cc43..6152190 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.plugin.CachePluginManager;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Cache start descriptor.
@@ -229,4 +231,4 @@ public class DynamicCacheDescriptor {
     @Override public String toString() {
         return S.toString(DynamicCacheDescriptor.class, this, "cacheName", U.maskName(cacheCfg.getName()));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 c3bbbe4..653c2b1 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
@@ -17,55 +17,140 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridClosureCallMode.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cache.CacheInterceptor;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgniteTransactionsEx;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.cluster.IgniteClusterEx;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityImpl;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteExternalizableExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl;
+import org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl;
+import org.apache.ignite.internal.processors.dr.IgniteDrDataStreamerCacheUpdater;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.GridTriple;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.CIX2;
+import org.apache.ignite.internal.util.typedef.CIX3;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.GPC;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.mxbean.CacheMetricsMXBean;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_KEY_VALIDATION_DISABLED;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_RETRIES_COUNT;
+import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_CREATED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_DESTROYED;
+import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_LOAD;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TIMEOUT;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
 
 /**
  * Adapter for different cache implementations.
@@ -5927,4 +6012,4 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index 88e5e40..4f99ef5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -17,18 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache affinity manager.
@@ -365,4 +370,4 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter {
     public AffinityTopologyVersion affinityTopologyVersion() {
         return aff.lastVersion();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
index e64a9e1..be35c5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 
 /**
  * Update future for atomic cache.
@@ -38,4 +37,4 @@ public interface GridCacheAtomicFuture<R> extends GridCacheFuture<R> {
      * @return Future keys.
      */
     public Collection<?> keys();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
index 3a06100..08a5b28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 
 /**
  * Atomic cache version comparator.
@@ -58,4 +58,4 @@ public class GridCacheAtomicVersionComparator {
         else
             return topVer > otherTopVer ? 1 : -1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 389c0fe..e17b91a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import java.io.Externalizable;
+import java.io.Serializable;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_MODE;
 
 /**
  * Cache attributes.
@@ -315,4 +321,4 @@ public class GridCacheAttributes implements Serializable {
     @Override public String toString() {
         return S.toString(GridCacheAttributes.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheBatchSwapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheBatchSwapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheBatchSwapEntry.java
index 90d19ef..01c9bab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheBatchSwapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheBatchSwapEntry.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Entry for batch swap operations.
@@ -74,4 +73,4 @@ public class GridCacheBatchSwapEntry extends GridCacheSwapEntryImpl {
     public int partition() {
         return part;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
index f51b6c4..e517e3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Base runnable for {@link GridCacheAdapter#clearLocally()} routine.
@@ -174,4 +176,4 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
     @Override public String toString() {
         return S.toString(GridCacheClearAllRunnable.class, this);
     }
-}
+}
\ No newline at end of file


[43/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/TextQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/TextQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/TextQuery.java
index 0bb4c63..4eba432 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/TextQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/TextQuery.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Query for Lucene based fulltext search.
@@ -128,4 +128,4 @@ public final class TextQuery<K, V> extends Query<Cache.Entry<K, V>> {
     @Override public String toString() {
         return S.toString(TextQuery.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryGroupIndex.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryGroupIndex.java b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryGroupIndex.java
index 9c756c4..b1fefae 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryGroupIndex.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryGroupIndex.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.cache.query.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Describes group index.
@@ -46,4 +49,4 @@ public @interface QueryGroupIndex {
          */
         QueryGroupIndex[] value();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlField.java b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlField.java
index db35671..48402b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlField.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlField.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.cache.query.annotations;
 
-import org.apache.ignite.internal.processors.cache.query.*;
-
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
 
 /**
  * Annotates fields for SQL queries. All fields that will be involved in SQL clauses must have
@@ -122,4 +125,4 @@ public @interface QuerySqlField {
          */
         boolean descending() default false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java
index 7d292d3..92837ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.cache.query.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates public static methods in classes to be used in SQL queries as custom functions.
@@ -64,4 +68,4 @@ public @interface QuerySqlFunction {
      * @return {@code true} If function is deterministic, {@code false} otherwise.
      */
     boolean deterministic() default false;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryTextField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryTextField.java b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryTextField.java
index 280ebc3..55809b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryTextField.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QueryTextField.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.cache.query.annotations;
 
-import org.apache.ignite.internal.processors.cache.query.*;
-
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
 
 /**
  * Annotation for fields or getters to be indexed for full text
@@ -32,4 +35,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
 public @interface QueryTextField {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
index a0cbe65..7494e37 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
@@ -17,18 +17,28 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.resources.LoggerResource;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * This adapter designed to support stores with bulk loading from stream-like source.
@@ -320,4 +330,4 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> implements CacheStore<K
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index 5bfdda1..7d84c34 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.integration.*;
-import java.util.*;
+import java.util.Collection;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriter;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStore;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * API for cache persistent storage for read-through and write-through behavior.
@@ -98,4 +102,4 @@ public interface CacheStore<K, V> extends CacheLoader<K, V>, CacheWriter<K, V> {
      */
     @Deprecated
     public void sessionEnd(boolean commit) throws CacheWriterException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
index f7adf2c..eaf5225 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.Cache;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Cache storage convenience adapter. It provides default implementation for bulk operations, such
@@ -91,4 +93,4 @@ public abstract class CacheStoreAdapter<K, V> implements CacheStore<K, V> {
     @Override public void sessionEnd(boolean commit) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
----------------------------------------------------------------------
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 329e994..4ddd8f1 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
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Session for the cache store operations. The main purpose of cache store session
@@ -89,4 +88,4 @@ public interface CacheStoreSession {
      * @return Cache name for the current store operation.
      */
     public String cacheName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
index 1543bf9..8215756 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-
-import javax.cache.configuration.*;
-import javax.sql.*;
+import javax.cache.configuration.Factory;
+import javax.sql.DataSource;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListener;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
 
 /**
  * Cache store session listener that allows to implement callbacks
@@ -130,4 +130,4 @@ public interface CacheStoreSessionListener {
      *      should commit, {@code false} for rollback.
      */
     public void onSessionEnd(CacheStoreSession ses, boolean commit);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index b2be8c7..6e27b9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -17,30 +17,63 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.dialect.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import javax.sql.*;
-import java.nio.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static java.sql.Statement.*;
+import java.nio.ByteBuffer;
+import java.sql.BatchUpdateException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import javax.sql.DataSource;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheTypeFieldMetadata;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect;
+import org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect;
+import org.apache.ignite.cache.store.jdbc.dialect.H2Dialect;
+import org.apache.ignite.cache.store.jdbc.dialect.JdbcDialect;
+import org.apache.ignite.cache.store.jdbc.dialect.MySQLDialect;
+import org.apache.ignite.cache.store.jdbc.dialect.OracleDialect;
+import org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+
+import static java.sql.Statement.EXECUTE_FAILED;
+import static java.sql.Statement.SUCCESS_NO_INFO;
 
 /**
  * Implementation of {@link CacheStore} backed by JDBC.
@@ -1788,4 +1821,4 @@ public abstract class CacheAbstractJdbcStore<K, V> implements CacheStore<K, V>,
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
index e01c879..147f6c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
@@ -17,27 +17,40 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import javax.sql.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import javax.sql.DataSource;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
 
 /**
  * {@link CacheStore} implementation backed by JDBC. This implementation
@@ -580,4 +593,4 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> {
     protected CacheStoreSession session() {
         return ses;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java
index cf493a0..0625945 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.spring.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import javax.cache.configuration.*;
-import javax.sql.*;
+import javax.cache.configuration.Factory;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteComponentType;
+import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.SpringApplicationContextResource;
 
 /**
  * {@link Factory} implementation for {@link CacheJdbcBlobStore}.
@@ -287,4 +287,4 @@ public class CacheJdbcBlobStoreFactory<K, V> implements Factory<CacheJdbcBlobSto
     @Override public String toString() {
         return S.toString(CacheJdbcBlobStoreFactory.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
index 1ff170e..d78ea48 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
@@ -17,18 +17,23 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.lang.reflect.*;
-import java.sql.*;
-import java.util.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.CacheException;
+import javax.cache.integration.CacheLoaderException;
+import org.apache.ignite.cache.CacheTypeFieldMetadata;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implementation of {@link CacheStore} backed by JDBC and POJO via reflection.
@@ -238,4 +243,4 @@ public class CacheJdbcPojoStore<K, V> extends CacheAbstractJdbcStore<K, V> {
             throw new CacheException("Failed to find class: " + type, e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
index 5449433..bf7c9e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
@@ -17,16 +17,15 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.jdbc.dialect.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.spring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import javax.cache.configuration.*;
-import javax.sql.*;
+import javax.cache.configuration.Factory;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.store.jdbc.dialect.JdbcDialect;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteComponentType;
+import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.SpringApplicationContextResource;
 
 /**
  * {@link Factory} implementation for {@link CacheJdbcPojoStore}.
@@ -145,4 +144,4 @@ public class CacheJdbcPojoStoreFactory<K, V> implements Factory<CacheJdbcPojoSto
     @Override public String toString() {
         return S.toString(CacheJdbcPojoStoreFactory.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListener.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListener.java
index a20e535..2c70d26 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListener.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lifecycle.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import javax.sql.*;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.cache.Cache;
+import javax.cache.integration.CacheWriterException;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lifecycle.LifecycleAware;
 
 /**
  * Cache store session listener based on JDBC connection.
@@ -138,4 +140,4 @@ public class CacheJdbcStoreSessionListener implements CacheStoreSessionListener,
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
index b43c7d5..abb59d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.SB;
 
 /**
  * Basic implementation of dialect based on JDBC specification.
@@ -274,4 +274,4 @@ public class BasicJdbcDialect implements JdbcDialect {
     public void setMaxParameterCount(int maxParamsCnt) {
         this.maxParamsCnt = maxParamsCnt;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
index 2a08557..2a92bdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/DB2Dialect.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * A dialect compatible with the IBM DB2 database.
@@ -68,4 +68,4 @@ public class DB2Dialect extends BasicJdbcDialect {
                 "  INSERT (%s) VALUES (%s)", fullTblName, repeat("?", cols.size(), "", ",", ""), colsLst,
             match, setCols, colsLst, valuesCols);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
index 8091e1a..94d27a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/H2Dialect.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * A dialect compatible with the H2 database.
@@ -41,4 +40,4 @@ public class H2Dialect extends BasicJdbcDialect {
         return String.format("MERGE INTO %s (%s) KEY (%s) VALUES(%s)", fullTblName, mkString(cols, ","),
             mkString(keyCols, ","), repeat("?", cols.size(), "", ", ", ""));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/JdbcDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/JdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/JdbcDialect.java
index 32adcc4..38e981f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/JdbcDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/JdbcDialect.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
 
 /**
  * Represents a dialect of SQL implemented by a particular RDBMS.
@@ -115,4 +115,4 @@ public interface JdbcDialect extends Serializable {
      * @return Max query parameters count.
      */
     public int getMaxParameterCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
index def2fe7..f7512a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/MySQLDialect.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * A dialect compatible with the MySQL database.
@@ -48,4 +48,4 @@ public class MySQLDialect extends BasicJdbcDialect {
         return String.format("INSERT INTO %s (%s) VALUES (%s) ON DUPLICATE KEY UPDATE %s", fullTblName,
             mkString(cols, ", "), repeat("?", cols.size(), "", ",", ""), updPart);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
index e155fb4..b7a0400 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/OracleDialect.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * A dialect compatible with the Oracle database.
@@ -72,4 +72,4 @@ public class OracleDialect extends BasicJdbcDialect {
             " WHEN NOT MATCHED THEN" +
             "  INSERT (%s) VALUES (%s)", fullTblName, selCols, match, setCols, colsLst, valuesCols);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
index 7fdda6b..0082617 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/SQLServerDialect.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cache.store.jdbc.dialect;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * A dialect compatible with the Microsoft SQL Server database.
@@ -67,4 +67,4 @@ public class SQLServerDialect extends BasicJdbcDialect {
                 "  INSERT (%s) VALUES (%s);", fullTblName, repeat("?", cols.size(), "", ",", ""), colsLst,
             match, setCols, colsLst, valuesCols);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
index d21e25a..1b972ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines a cluster group which contains all or a subset of cluster nodes.
@@ -290,4 +293,4 @@ public interface ClusterGroup {
      * @throws IgniteException If this cluster group is empty.
      */
     public ClusterMetrics metrics() throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
index f03e08c..63b2839 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cluster;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception defines illegal call on empty cluster group. Thrown by cluster group when operation
@@ -52,4 +52,4 @@ public class ClusterGroupEmptyException extends ClusterTopologyException {
     public ClusterGroupEmptyException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
index 98820d2..50c09be 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.configuration.IgniteConfiguration;
 
 /**
  * This class represents runtime information on a cluster. Apart from obvious
@@ -684,4 +684,4 @@ public interface ClusterMetrics {
      * @return Total number of nodes.
      */
     public int getTotalNodes();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 62c1deb..bfc395d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface representing a single cluster node. Use {@link #attribute(String)} or
@@ -255,4 +259,4 @@ public interface ClusterNode {
      * @see DiscoverySpi#isClientMode()
      */
     public boolean isClient();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
index b6c3619..a66d842 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cluster;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cluster start node result information.
@@ -43,4 +43,4 @@ public interface ClusterStartNodeResult {
      * @return Error massage.
      */
     @Nullable public String getError();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
index 61bc367..e5abcbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception is used to indicate error with the cluster topology (e.g., crashed node, etc.).
@@ -64,4 +64,4 @@ public class ClusterTopologyException extends IgniteException {
     public void retryReadyFuture(IgniteFuture<?> readyFut) {
         this.readyFut = readyFut;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
index 4d504bc..0b98e41 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception defines execution rejection. This exception is used to indicate
@@ -59,4 +59,4 @@ public class ComputeExecutionRejectedException extends IgniteException {
     public ComputeExecutionRejectedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
index ae52912..d8664e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
 
 /**
  * Defines executable unit for {@link ComputeTask}.
@@ -160,4 +160,4 @@ public interface ComputeJob extends Serializable {
      *      it will be wrapped into {@link IgniteCheckedException}.
      */
     public Object execute() throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAdapter.java
index 80841ba..43465a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAdapter.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience adapter for {@link ComputeJob} implementations. It provides the
@@ -132,4 +131,4 @@ public abstract class ComputeJobAdapter implements ComputeJob, Callable<Object>
     @Override public final Object call() {
         return execute();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
index cfba2c4..f81e969 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation allows to call a method right after the job has been
@@ -44,4 +48,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD})
 public @interface ComputeJobAfterSend {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
index 3cc5c23..7ae6455 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation allows to call a method right before job is submitted to
@@ -45,4 +49,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD})
 public @interface ComputeJobBeforeFailover {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
index 81fd8e1..086356a 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Context attached to every job executed on the grid. Note that unlike
@@ -94,4 +94,4 @@ public interface ComputeJobContext extends ComputeJobContinuation {
      * @return All attributes.
      */
     public Map<?, ?> getAttributes();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuation.java
----------------------------------------------------------------------
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 cd91e2c..b8b362d 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.compute;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines continuation support for grid job context.
@@ -90,4 +90,4 @@ public interface ComputeJobContinuation {
      * abbreviated as {@code 'call/cc'}, which originated in Scheme programming language.
      */
     public void callcc();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
index 08bd354..936c9c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.resources.JobContextResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience adapter for {@link ComputeJob} implementations. It provides the
@@ -128,4 +128,4 @@ public abstract class ComputeJobContinuationAdapter extends ComputeJobAdapter im
     @Nullable @Override public <T> T holdcc(long timeout) {
         return jobCtx == null ? null : jobCtx.<T>holdcc(timeout);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java
index 70dfc13..9f2c034 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.lang.IgniteClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This runtime exception can be thrown from {@link ComputeJob#execute()} method to force
@@ -62,4 +62,4 @@ public class ComputeJobFailoverException extends IgniteException {
     public ComputeJobFailoverException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobMasterLeaveAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobMasterLeaveAware.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobMasterLeaveAware.java
index 63583b3..4c89e63 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobMasterLeaveAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobMasterLeaveAware.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Annotation for handling master node leave during job execution.
@@ -37,4 +37,4 @@ public interface ComputeJobMasterLeaveAware {
      * @throws IgniteException In case of any exception.
      */
     public void onMasterNodeLeft(ComputeTaskSession ses) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
index 6138ad7..3e37279 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
 
 /**
  * Result of remote job which gets passed into {@link ComputeTask#result(ComputeJobResult, List)}
@@ -100,4 +100,4 @@ public interface ComputeJobResult {
      * @return {@code true} if job received cancellation request and {@code false} otherwise.
      */
     public boolean isCancelled();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResultPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResultPolicy.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResultPolicy.java
index 26eb542..74c17e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResultPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResultPolicy.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.compute;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This enumeration provides different types of actions following the last
@@ -53,4 +52,4 @@ public enum ComputeJobResultPolicy {
     @Nullable public static ComputeJobResultPolicy fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
index 1071350..b7e2068 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Job sibling interface defines a job from the same split. In other words a sibling is a job returned
@@ -42,4 +41,4 @@ public interface ComputeJobSibling {
      * @throws IgniteException If cancellation message could not be sent.
      */
     public void cancel() throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
index d9f2e21..356e5a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Load balancer is used for finding the best balanced node according
@@ -112,4 +112,4 @@ public interface ComputeLoadBalancer {
      */
     @Nullable public ClusterNode getBalancedNode(ComputeJob job, @Nullable Collection<ClusterNode> exclNodes)
         throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
index 9b870a5..d24bf00 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid task interface defines a task that can be executed on the grid. Grid task
@@ -278,4 +278,4 @@ public interface ComputeTask<T, R> extends Serializable {
      *      be thrown out of {@link ComputeTaskFuture#get()} method.
      */
     @Nullable public R reduce(List<ComputeJobResult> results) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
index c2ad198..2de0794 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterTopologyException;
 
 /**
  * Convenience adapter for {@link ComputeTask} interface. Here is an example of
@@ -106,4 +105,4 @@ public abstract class ComputeTaskAdapter<T, R> implements ComputeTask<T, R> {
         // Wait for all job responses.
         return ComputeJobResultPolicy.WAIT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskCancelledException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskCancelledException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskCancelledException.java
index 965e564..8e5981d 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskCancelledException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskCancelledException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception indicates that grid task was cancelled.
@@ -55,4 +55,4 @@ public class ComputeTaskCancelledException extends IgniteException {
     public ComputeTaskCancelledException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java
index 3a4cb91..be32be8 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Defines a mapper that can be used for asynchronous job sending. Useful for
@@ -96,4 +97,4 @@ public interface ComputeTaskContinuousMapper {
      * @throws IgniteException If job can not be processed.
      */
     public void send(Collection<? extends ComputeJob> jobs) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskFuture.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskFuture.java
index d5401fa..e30ab90 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskFuture.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * This class defines a handler for asynchronous task execution. It's similar in design
@@ -49,4 +49,4 @@ public interface ComputeTaskFuture<R> extends IgniteFuture<R> {
      * @return Task session.
      */
     public ComputeTaskSession getTaskSession();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskMapAsync.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskMapAsync.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskMapAsync.java
index d0be930..71cf2b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskMapAsync.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskMapAsync.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
-import java.util.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.List;
 
 /**
  * Annotation for asynchronous task mapping.
@@ -34,4 +38,4 @@ import java.util.*;
 @Target({ElementType.TYPE})
 public @interface ComputeTaskMapAsync {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskName.java
----------------------------------------------------------------------
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 654118a..7f45155 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation allows to assign optional name to grid task. If attached to
@@ -32,4 +36,4 @@ public @interface ComputeTaskName {
      * Optional task name.
      */
     @SuppressWarnings({"JavaDoc"}) String value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
index 35f611a..bbd0ff4 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
-import java.util.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.List;
 
 /**
  * This annotation disables caching of task results when attached to {@link ComputeTask} class
@@ -48,4 +52,4 @@ import java.util.*;
 @Target({ElementType.TYPE})
 public @interface ComputeTaskNoResultCache {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
index f6452e5..d6ebe15 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines a distributed session for particular task execution.
@@ -437,4 +440,4 @@ public interface ComputeTaskSession {
      * @return Future that will be completed when task "<tt>map</tt>" step has completed.
      */
     public IgniteFuture<?> mapFuture();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionAttributeListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionAttributeListener.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionAttributeListener.java
index d0a0866..9e664a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionAttributeListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionAttributeListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.compute;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * This interface defines listener for task session attributes.
@@ -30,4 +30,4 @@ public interface ComputeTaskSessionAttributeListener extends EventListener {
      * @param val Attribute value.
      */
     public void onAttributeSet(Object key, Object val);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionFullSupport.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionFullSupport.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionFullSupport.java
index 340d65d..e04c312 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionFullSupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionFullSupport.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
-import java.util.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Map;
 
 /**
  * Annotation for enabling task session attributes and checkpoints for tasks.
@@ -42,4 +46,4 @@ import java.util.*;
 @Target({ElementType.TYPE})
 public @interface ComputeTaskSessionFullSupport {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionScope.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionScope.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionScope.java
index bc1928b..bb1f142 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionScope.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSessionScope.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.compute;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines life-time scopes for checkpoint operations. Such operations include:
@@ -56,4 +56,4 @@ public enum ComputeTaskSessionScope {
     @Nullable public static ComputeTaskSessionScope fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSpis.java
----------------------------------------------------------------------
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 32206f5..5edd464 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.compute;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation allows task to specify what SPIs it wants to use.
@@ -52,4 +56,4 @@ public @interface ComputeTaskSpis {
      * supplying {@link org.apache.ignite.spi.IgniteSpi#getName()} parameter in grid configuration.
      */
     public String checkpointSpi() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
index 7b3b0d6..0b62519 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoadBalancerResource;
 
 /**
  * This class defines simplified adapter for {@link ComputeTask}. This adapter can be used
@@ -119,4 +120,4 @@ public abstract class ComputeTaskSplitAdapter<T, R> extends ComputeTaskAdapter<T
 
         return map;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java
index b09f09f..7f01d89 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception indicates that task execution timed out. It is thrown from
@@ -58,4 +58,4 @@ public class ComputeTaskTimeoutException extends IgniteException {
     public ComputeTaskTimeoutException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/ComputeUserUndeclaredException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeUserUndeclaredException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeUserUndeclaredException.java
index 542762a..f10eae5 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeUserUndeclaredException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeUserUndeclaredException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.compute;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception is thrown when user's code throws undeclared runtime exception. By user code it is
@@ -59,4 +59,4 @@ public class ComputeUserUndeclaredException extends IgniteException {
     public ComputeUserUndeclaredException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
----------------------------------------------------------------------
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 d394dd1..f7d96e0 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
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.aop.*;
-
-import java.io.*;
-import java.lang.annotation.*;
+import java.io.Serializable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.gridify.aop.GridifyDefaultTask;
 
 /**
  * {@code Gridify} annotation is the main way to grid-enable existing code.
@@ -184,4 +187,4 @@ public @interface Gridify {
      */
     @SuppressWarnings({"JavaDoc"})
     String gridName() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyArgument.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyArgument.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyArgument.java
index 19a5abb..384891e 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyArgument.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyArgument.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.compute.gridify;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Gridify task argument created by the system for task execution. It contains
@@ -68,4 +68,4 @@ public interface GridifyArgument extends Serializable {
      *      object creation.
      */
     public Object getTarget();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInput.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInput.java
index 3d9ba04..cc935b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInput.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInput.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.compute.gridify;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation can be applied to method parameter for grid-enabled method. This annotation can be used
@@ -42,4 +46,4 @@ import java.lang.annotation.*;
 @Target({ElementType.PARAMETER})
 public @interface GridifyInput {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInterceptor.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInterceptor.java
index 015c760..33ec08e 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyInterceptor.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.*;
-
-import java.lang.annotation.*;
+import java.lang.annotation.Annotation;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * This interface defines an interceptor apply for {@link Gridify} annotation. Interceptor
@@ -39,4 +38,4 @@ public interface GridifyInterceptor {
      * @throws IgniteCheckedException Thrown in case of any errors.
      */
     public boolean isGridify(Annotation gridify, GridifyArgument arg) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyNodeFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyNodeFilter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyNodeFilter.java
index d4654bb..27864a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyNodeFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyNodeFilter.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Predicate node filter.
  */
 public interface GridifyNodeFilter extends IgniteBiPredicate<ClusterNode, ComputeTaskSession> {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyRuntimeException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyRuntimeException.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyRuntimeException.java
index 2f2259e..d138397 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyRuntimeException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyRuntimeException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * This defines gridify exception. This runtime exception gets thrown out of gridified
@@ -55,4 +55,4 @@ public class GridifyRuntimeException extends IgniteException {
     public GridifyRuntimeException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
----------------------------------------------------------------------
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 f5e4d6f..9b57c43 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
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.compute.gridify;
 
-import java.io.*;
-import java.lang.annotation.*;
+import java.io.Serializable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * {@code GridifySetToSet} annotation allows to grid-enable existing code with specific semantics.
@@ -196,4 +200,4 @@ public @interface GridifySetToSet {
      * Refer to {@link org.apache.ignite.Ignition} for information about named grids.
      */
     String gridName() default "";
-}
+}
\ No newline at end of file


[59/82] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main


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

Branch: refs/heads/ignite-1093-2
Commit: 0dab4df37845795b89f3d6f2f99e048d8fe7d6aa
Parents: 90d8438 e7ec8c5
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Aug 31 17:51:16 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Aug 31 17:51:16 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/schema/CacheConfig.java   |   9 +-
 .../java/org/apache/ignite/schema/Demo.java     |  22 +-
 .../java/org/apache/ignite/schema/DemoNode.java |   5 +-
 .../java/org/apache/ignite/schema/Person.java   |   1 -
 .../org/apache/ignite/schema/PersonKey.java     |   1 -
 .../ignite/examples/ExampleNodeStartup.java     |   5 +-
 .../apache/ignite/examples/ExamplesUtils.java   |  11 +-
 .../computegrid/ComputeAsyncExample.java        |  16 +-
 .../computegrid/ComputeBroadcastExample.java    |  16 +-
 .../computegrid/ComputeCallableExample.java     |  14 +-
 .../computegrid/ComputeClosureExample.java      |  14 +-
 .../ComputeContinuousMapperExample.java         |  32 ++-
 .../ComputeFibonacciContinuationExample.java    |  32 ++-
 .../computegrid/ComputeReducerExample.java      |  16 +-
 .../computegrid/ComputeRunnableExample.java     |  11 +-
 .../computegrid/ComputeTaskMapExample.java      |  23 +-
 .../computegrid/ComputeTaskSplitExample.java    |  20 +-
 .../cluster/ClusterGroupExample.java            |  16 +-
 .../computegrid/cluster/package-info.java       |   2 +-
 .../failover/ComputeFailoverExample.java        |  23 +-
 .../failover/ComputeFailoverNodeStartup.java    |  17 +-
 .../computegrid/failover/package-info.java      |   2 +-
 .../examples/computegrid/montecarlo/Credit.java |   4 +-
 .../montecarlo/CreditRiskExample.java           |  16 +-
 .../montecarlo/CreditRiskManager.java           |   5 +-
 .../computegrid/montecarlo/package-info.java    |   2 +-
 .../examples/computegrid/package-info.java      |   2 +-
 .../examples/datagrid/CacheAffinityExample.java |  20 +-
 .../examples/datagrid/CacheApiExample.java      |  15 +-
 .../examples/datagrid/CacheAsyncApiExample.java |  16 +-
 .../datagrid/CacheContinuousQueryExample.java   |  22 +-
 .../datagrid/CacheDataStreamerExample.java      |  11 +-
 .../examples/datagrid/CacheEventsExample.java   |  21 +-
 .../examples/datagrid/CachePutGetExample.java   |  13 +-
 .../examples/datagrid/CacheQueryExample.java    |  33 ++-
 .../datagrid/CacheTransactionExample.java       |  25 +-
 .../hibernate/HibernateL2CacheExample.java      |  35 ++-
 .../examples/datagrid/hibernate/Post.java       |  10 +-
 .../examples/datagrid/hibernate/User.java       |  13 +-
 .../datagrid/hibernate/package-info.java        |   2 +-
 .../ignite/examples/datagrid/package-info.java  |   2 +-
 .../starschema/CacheStarSchemaExample.java      |  26 +-
 .../datagrid/starschema/DimProduct.java         |   6 +-
 .../examples/datagrid/starschema/DimStore.java  |   6 +-
 .../datagrid/starschema/FactPurchase.java       |   6 +-
 .../datagrid/starschema/package-info.java       |   2 +-
 .../ignite/examples/datagrid/store/Person.java  |   3 +-
 .../store/auto/CacheAutoStoreExample.java       |  18 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |  16 +-
 .../datagrid/store/auto/CacheConfig.java        |  27 +-
 .../datagrid/store/auto/DbH2ServerStartup.java  |  15 +-
 .../datagrid/store/auto/package-info.java       |   2 +-
 .../store/dummy/CacheDummyPersonStore.java      |  24 +-
 .../store/dummy/CacheDummyStoreExample.java     |  25 +-
 .../datagrid/store/dummy/package-info.java      |   2 +-
 .../hibernate/CacheHibernatePersonStore.java    |  22 +-
 .../hibernate/CacheHibernateStoreExample.java   |  30 +-
 .../datagrid/store/hibernate/package-info.java  |   2 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |  29 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |  30 +-
 .../datagrid/store/jdbc/package-info.java       |   2 +-
 .../examples/datagrid/store/package-info.java   |   2 +-
 .../store/spring/CacheSpringPersonStore.java    |  31 +-
 .../store/spring/CacheSpringStoreExample.java   |  30 +-
 .../datagrid/store/spring/package-info.java     |   2 +-
 .../datastructures/IgniteAtomicLongExample.java |  13 +-
 .../IgniteAtomicReferenceExample.java           |  13 +-
 .../IgniteAtomicSequenceExample.java            |  10 +-
 .../IgniteAtomicStampedExample.java             |  13 +-
 .../IgniteCountDownLatchExample.java            |  13 +-
 .../IgniteExecutorServiceExample.java           |  13 +-
 .../datastructures/IgniteQueueExample.java      |  18 +-
 .../datastructures/IgniteSetExample.java        |  22 +-
 .../examples/datastructures/package-info.java   |   2 +-
 .../ignite/examples/events/EventsExample.java   |  25 +-
 .../ignite/examples/events/package-info.java    |   2 +-
 .../ignite/examples/igfs/IgfsExample.java       |  20 +-
 .../examples/igfs/IgfsMapReduceExample.java     |  35 ++-
 .../ignite/examples/igfs/IgfsNodeStartup.java   |   5 +-
 .../ignite/examples/igfs/package-info.java      |   2 +-
 .../examples/messaging/MessagingExample.java    |  21 +-
 .../messaging/MessagingPingPongExample.java     |  18 +-
 .../MessagingPingPongListenActorExample.java    |  20 +-
 .../ignite/examples/messaging/package-info.java |   2 +-
 .../client/memcache/MemcacheRestExample.java    |  17 +-
 .../MemcacheRestExampleNodeStartup.java         |  28 +-
 .../misc/client/memcache/package-info.java      |   2 +-
 .../examples/misc/client/package-info.java      |   2 +-
 .../misc/deployment/DeploymentExample.java      |  25 +-
 .../examples/misc/deployment/package-info.java  |   2 +-
 .../misc/lifecycle/LifecycleExample.java        |  16 +-
 .../examples/misc/lifecycle/package-info.java   |   2 +-
 .../ignite/examples/misc/package-info.java      |   2 +-
 .../misc/schedule/ComputeScheduleExample.java   |  15 +-
 .../examples/misc/schedule/package-info.java    |   2 +-
 .../misc/springbean/SpringBeanExample.java      |  13 +-
 .../examples/misc/springbean/package-info.java  |   2 +-
 .../apache/ignite/examples/package-info.java    |   2 +-
 .../examples/servicegrid/ServicesExample.java   |  16 +-
 .../examples/servicegrid/SimpleMapService.java  |   2 +-
 .../servicegrid/SimpleMapServiceImpl.java       |  12 +-
 .../examples/servicegrid/package-info.java      |   2 +-
 .../streaming/StreamTransformerExample.java     |  22 +-
 .../streaming/StreamVisitorExample.java         |  25 +-
 .../ignite/examples/streaming/package-info.java |   2 +-
 .../streaming/wordcount/CacheConfig.java        |  14 +-
 .../streaming/wordcount/QueryWords.java         |  16 +-
 .../streaming/wordcount/StreamWords.java        |  17 +-
 .../streaming/wordcount/package-info.java       |   2 +-
 .../socket/WordsSocketStreamerClient.java       |  19 +-
 .../socket/WordsSocketStreamerServer.java       |  30 +-
 .../wordcount/socket/package-info.java          |   2 +-
 .../java8/cluster/ClusterGroupExample.java      |  12 +-
 .../examples/java8/cluster/package-info.java    |   2 +-
 .../java8/computegrid/ComputeAsyncExample.java  |  16 +-
 .../computegrid/ComputeBroadcastExample.java    |  11 +-
 .../computegrid/ComputeCallableExample.java     |  14 +-
 .../computegrid/ComputeClosureExample.java      |  12 +-
 .../computegrid/ComputeRunnableExample.java     |  13 +-
 .../java8/computegrid/package-info.java         |   2 +-
 .../java8/datagrid/CacheAffinityExample.java    |  11 +-
 .../java8/datagrid/CacheApiExample.java         |  16 +-
 .../java8/datagrid/CacheAsyncApiExample.java    |  19 +-
 .../examples/java8/datagrid/package-info.java   |   2 +-
 .../IgniteExecutorServiceExample.java           |  13 +-
 .../java8/datastructures/package-info.java      |   2 +-
 .../examples/java8/events/EventsExample.java    |  25 +-
 .../examples/java8/events/package-info.java     |   2 +-
 .../java8/messaging/MessagingExample.java       |   8 +-
 .../messaging/MessagingPingPongExample.java     |  14 +-
 .../examples/java8/messaging/package-info.java  |   2 +-
 .../misc/schedule/ComputeScheduleExample.java   |  10 +-
 .../java8/misc/schedule/package-info.java       |   2 +-
 .../ignite/examples/java8/package-info.java     |   2 +-
 .../streaming/StreamTransformerExample.java     |  20 +-
 .../java8/streaming/StreamVisitorExample.java   |  24 +-
 .../examples/java8/streaming/package-info.java  |   2 +-
 .../BasicExamplesMultiNodeSelfTest.java         |   2 +-
 .../ignite/examples/BasicExamplesSelfTest.java  |  14 +-
 .../CacheExamplesMultiNodeSelfTest.java         |   2 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |  24 +-
 .../examples/CheckpointExamplesSelfTest.java    |   7 +-
 .../examples/ClusterGroupExampleSelfTest.java   |   6 +-
 .../ContinuationExamplesMultiNodeSelfTest.java  |   2 +-
 .../examples/ContinuationExamplesSelfTest.java  |   6 +-
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |   2 +-
 .../ContinuousMapperExamplesSelfTest.java       |   6 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/DeploymentExamplesSelfTest.java    |   6 +-
 .../EventsExamplesMultiNodeSelfTest.java        |   2 +-
 .../ignite/examples/EventsExamplesSelfTest.java |   6 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   4 +-
 .../HibernateL2CacheExampleSelfTest.java        |   6 +-
 .../ignite/examples/IgfsExamplesSelfTest.java   |   8 +-
 .../examples/LifecycleExamplesSelfTest.java     |   6 +-
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |   4 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |   7 +-
 .../examples/MessagingExamplesSelfTest.java     |   8 +-
 .../MonteCarloExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   6 +-
 .../examples/SpringBeanExamplesSelfTest.java    |   6 +-
 .../examples/TaskExamplesMultiNodeSelfTest.java |   2 +-
 .../ignite/examples/TaskExamplesSelfTest.java   |   7 +-
 .../testsuites/IgniteExamplesSelfTestSuite.java |  35 ++-
 .../BasicExamplesMultiNodeSelfTest.java         |   2 +-
 .../java8/examples/BasicExamplesSelfTest.java   |   3 +-
 .../CacheExamplesMultiNodeSelfTest.java         |   2 +-
 .../java8/examples/CacheExamplesSelfTest.java   |   4 +-
 .../examples/CheckpointExamplesSelfTest.java    |   3 +-
 .../examples/ClusterGroupExampleSelfTest.java   |   4 +-
 .../ContinuationExamplesMultiNodeSelfTest.java  |   2 +-
 .../examples/ContinuationExamplesSelfTest.java  |   3 +-
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |   2 +-
 .../ContinuousMapperExamplesSelfTest.java       |   4 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/DeploymentExamplesSelfTest.java    |   3 +-
 .../EventsExamplesMultiNodeSelfTest.java        |   2 +-
 .../java8/examples/EventsExamplesSelfTest.java  |   3 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   2 +-
 .../HibernateL2CacheExampleSelfTest.java        |   3 +-
 .../java8/examples/IgfsExamplesSelfTest.java    |   3 +-
 .../examples/LifecycleExamplesSelfTest.java     |   3 +-
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |   2 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |   3 +-
 .../examples/MessagingExamplesSelfTest.java     |   3 +-
 .../MonteCarloExamplesMultiNodeSelfTest.java    |   2 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   3 +-
 .../examples/SpringBeanExamplesSelfTest.java    |   3 +-
 .../examples/TaskExamplesMultiNodeSelfTest.java |   2 +-
 .../java8/examples/TaskExamplesSelfTest.java    |   3 +-
 .../IgniteExamplesJ8SelfTestSuite.java          |   6 +-
 .../aop/aspectj/GridifyAspectJAspect.java       |  32 ++-
 .../aspectj/GridifySetToSetAspectJAspect.java   |  34 ++-
 .../aspectj/GridifySetToValueAspectJAspect.java |  34 ++-
 .../aop/spring/GridifySetToSetSpringAspect.java |  30 +-
 .../spring/GridifySetToValueSpringAspect.java   |  30 +-
 .../gridify/aop/spring/GridifySpringAspect.java |  28 +-
 .../aop/spring/GridifySpringEnhancer.java       |   6 +-
 .../aop/spring/GridifySpringPointcut.java       |  13 +-
 .../apache/ignite/gridify/AbstractAopTest.java  |  35 +--
 .../apache/ignite/gridify/BasicAopSelfTest.java |  21 +-
 .../ignite/gridify/GridifySetToSetTarget.java   |  17 +-
 .../gridify/GridifySetToSetTargetInterface.java |  11 +-
 .../ignite/gridify/GridifySetToValueTarget.java |  14 +-
 .../GridifySetToValueTargetInterface.java       |  10 +-
 .../GridifySetToXXXNonSpringAopSelfTest.java    |  13 +-
 .../GridifySetToXXXSpringAopSelfTest.java       |  15 +-
 .../ignite/gridify/NonSpringAopSelfTest.java    |   4 +-
 .../ignite/gridify/SpringAopSelfTest.java       |   6 +-
 .../apache/ignite/gridify/TestAopTarget.java    |  10 +-
 .../ignite/gridify/TestAopTargetInterface.java  |   7 +-
 .../ignite/gridify/TestGridifyException.java    |   2 +-
 .../apache/ignite/gridify/TestGridifyJob.java   |  11 +-
 .../apache/ignite/gridify/TestGridifyTask.java  |  14 +-
 .../gridify/hierarchy/GridifyHierarchyTest.java |   4 +-
 .../ignite/gridify/hierarchy/SuperTarget.java   |   4 +-
 .../apache/ignite/gridify/hierarchy/Target.java |   2 +-
 .../optimized/OptimizedMarshallerAopTest.java   |  20 +-
 .../apache/ignite/p2p/P2PGridifySelfTest.java   |  22 +-
 .../testsuites/IgniteAopSelfTestSuite.java      |  16 +-
 .../singlesplit/SingleSplitTestJobTarget.java   |   8 +-
 .../direct/singlesplit/SingleSplitTestTask.java |  22 +-
 .../singlesplit/SingleSplitsLoadTest.java       |  29 +-
 .../gridify/GridifyLoadTestJobTarget.java       |   4 +-
 .../loadtests/gridify/GridifyLoadTestTask.java  |  18 +-
 .../gridify/GridifySingleSplitLoadTest.java     |  31 +-
 .../org/test/gridify/ExternalAopTarget.java     |  10 +-
 .../test/gridify/ExternalGridifyException.java  |   2 +-
 .../org/test/gridify/ExternalGridifyTask.java   |  20 +-
 .../gridify/ExternalNonSpringAopSelfTest.java   |  17 +-
 .../spi/checkpoint/s3/S3CheckpointData.java     |   9 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |  58 ++--
 .../spi/checkpoint/s3/S3CheckpointSpiMBean.java |   6 +-
 .../ignite/spi/checkpoint/s3/S3TimeData.java    |   4 +-
 .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java |  46 +--
 .../s3/S3CheckpointManagerSelfTest.java         |  11 +-
 .../s3/S3CheckpointSpiConfigSelfTest.java       |   5 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |  32 ++-
 .../s3/S3CheckpointSpiStartStopSelfTest.java    |  11 +-
 .../s3/S3SessionCheckpointSelfTest.java         |  12 +-
 .../s3/TcpDiscoveryS3IpFinderSelfTest.java      |  16 +-
 .../ignite/testsuites/IgniteS3TestSuite.java    |  12 +-
 .../internal/TaskEventSubjectIdSelfTest.java    |  53 ++--
 .../ClientAbstractMultiThreadedSelfTest.java    |  62 ++--
 .../client/ClientDefaultCacheSelfTest.java      |  35 ++-
 .../internal/client/ClientGetAffinityTask.java  |  19 +-
 .../ignite/internal/client/ClientHttpTask.java  |  19 +-
 .../internal/client/ClientNodeStartup.java      |   9 +-
 .../client/ClientReconnectionSelfTest.java      |  16 +-
 .../internal/client/ClientSslNodeStartup.java   |   9 +-
 .../internal/client/ClientStartNodeTask.java    |  38 ++-
 .../internal/client/ClientStopNodeTask.java     |  26 +-
 .../internal/client/ClientStringLengthTask.java |  16 +-
 .../client/ClientTcpMultiThreadedSelfTest.java  |   4 +-
 .../ClientTcpSslAuthenticationSelfTest.java     |  30 +-
 .../ClientTcpSslMultiThreadedSelfTest.java      |   6 +-
 .../ignite/internal/client/ClientTcpTask.java   |  16 +-
 ...skExecutionAfterTopologyRestartSelfTest.java |  10 +-
 .../internal/client/ClientTestRestServer.java   |  43 ++-
 .../ignite/internal/client/HashMapStore.java    |  12 +-
 .../ignite/internal/client/SleepTestTask.java   |  16 +-
 .../client/TaskSingleJobSplitAdapter.java       |  14 +-
 .../client/impl/ClientCacheFlagsCodecTest.java  |  19 +-
 .../client/impl/ClientComputeImplSelfTest.java  |  16 +-
 .../client/impl/ClientDataImplSelfTest.java     |  11 +-
 .../impl/ClientFutureAdapterSelfTest.java       |  14 +-
 .../ClientPropertiesConfigurationSelfTest.java  |  41 ++-
 .../ClientAbstractConnectivitySelfTest.java     |  35 ++-
 .../ClientAbstractMultiNodeSelfTest.java        | 100 ++++---
 .../integration/ClientAbstractSelfTest.java     |  86 ++++--
 .../integration/ClientPreferDirectSelfTest.java |  43 ++-
 .../ClientTcpConnectivitySelfTest.java          |  15 +-
 .../ClientTcpDirectMultiNodeSelfTest.java       |  11 +-
 .../integration/ClientTcpDirectSelfTest.java    |  11 +-
 .../integration/ClientTcpMultiNodeSelfTest.java |   4 +-
 .../client/integration/ClientTcpSelfTest.java   |   6 +-
 .../ClientTcpSslDirectMultiNodeSelfTest.java    |  15 +-
 .../integration/ClientTcpSslDirectSelfTest.java |  13 +-
 .../ClientTcpSslMultiNodeSelfTest.java          |   8 +-
 .../integration/ClientTcpSslSelfTest.java       |   8 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |  22 +-
 .../client/router/ClientFailedInitSelfTest.java |  50 ++--
 .../client/router/RouterFactorySelfTest.java    |  23 +-
 .../router/TcpRouterAbstractSelfTest.java       |  22 +-
 .../router/TcpRouterMultiNodeSelfTest.java      |  23 +-
 .../client/router/TcpRouterSelfTest.java        |   4 +-
 .../client/router/TcpSslRouterSelfTest.java     |   8 +-
 .../client/suite/IgniteClientTestSuite.java     |  50 +++-
 .../client/util/ClientByteUtilsTest.java        |  24 +-
 .../util/ClientConsistentHashSelfTest.java      |  19 +-
 .../client/util/ClientJavaHasherSelfTest.java   |   9 +-
 .../rest/AbstractRestProcessorSelfTest.java     |  16 +-
 .../rest/ClientMemcachedProtocolSelfTest.java   |  27 +-
 .../JettyRestProcessorAbstractSelfTest.java     |  44 +--
 .../rest/JettyRestProcessorSignedSelfTest.java  |  16 +-
 .../JettyRestProcessorUnsignedSelfTest.java     |   2 +-
 .../rest/MemcacheRestProcessorTest.java         |  15 +-
 .../rest/RestBinaryProtocolSelfTest.java        |  52 ++--
 .../rest/RestMemcacheProtocolSelfTest.java      |  29 +-
 .../rest/RestProcessorMultiStartSelfTest.java   |   7 +-
 .../rest/RestProcessorStartSelfTest.java        |  34 ++-
 .../processors/rest/RestProcessorTest.java      |  30 +-
 .../rest/TaskCommandHandlerSelfTest.java        |  59 ++--
 .../processors/rest/TestBinaryClient.java       |  64 +++--
 .../processors/rest/TestMemcacheClient.java     |  34 ++-
 .../internal/processors/rest/TestTask1.java     |  16 +-
 .../internal/processors/rest/TestTask2.java     |  16 +-
 .../rest/protocols/tcp/MockNioSession.java      |  15 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |  43 +--
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |  37 +--
 .../ignite/jdbc/JdbcConnectionSelfTest.java     |  25 +-
 .../ignite/jdbc/JdbcEmptyCacheSelfTest.java     |  25 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |  31 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |  45 +--
 .../jdbc/JdbcPreparedStatementSelfTest.java     |  53 ++--
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |  47 ++--
 .../ignite/jdbc/JdbcStatementSelfTest.java      |  34 ++-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |  13 +-
 .../loadtests/client/ClientCacheBenchmark.java  |  28 +-
 .../client/ClientMarshallerBenchmarkTest.java   |  27 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |   8 +-
 .../cloud/TcpDiscoveryCloudIpFinder.java        |  57 ++--
 .../TcpDiscoveryCloudIpFinderSelfTest.java      |  15 +-
 .../ignite/testsuites/IgniteCloudTestSuite.java |   9 +-
 .../ignite/codegen/MessageCodeGenerator.java    |  49 +++-
 .../src/main/java/org/apache/ignite/Ignite.java |  28 +-
 .../org/apache/ignite/IgniteAtomicLong.java     |   4 +-
 .../apache/ignite/IgniteAtomicReference.java    |   4 +-
 .../org/apache/ignite/IgniteAtomicSequence.java |   4 +-
 .../org/apache/ignite/IgniteAtomicStamped.java  |   7 +-
 .../ignite/IgniteAuthenticationException.java   |   2 +-
 .../java/org/apache/ignite/IgniteCache.java     |  65 +++--
 .../apache/ignite/IgniteCheckedException.java   |   6 +-
 .../IgniteClientDisconnectedException.java      |   6 +-
 .../java/org/apache/ignite/IgniteCluster.java   |  23 +-
 .../java/org/apache/ignite/IgniteCompute.java   |  33 ++-
 .../org/apache/ignite/IgniteCountDownLatch.java |   6 +-
 .../org/apache/ignite/IgniteDataStreamer.java   |  15 +-
 .../ignite/IgniteDeploymentException.java       |   4 +-
 .../java/org/apache/ignite/IgniteEvents.java    |  18 +-
 .../java/org/apache/ignite/IgniteException.java |   6 +-
 .../org/apache/ignite/IgniteFileSystem.java     |  25 +-
 .../ignite/IgniteIllegalStateException.java     |   6 +-
 .../ignite/IgniteInterruptedException.java      |   2 +-
 .../org/apache/ignite/IgniteJdbcDriver.java     |  18 +-
 .../java/org/apache/ignite/IgniteLogger.java    |   6 +-
 .../java/org/apache/ignite/IgniteMessaging.java |  17 +-
 .../java/org/apache/ignite/IgnitePortables.java |  26 +-
 .../java/org/apache/ignite/IgniteQueue.java     |  10 +-
 .../java/org/apache/ignite/IgniteScheduler.java |  13 +-
 .../java/org/apache/ignite/IgniteServices.java  |  20 +-
 .../main/java/org/apache/ignite/IgniteSet.java  |   8 +-
 .../java/org/apache/ignite/IgniteState.java     |   6 +-
 .../apache/ignite/IgniteSystemProperties.java   |  11 +-
 .../org/apache/ignite/IgniteTransactions.java   |  12 +-
 .../main/java/org/apache/ignite/Ignition.java   |  22 +-
 .../org/apache/ignite/IgnitionListener.java     |   7 +-
 .../CacheAtomicUpdateTimeoutException.java      |   4 +-
 .../ignite/cache/CacheAtomicWriteOrderMode.java |   4 +-
 .../apache/ignite/cache/CacheAtomicityMode.java |   6 +-
 .../org/apache/ignite/cache/CacheEntry.java     |  11 +-
 .../CacheEntryEventSerializableFilter.java      |   6 +-
 .../ignite/cache/CacheEntryProcessor.java       |   6 +-
 .../ignite/cache/CacheExistsException.java      |   7 +-
 .../apache/ignite/cache/CacheInterceptor.java   |  15 +-
 .../ignite/cache/CacheInterceptorAdapter.java   |   9 +-
 .../org/apache/ignite/cache/CacheManager.java   |  55 ++--
 .../apache/ignite/cache/CacheMemoryMode.java    |   4 +-
 .../org/apache/ignite/cache/CacheMetrics.java   |  10 +-
 .../java/org/apache/ignite/cache/CacheMode.java |   8 +-
 .../cache/CachePartialUpdateException.java      |   9 +-
 .../org/apache/ignite/cache/CachePeekMode.java  |   6 +-
 .../apache/ignite/cache/CacheRebalanceMode.java |   6 +-
 .../cache/CacheServerNotFoundException.java     |   4 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |   7 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |  19 +-
 .../cache/CacheWriteSynchronizationMode.java    |   6 +-
 .../apache/ignite/cache/CachingProvider.java    |  30 +-
 .../apache/ignite/cache/affinity/Affinity.java  |  10 +-
 .../affinity/AffinityCentralizedFunction.java   |   7 +-
 .../ignite/cache/affinity/AffinityFunction.java |  10 +-
 .../cache/affinity/AffinityFunctionContext.java |  13 +-
 .../ignite/cache/affinity/AffinityKey.java      |  15 +-
 .../cache/affinity/AffinityKeyMapped.java       |  10 +-
 .../cache/affinity/AffinityKeyMapper.java       |   4 +-
 .../AffinityNodeAddressHashResolver.java        |  11 +-
 .../affinity/AffinityNodeHashResolver.java      |   9 +-
 .../affinity/AffinityNodeIdHashResolver.java    |  11 +-
 .../ignite/cache/affinity/AffinityUuid.java     |   6 +-
 .../affinity/fair/FairAffinityFunction.java     |  34 ++-
 .../rendezvous/RendezvousAffinityFunction.java  |  49 +++-
 .../ignite/cache/eviction/EvictableEntry.java   |   7 +-
 .../ignite/cache/eviction/EvictionFilter.java   |   7 +-
 .../ignite/cache/eviction/EvictionPolicy.java   |  10 +-
 .../cache/eviction/fifo/FifoEvictionPolicy.java |  27 +-
 .../eviction/fifo/FifoEvictionPolicyMBean.java  |   4 +-
 .../cache/eviction/igfs/IgfsEvictionFilter.java |   9 +-
 .../igfs/IgfsPerBlockLruEvictionPolicy.java     |  35 ++-
 .../IgfsPerBlockLruEvictionPolicyMXBean.java    |   9 +-
 .../cache/eviction/lru/LruEvictionPolicy.java   |  27 +-
 .../eviction/lru/LruEvictionPolicyMBean.java    |   4 +-
 .../eviction/random/RandomEvictionPolicy.java   |  24 +-
 .../random/RandomEvictionPolicyMBean.java       |   4 +-
 .../eviction/sorted/SortedEvictionPolicy.java   |  36 ++-
 .../sorted/SortedEvictionPolicyMBean.java       |   4 +-
 .../ignite/cache/query/ContinuousQuery.java     |  11 +-
 .../org/apache/ignite/cache/query/Query.java    |   9 +-
 .../apache/ignite/cache/query/QueryCursor.java  |   4 +-
 .../apache/ignite/cache/query/QueryMetrics.java |   4 +-
 .../apache/ignite/cache/query/ScanQuery.java    |  13 +-
 .../org/apache/ignite/cache/query/SpiQuery.java |  13 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |  12 +-
 .../org/apache/ignite/cache/query/SqlQuery.java |  14 +-
 .../apache/ignite/cache/query/TextQuery.java    |  12 +-
 .../query/annotations/QueryGroupIndex.java      |   7 +-
 .../cache/query/annotations/QuerySqlField.java  |  11 +-
 .../query/annotations/QuerySqlFunction.java     |   8 +-
 .../cache/query/annotations/QueryTextField.java |  11 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |  36 ++-
 .../apache/ignite/cache/store/CacheStore.java   |  20 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |  12 +-
 .../ignite/cache/store/CacheStoreSession.java   |  11 +-
 .../cache/store/CacheStoreSessionListener.java  |  12 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |  83 ++++--
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |  57 ++--
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |  22 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |  31 +-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |  21 +-
 .../jdbc/CacheJdbcStoreSessionListener.java     |  22 +-
 .../store/jdbc/dialect/BasicJdbcDialect.java    |  10 +-
 .../cache/store/jdbc/dialect/DB2Dialect.java    |   8 +-
 .../cache/store/jdbc/dialect/H2Dialect.java     |   7 +-
 .../cache/store/jdbc/dialect/JdbcDialect.java   |   6 +-
 .../cache/store/jdbc/dialect/MySQLDialect.java  |   8 +-
 .../cache/store/jdbc/dialect/OracleDialect.java |   8 +-
 .../store/jdbc/dialect/SQLServerDialect.java    |   8 +-
 .../org/apache/ignite/cluster/ClusterGroup.java |  17 +-
 .../cluster/ClusterGroupEmptyException.java     |   4 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |   6 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |  20 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |   4 +-
 .../cluster/ClusterTopologyException.java       |   8 +-
 .../ComputeExecutionRejectedException.java      |   6 +-
 .../org/apache/ignite/compute/ComputeJob.java   |  10 +-
 .../ignite/compute/ComputeJobAdapter.java       |   9 +-
 .../ignite/compute/ComputeJobAfterSend.java     |   8 +-
 .../compute/ComputeJobBeforeFailover.java       |   8 +-
 .../ignite/compute/ComputeJobContext.java       |  10 +-
 .../ignite/compute/ComputeJobContinuation.java  |   4 +-
 .../compute/ComputeJobContinuationAdapter.java  |   6 +-
 .../compute/ComputeJobFailoverException.java    |  12 +-
 .../compute/ComputeJobMasterLeaveAware.java     |   4 +-
 .../apache/ignite/compute/ComputeJobResult.java |  10 +-
 .../ignite/compute/ComputeJobResultPolicy.java  |   7 +-
 .../ignite/compute/ComputeJobSibling.java       |   9 +-
 .../ignite/compute/ComputeLoadBalancer.java     |  12 +-
 .../org/apache/ignite/compute/ComputeTask.java  |  14 +-
 .../ignite/compute/ComputeTaskAdapter.java      |   9 +-
 .../compute/ComputeTaskCancelledException.java  |   6 +-
 .../compute/ComputeTaskContinuousMapper.java    |  11 +-
 .../ignite/compute/ComputeTaskFuture.java       |  10 +-
 .../ignite/compute/ComputeTaskMapAsync.java     |  10 +-
 .../apache/ignite/compute/ComputeTaskName.java  |   8 +-
 .../compute/ComputeTaskNoResultCache.java       |  10 +-
 .../ignite/compute/ComputeTaskSession.java      |  15 +-
 .../ComputeTaskSessionAttributeListener.java    |   4 +-
 .../compute/ComputeTaskSessionFullSupport.java  |  10 +-
 .../ignite/compute/ComputeTaskSessionScope.java |   4 +-
 .../apache/ignite/compute/ComputeTaskSpis.java  |   8 +-
 .../ignite/compute/ComputeTaskSplitAdapter.java |  17 +-
 .../compute/ComputeTaskTimeoutException.java    |   6 +-
 .../compute/ComputeUserUndeclaredException.java |   6 +-
 .../apache/ignite/compute/gridify/Gridify.java  |  15 +-
 .../ignite/compute/gridify/GridifyArgument.java |   4 +-
 .../ignite/compute/gridify/GridifyInput.java    |   8 +-
 .../compute/gridify/GridifyInterceptor.java     |   7 +-
 .../compute/gridify/GridifyNodeFilter.java      |   8 +-
 .../gridify/GridifyRuntimeException.java        |   4 +-
 .../ignite/compute/gridify/GridifySetToSet.java |  10 +-
 .../compute/gridify/GridifySetToValue.java      |  10 +-
 .../compute/gridify/GridifyTaskAdapter.java     |   7 +-
 .../gridify/GridifyTaskSplitAdapter.java        |   7 +-
 .../gridify/aop/GridifyArgumentAdapter.java     |   7 +-
 .../gridify/aop/GridifyDefaultRangeTask.java    |  46 ++-
 .../compute/gridify/aop/GridifyDefaultTask.java |  27 +-
 .../aop/GridifySetToSetAbstractAspect.java      |  27 +-
 .../aop/GridifySetToValueAbstractAspect.java    |  29 +-
 .../ignite/configuration/AddressResolver.java   |   9 +-
 .../configuration/AtomicConfiguration.java      |  10 +-
 .../configuration/CacheConfiguration.java       |  51 ++--
 .../configuration/CollectionConfiguration.java  |  23 +-
 .../configuration/ConnectorConfiguration.java   |  18 +-
 .../ConnectorMessageInterceptor.java            |   4 +-
 .../ignite/configuration/DeploymentMode.java    |   4 +-
 .../configuration/FileSystemConfiguration.java  |  17 +-
 .../configuration/HadoopConfiguration.java      |   6 +-
 .../configuration/IgniteConfiguration.java      | 106 +++----
 .../configuration/IgniteReflectionFactory.java  |  16 +-
 .../configuration/NearCacheConfiguration.java   |  13 +-
 .../configuration/PlatformConfiguration.java    |   2 +-
 .../ignite/configuration/TopologyValidator.java |   9 +-
 .../configuration/TransactionConfiguration.java |   9 +-
 .../org/apache/ignite/events/CacheEvent.java    |  18 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |  18 +-
 .../ignite/events/CacheQueryReadEvent.java      |  18 +-
 .../ignite/events/CacheRebalancingEvent.java    |   8 +-
 .../apache/ignite/events/CheckpointEvent.java   |   7 +-
 .../apache/ignite/events/DeploymentEvent.java   |   7 +-
 .../apache/ignite/events/DiscoveryEvent.java    |  12 +-
 .../java/org/apache/ignite/events/Event.java    |  11 +-
 .../org/apache/ignite/events/EventAdapter.java  |  12 +-
 .../apache/ignite/events/EventLocalOrder.java   |   4 +-
 .../org/apache/ignite/events/EventType.java     |   9 +-
 .../org/apache/ignite/events/IgfsEvent.java     |  19 +-
 .../java/org/apache/ignite/events/JobEvent.java |  12 +-
 .../apache/ignite/events/SwapSpaceEvent.java    |   9 +-
 .../org/apache/ignite/events/TaskEvent.java     |  14 +-
 .../apache/ignite/igfs/IgfsBlockLocation.java   |   5 +-
 .../IgfsConcurrentModificationException.java    |   4 +-
 .../ignite/igfs/IgfsCorruptedFileException.java |   4 +-
 .../igfs/IgfsDirectoryNotEmptyException.java    |   4 +-
 .../org/apache/ignite/igfs/IgfsException.java   |   6 +-
 .../java/org/apache/ignite/igfs/IgfsFile.java   |   7 +-
 .../igfs/IgfsGroupDataBlocksKeyMapper.java      |   9 +-
 .../org/apache/ignite/igfs/IgfsInputStream.java |   5 +-
 .../igfs/IgfsInvalidHdfsVersionException.java   |   4 +-
 .../ignite/igfs/IgfsInvalidPathException.java   |   4 +-
 .../igfs/IgfsIpcEndpointConfiguration.java      |  10 +-
 .../apache/ignite/igfs/IgfsIpcEndpointType.java |   2 +-
 .../org/apache/ignite/igfs/IgfsMetrics.java     |   2 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |   4 +-
 .../ignite/igfs/IgfsOutOfSpaceException.java    |   4 +-
 .../apache/ignite/igfs/IgfsOutputStream.java    |   6 +-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |  23 +-
 .../igfs/IgfsPathAlreadyExistsException.java    |   5 +-
 .../igfs/IgfsPathIsDirectoryException.java      |   4 +-
 .../igfs/IgfsPathIsNotDirectoryException.java   |   4 +-
 .../ignite/igfs/IgfsPathNotFoundException.java  |   4 +-
 .../org/apache/ignite/igfs/IgfsPathSummary.java |  10 +-
 .../org/apache/ignite/igfs/IgfsUserContext.java |  11 +-
 .../ignite/igfs/mapreduce/IgfsFileRange.java    |   6 +-
 .../mapreduce/IgfsInputStreamJobAdapter.java    |  12 +-
 .../apache/ignite/igfs/mapreduce/IgfsJob.java   |  10 +-
 .../ignite/igfs/mapreduce/IgfsJobAdapter.java   |   2 +-
 .../igfs/mapreduce/IgfsRangeInputStream.java    |  12 +-
 .../igfs/mapreduce/IgfsRecordResolver.java      |  13 +-
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |  32 ++-
 .../ignite/igfs/mapreduce/IgfsTaskArgs.java     |   7 +-
 .../igfs/mapreduce/IgfsTaskNoReduceAdapter.java |   7 +-
 .../IgfsByteDelimiterRecordResolver.java        |  31 +-
 .../records/IgfsFixedLengthRecordResolver.java  |  18 +-
 .../records/IgfsNewLineRecordResolver.java      |   7 +-
 .../IgfsStringDelimiterRecordResolver.java      |  11 +-
 .../igfs/secondary/IgfsSecondaryFileSystem.java |  15 +-
 ...fsSecondaryFileSystemPositionedReadable.java |   5 +-
 .../ignite/internal/AsyncSupportAdapter.java    |   9 +-
 .../ClusterLocalNodeMetricsMXBeanImpl.java      |   8 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |  24 +-
 .../internal/ComputeTaskInternalFuture.java     |  35 ++-
 .../ignite/internal/GridCachePluginContext.java |  13 +-
 .../ignite/internal/GridClosureCallMode.java    |   4 +-
 .../apache/ignite/internal/GridComponent.java   |  17 +-
 .../apache/ignite/internal/GridDiagnostic.java  |  20 +-
 .../ignite/internal/GridDirectCollection.java   |  10 +-
 .../apache/ignite/internal/GridDirectMap.java   |   7 +-
 .../ignite/internal/GridDirectTransient.java    |   7 +-
 .../internal/GridEventConsumeHandler.java       |  54 ++--
 .../ignite/internal/GridInternalException.java  |   9 +-
 .../ignite/internal/GridInternalWrapper.java    |   2 +-
 .../ignite/internal/GridJobCancelRequest.java   |  17 +-
 .../ignite/internal/GridJobContextImpl.java     |  35 ++-
 .../ignite/internal/GridJobExecuteRequest.java  |  32 ++-
 .../ignite/internal/GridJobExecuteResponse.java |  24 +-
 .../ignite/internal/GridJobResultImpl.java      |  19 +-
 .../ignite/internal/GridJobSessionImpl.java     |  24 +-
 .../ignite/internal/GridJobSiblingImpl.java     |  30 +-
 .../ignite/internal/GridJobSiblingsRequest.java |  15 +-
 .../internal/GridJobSiblingsResponse.java       |  23 +-
 .../ignite/internal/GridKernalContext.java      |  96 ++++---
 .../ignite/internal/GridKernalContextImpl.java  | 133 +++++----
 .../ignite/internal/GridKernalGateway.java      |   7 +-
 .../ignite/internal/GridKernalGatewayImpl.java  |  23 +-
 .../apache/ignite/internal/GridKernalState.java |   4 +-
 .../apache/ignite/internal/GridLoggerProxy.java |  31 +-
 .../internal/GridMessageListenHandler.java      |  27 +-
 .../internal/GridNodeOrderComparator.java       |   9 +-
 .../internal/GridPerformanceSuggestions.java    |  18 +-
 .../ignite/internal/GridPluginComponent.java    |  20 +-
 .../ignite/internal/GridPluginContext.java      |  18 +-
 .../ignite/internal/GridProxyListener.java      |   4 +-
 .../ignite/internal/GridTaskCancelRequest.java  |  15 +-
 .../ignite/internal/GridTaskNameHashKey.java    |  10 +-
 .../ignite/internal/GridTaskSessionImpl.java    |  36 ++-
 .../internal/GridTaskSessionInternal.java       |  11 +-
 .../ignite/internal/GridTaskSessionRequest.java |  17 +-
 .../org/apache/ignite/internal/GridTopic.java   |  20 +-
 .../ignite/internal/GridUpdateNotifier.java     |  52 ++--
 ...gniteClientDisconnectedCheckedException.java |   6 +-
 .../internal/IgniteCodeGeneratingFail.java      |   7 +-
 .../ignite/internal/IgniteComponentType.java    |  13 +-
 .../ignite/internal/IgniteComputeImpl.java      |  52 ++--
 .../IgniteDeploymentCheckedException.java       |   6 +-
 .../ignite/internal/IgniteEventsImpl.java       |  32 ++-
 .../org/apache/ignite/internal/IgniteEx.java    |  22 +-
 .../IgniteFutureCancelledCheckedException.java  |   6 +-
 .../IgniteFutureTimeoutCheckedException.java    |   6 +-
 .../ignite/internal/IgniteInternalFuture.java   |  11 +-
 .../IgniteInterruptedCheckedException.java      |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    | 274 +++++++++++++-----
 .../ignite/internal/IgniteMessagingImpl.java    |  31 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   2 +-
 .../ignite/internal/IgniteProperties.java       |   7 +-
 .../ignite/internal/IgniteSchedulerImpl.java    |  21 +-
 .../ignite/internal/IgniteServicesImpl.java     |  28 +-
 .../ignite/internal/IgniteTransactionsEx.java   |  11 +-
 .../ignite/internal/IgniteVersionUtils.java     |   9 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 161 +++++++----
 .../ignite/internal/IgnitionMXBeanAdapter.java  |   7 +-
 .../internal/MarshallerContextAdapter.java      |  34 ++-
 .../ignite/internal/MarshallerContextImpl.java  |  31 +-
 .../org/apache/ignite/internal/SkipDaemon.java  |   7 +-
 .../internal/ThreadPoolMXBeanAdapter.java       |  13 +-
 .../ignite/internal/client/GridClient.java      |   5 +-
 .../GridClientAuthenticationException.java      |   2 +-
 .../internal/client/GridClientCacheFlag.java    |   4 +-
 .../internal/client/GridClientCacheMode.java    |   2 +-
 .../client/GridClientClosedException.java       |   2 +-
 .../internal/client/GridClientCompute.java      |  11 +-
 .../client/GridClientConfiguration.java         |  35 ++-
 .../ignite/internal/client/GridClientData.java  |   7 +-
 .../internal/client/GridClientDataAffinity.java |   4 +-
 .../client/GridClientDataConfiguration.java     |   5 +-
 .../internal/client/GridClientDataMetrics.java  |   4 +-
 .../client/GridClientDisconnectedException.java |   2 +-
 .../internal/client/GridClientException.java    |   6 +-
 .../internal/client/GridClientFactory.java      |  13 +-
 .../internal/client/GridClientFuture.java       |   4 +-
 .../client/GridClientFutureListener.java        |   2 +-
 .../GridClientFutureTimeoutException.java       |   2 +-
 .../client/GridClientHandshakeException.java    |   2 +-
 .../ignite/internal/client/GridClientNode.java  |  12 +-
 .../internal/client/GridClientNodeMetrics.java  |   4 +-
 .../client/GridClientPartitionAffinity.java     |  15 +-
 .../internal/client/GridClientPredicate.java    |   2 +-
 .../internal/client/GridClientProtocol.java     |   2 +-
 .../client/GridClientTopologyListener.java      |   2 +-
 .../client/GridServerUnreachableException.java  |   2 +-
 .../balancer/GridClientBalancerAdapter.java     |  11 +-
 .../client/balancer/GridClientLoadBalancer.java |   8 +-
 .../balancer/GridClientRandomBalancer.java      |  10 +-
 .../balancer/GridClientRoundRobinBalancer.java  |  18 +-
 .../impl/GridClientAbstractProjection.java      |  39 ++-
 .../client/impl/GridClientAndPredicate.java     |   4 +-
 .../client/impl/GridClientComputeImpl.java      |  30 +-
 .../client/impl/GridClientDataImpl.java         |  32 ++-
 .../impl/GridClientDataMetricsAdapter.java      |   4 +-
 .../client/impl/GridClientFutureAdapter.java    |  20 +-
 .../client/impl/GridClientFutureCallback.java   |   5 +-
 .../internal/client/impl/GridClientImpl.java    |  66 +++--
 .../client/impl/GridClientNodeImpl.java         |  23 +-
 .../impl/GridClientNodeMetricsAdapter.java      |   4 +-
 .../client/impl/GridClientThreadFactory.java    |   9 +-
 .../impl/connection/GridClientConnection.java   |  29 +-
 .../GridClientConnectionCloseReason.java        |   2 +-
 .../connection/GridClientConnectionManager.java |  15 +-
 .../GridClientConnectionManagerAdapter.java     |  79 ++++--
 .../GridClientConnectionManagerOsImpl.java      |  13 +-
 .../GridClientConnectionResetException.java     |   4 +-
 .../connection/GridClientNioTcpConnection.java  | 105 +++++--
 .../impl/connection/GridClientTopology.java     |  45 ++-
 .../GridConnectionIdleClosedException.java      |   2 +-
 .../client/marshaller/GridClientMarshaller.java |   6 +-
 .../marshaller/jdk/GridClientJdkMarshaller.java |  16 +-
 .../GridClientOptimizedMarshaller.java          |  24 +-
 .../client/router/GridRouterFactory.java        |  17 +-
 .../internal/client/router/GridTcpRouter.java   |   4 +-
 .../router/GridTcpRouterConfiguration.java      |  22 +-
 .../client/router/GridTcpRouterMBean.java       |   7 +-
 .../router/impl/GridRouterClientImpl.java       |  40 ++-
 .../impl/GridRouterCommandLineStartup.java      |  32 ++-
 .../client/router/impl/GridTcpRouterImpl.java   |  52 ++--
 .../impl/GridTcpRouterNioListenerAdapter.java   |  41 ++-
 .../impl/GridTcpRouterNioListenerOsImpl.java    |   4 +-
 .../router/impl/GridTcpRouterNioParser.java     |  28 +-
 .../client/ssl/GridSslBasicContextFactory.java  |  27 +-
 .../client/ssl/GridSslContextFactory.java       |   7 +-
 .../client/util/GridClientConsistentHash.java   |  25 +-
 .../client/util/GridClientStripedLock.java      |   5 +-
 .../internal/client/util/GridClientUtils.java   |  22 +-
 .../client/util/GridConcurrentHashSet.java      |   9 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  60 ++--
 .../ClusterGroupEmptyCheckedException.java      |   4 +-
 .../ignite/internal/cluster/ClusterGroupEx.java |  10 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |  21 +-
 .../cluster/ClusterStartNodeResultImpl.java     |   4 +-
 .../ClusterTopologyCheckedException.java        |   8 +-
 .../ClusterTopologyServerNotFoundException.java |   2 +-
 .../cluster/IgniteClusterAsyncImpl.java         |  34 ++-
 .../internal/cluster/IgniteClusterEx.java       |   4 +-
 .../internal/cluster/IgniteClusterImpl.java     |  70 +++--
 .../ignite/internal/cluster/IgniteKillTask.java |  24 +-
 .../ComputeTaskCancelledCheckedException.java   |   6 +-
 .../ComputeTaskTimeoutCheckedException.java     |   6 +-
 .../internal/direct/DirectByteBufferStream.java |  32 ++-
 .../internal/direct/DirectMessageReader.java    |  20 +-
 .../internal/direct/DirectMessageWriter.java    |  18 +-
 .../direct/DirectMessageWriterState.java        |   4 +-
 .../internal/events/DiscoveryCustomEvent.java   |  11 +-
 .../internal/executor/GridExecutorService.java  |  47 +++-
 .../igfs/common/IgfsControlResponse.java        |  42 ++-
 .../igfs/common/IgfsDataInputStream.java        |   7 +-
 .../igfs/common/IgfsDataOutputStream.java       |   8 +-
 .../igfs/common/IgfsHandshakeRequest.java       |   6 +-
 .../internal/igfs/common/IgfsIpcCommand.java    |   5 +-
 .../ignite/internal/igfs/common/IgfsLogger.java |  34 ++-
 .../internal/igfs/common/IgfsMarshaller.java    |  26 +-
 .../internal/igfs/common/IgfsMessage.java       |   2 +-
 .../igfs/common/IgfsPathControlRequest.java     |  13 +-
 .../internal/igfs/common/IgfsStatusRequest.java |   4 +-
 .../igfs/common/IgfsStreamControlRequest.java   |   6 +-
 .../ignite/internal/jdbc/JdbcConnection.java    |  47 +++-
 .../internal/jdbc/JdbcConnectionInfo.java       |   2 +-
 .../internal/jdbc/JdbcDatabaseMetadata.java     |  30 +-
 .../internal/jdbc/JdbcPreparedStatement.java    |  27 +-
 .../ignite/internal/jdbc/JdbcResultSet.java     |  38 ++-
 .../internal/jdbc/JdbcResultSetMetadata.java    |   7 +-
 .../ignite/internal/jdbc/JdbcStatement.java     |  25 +-
 .../apache/ignite/internal/jdbc/JdbcUtils.java  |  37 ++-
 .../ignite/internal/managers/GridManager.java   |   6 +-
 .../internal/managers/GridManagerAdapter.java   |  69 +++--
 .../checkpoint/GridCheckpointManager.java       |  65 +++--
 .../checkpoint/GridCheckpointRequest.java       |  15 +-
 .../GridCollisionJobContextAdapter.java         |  11 +-
 .../collision/GridCollisionManager.java         |  23 +-
 .../communication/GridDisconnectListener.java   |   4 +-
 .../managers/communication/GridIoManager.java   | 118 +++++---
 .../managers/communication/GridIoMessage.java   |  17 +-
 .../communication/GridIoMessageFactory.java     | 142 +++++++---
 .../managers/communication/GridIoPolicy.java    |   2 +-
 .../communication/GridIoUserMessage.java        |  31 +-
 .../GridLifecycleAwareMessageFilter.java        |   6 +-
 .../communication/GridMessageListener.java      |   5 +-
 .../managers/deployment/GridDeployment.java     |  50 ++--
 .../deployment/GridDeploymentClassLoader.java   |  40 ++-
 .../deployment/GridDeploymentCommunication.java |  50 ++--
 .../managers/deployment/GridDeploymentInfo.java |  10 +-
 .../deployment/GridDeploymentInfoBean.java      |  29 +-
 .../deployment/GridDeploymentLocalStore.java    |  59 ++--
 .../deployment/GridDeploymentManager.java       |  46 +--
 .../deployment/GridDeploymentMetadata.java      |  17 +-
 .../GridDeploymentPerLoaderStore.java           |  49 ++--
 .../GridDeploymentPerVersionStore.java          |  65 +++--
 .../deployment/GridDeploymentRequest.java       |  24 +-
 .../deployment/GridDeploymentResponse.java      |  15 +-
 .../deployment/GridDeploymentStore.java         |  13 +-
 .../deployment/GridDeploymentStoreAdapter.java  |  20 +-
 .../protocol/gg/GridProtocolHandler.java        |  11 +-
 .../protocol/gg/GridUrlConnection.java          |  14 +-
 .../managers/discovery/CustomEventListener.java |   4 +-
 .../discovery/CustomMessageWrapper.java         |   6 +-
 .../discovery/DiscoveryCustomMessage.java       |  11 +-
 .../discovery/GridDiscoveryManager.java         | 156 +++++++---
 .../GridDiscoveryTopologySnapshot.java          |  11 +-
 .../managers/discovery/GridLocalMetrics.java    |   4 +-
 .../eventstorage/GridEventStorageManager.java   |  86 ++++--
 .../eventstorage/GridEventStorageMessage.java   |  30 +-
 .../eventstorage/GridLocalEventListener.java    |   7 +-
 .../failover/GridFailoverContextImpl.java       |  22 +-
 .../managers/failover/GridFailoverManager.java  |  20 +-
 .../managers/indexing/GridIndexingManager.java  |  22 +-
 .../loadbalancer/GridLoadBalancerAdapter.java   |  12 +-
 .../loadbalancer/GridLoadBalancerManager.java   |  27 +-
 .../swapspace/GridSwapSpaceManager.java         |  46 +--
 .../internal/mxbean/IgniteStandardMXBean.java   |  21 +-
 .../portable/GridPortableMarshaller.java        |  10 +-
 .../portable/PortableAbstractLazyValue.java     |   2 +-
 .../internal/portable/PortableBuilderEnum.java  |   6 +-
 .../internal/portable/PortableBuilderImpl.java  |  34 ++-
 .../portable/PortableBuilderReader.java         |  15 +-
 .../PortableBuilderSerializationAware.java      |   2 +-
 .../portable/PortableBuilderSerializer.java     |  11 +-
 .../portable/PortableClassDescriptor.java       |  43 +--
 .../internal/portable/PortableContext.java      |  74 +++--
 .../portable/PortableEnumArrayLazyValue.java    |   7 +-
 .../portable/PortableLazyArrayList.java         |   7 +-
 .../portable/PortableLazyLinkedList.java        |   9 +-
 .../internal/portable/PortableLazyMap.java      |  12 +-
 .../internal/portable/PortableLazyMapEntry.java |   4 +-
 .../internal/portable/PortableLazySet.java      |   8 +-
 .../internal/portable/PortableLazyValue.java    |   2 +-
 .../portable/PortableMetaDataCollector.java     |  23 +-
 .../portable/PortableMetaDataHandler.java       |   5 +-
 .../internal/portable/PortableMetaDataImpl.java |  28 +-
 .../portable/PortableObjectArrayLazyValue.java  |   6 +-
 .../internal/portable/PortableObjectEx.java     |  21 +-
 .../internal/portable/PortableObjectImpl.java   |  36 ++-
 .../portable/PortableObjectOffheapImpl.java     |  33 ++-
 .../portable/PortablePlainLazyValue.java        |   2 +-
 .../portable/PortablePlainPortableObject.java   |   4 +-
 .../internal/portable/PortablePrimitives.java   |  10 +-
 .../internal/portable/PortableRawReaderEx.java  |   8 +-
 .../internal/portable/PortableRawWriterEx.java  |  10 +-
 .../portable/PortableReaderContext.java         |  13 +-
 .../internal/portable/PortableReaderExImpl.java | 109 +++++--
 .../PortableThreadLocalMemoryAllocator.java     |  11 +-
 .../ignite/internal/portable/PortableUtils.java |  65 ++++-
 .../portable/PortableValueWithType.java         |   6 +-
 .../internal/portable/PortableWriterExImpl.java |  81 ++++--
 .../streams/PortableAbstractInputStream.java    |   4 +-
 .../streams/PortableAbstractOutputStream.java   |   2 +-
 .../streams/PortableAbstractStream.java         |  10 +-
 .../streams/PortableHeapInputStream.java        |   4 +-
 .../streams/PortableHeapOutputStream.java       |   5 +-
 .../portable/streams/PortableInputStream.java   |   2 +-
 .../streams/PortableMemoryAllocator.java        |   2 +-
 .../streams/PortableOffheapInputStream.java     |   2 +-
 .../streams/PortableOffheapOutputStream.java    |   2 +-
 .../portable/streams/PortableOutputStream.java  |   2 +-
 .../streams/PortableSimpleMemoryAllocator.java  |   7 +-
 .../portable/streams/PortableStream.java        |   2 +-
 .../internal/processors/GridProcessor.java      |   6 +-
 .../processors/GridProcessorAdapter.java        |  23 +-
 .../affinity/AffinityTopologyVersion.java       |  16 +-
 .../affinity/GridAffinityAssignment.java        |  17 +-
 .../affinity/GridAffinityAssignmentCache.java   |  47 ++--
 .../GridAffinityFunctionContextImpl.java        |  14 +-
 .../affinity/GridAffinityMessage.java           |  21 +-
 .../affinity/GridAffinityProcessor.java         |  80 ++++--
 .../processors/affinity/GridAffinityUtils.java  |  41 +--
 ...acheAtomicUpdateTimeoutCheckedException.java |   4 +-
 .../processors/cache/CacheEntryImpl.java        |  14 +-
 .../processors/cache/CacheEntryImpl0.java       |  11 +-
 .../processors/cache/CacheEntryImplEx.java      |  13 +-
 .../cache/CacheEntryInfoCollection.java         |  15 +-
 .../processors/cache/CacheEntryPredicate.java   |   8 +-
 .../cache/CacheEntryPredicateAdapter.java       |  13 +-
 .../cache/CacheEntryPredicateContainsValue.java |  17 +-
 .../cache/CacheEntryPredicateHasValue.java      |   2 +-
 .../cache/CacheEntryPredicateNoValue.java       |   2 +-
 .../cache/CacheEntrySerializablePredicate.java  |  14 +-
 .../cache/CacheEvictableEntryImpl.java          |  23 +-
 .../processors/cache/CacheEvictionEntry.java    |  15 +-
 .../cache/CacheInvokeDirectResult.java          |  22 +-
 .../processors/cache/CacheInvokeEntry.java      |  14 +-
 .../processors/cache/CacheInvokeResult.java     |  17 +-
 .../cache/CacheIteratorConverter.java           |   2 +-
 .../processors/cache/CacheLazyEntry.java        |  12 +-
 .../processors/cache/CacheLockImpl.java         |  21 +-
 .../processors/cache/CacheMetricsImpl.java      |  19 +-
 .../cache/CacheMetricsMXBeanImpl.java           |   6 +-
 .../processors/cache/CacheMetricsSnapshot.java  |  14 +-
 .../internal/processors/cache/CacheObject.java  |   8 +-
 .../processors/cache/CacheObjectAdapter.java    |  19 +-
 .../cache/CacheObjectByteArrayImpl.java         |  22 +-
 .../processors/cache/CacheObjectContext.java    |  11 +-
 .../processors/cache/CacheObjectImpl.java       |   7 +-
 .../processors/cache/CacheOperationContext.java |  15 +-
 .../cache/CacheOsConflictResolutionManager.java |   8 +-
 .../CachePartialUpdateCheckedException.java     |  11 +-
 .../processors/cache/CachePeekModes.java        |   4 +-
 .../cache/CacheStoreBalancingWrapper.java       |  30 +-
 .../cache/CacheStorePartialUpdateException.java |   7 +-
 .../internal/processors/cache/CacheType.java    |   5 +-
 .../cache/CacheWeakQueryIteratorsHolder.java    |  21 +-
 .../cache/DynamicCacheChangeBatch.java          |  17 +-
 .../cache/DynamicCacheChangeRequest.java        |  16 +-
 .../cache/DynamicCacheDescriptor.java           |  20 +-
 .../processors/cache/GridCacheAdapter.java      | 185 ++++++++----
 .../cache/GridCacheAffinityManager.java         |  31 +-
 .../processors/cache/GridCacheAtomicFuture.java |   9 +-
 .../cache/GridCacheAtomicVersionComparator.java |   4 +-
 .../processors/cache/GridCacheAttributes.java   |  30 +-
 .../cache/GridCacheBatchSwapEntry.java          |  11 +-
 .../cache/GridCacheClearAllRunnable.java        |  18 +-
 .../cache/GridCacheConcurrentMap.java           |  60 ++--
 .../processors/cache/GridCacheContext.java      | 142 ++++++----
 .../GridCacheDefaultAffinityKeyMapper.java      |  29 +-
 .../cache/GridCacheDeploymentManager.java       |  68 +++--
 .../processors/cache/GridCacheEntryEx.java      |  34 +--
 .../processors/cache/GridCacheEntryInfo.java    |  20 +-
 .../GridCacheEntryInfoCollectSwapListener.java  |  10 +-
 .../processors/cache/GridCacheEntrySet.java     |  22 +-
 .../processors/cache/GridCacheEventManager.java |  30 +-
 .../cache/GridCacheEvictionManager.java         | 121 +++++---
 .../cache/GridCacheEvictionRequest.java         |  28 +-
 .../cache/GridCacheEvictionResponse.java        |  22 +-
 .../cache/GridCacheExplicitLockSpan.java        |  28 +-
 .../cache/GridCacheFilterFailedException.java   |   4 +-
 .../processors/cache/GridCacheFuture.java       |  14 +-
 .../processors/cache/GridCacheGateway.java      |  24 +-
 .../cache/GridCacheIndexUpdateException.java    |   6 +-
 .../processors/cache/GridCacheInternal.java     |   2 +-
 .../processors/cache/GridCacheIoManager.java    |  80 ++++--
 .../processors/cache/GridCacheIterator.java     |  14 +-
 .../processors/cache/GridCacheKeySet.java       |  18 +-
 .../cache/GridCacheLoaderWriterStore.java       |  22 +-
 .../GridCacheLoaderWriterStoreFactory.java      |  12 +-
 .../processors/cache/GridCacheLogger.java       |  23 +-
 .../processors/cache/GridCacheManager.java      |   6 +-
 .../cache/GridCacheManagerAdapter.java          |  12 +-
 .../processors/cache/GridCacheMapEntry.java     |  85 ++++--
 .../cache/GridCacheMapEntryFactory.java         |   6 +-
 .../processors/cache/GridCacheMessage.java      |  37 ++-
 .../cache/GridCacheMultiTxFuture.java           |  25 +-
 .../processors/cache/GridCacheMvcc.java         |  32 ++-
 .../processors/cache/GridCacheMvccCallback.java |   4 +-
 .../cache/GridCacheMvccCandidate.java           |  47 +++-
 .../processors/cache/GridCacheMvccFuture.java   |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  78 +++--
 .../cache/GridCacheOffheapSwapEntry.java        |  15 +-
 .../GridCachePartitionExchangeManager.java      | 105 ++++---
 .../processors/cache/GridCachePreloader.java    |  18 +-
 .../cache/GridCachePreloaderAdapter.java        |  23 +-
 .../processors/cache/GridCacheProcessor.java    | 186 ++++++++----
 .../processors/cache/GridCacheProxyImpl.java    |  54 ++--
 .../processors/cache/GridCacheReturn.java       |  35 ++-
 .../cache/GridCacheSharedContext.java           |  60 ++--
 .../cache/GridCacheSharedManager.java           |   6 +-
 .../cache/GridCacheSharedManagerAdapter.java    |  12 +-
 .../processors/cache/GridCacheSwapEntry.java    |   8 +-
 .../cache/GridCacheSwapEntryImpl.java           |  20 +-
 .../processors/cache/GridCacheSwapListener.java |   4 +-
 .../processors/cache/GridCacheSwapManager.java  |  75 +++--
 .../cache/GridCacheTryPutFailedException.java   |   4 +-
 .../processors/cache/GridCacheTtlManager.java   |  24 +-
 .../cache/GridCacheUpdateAtomicResult.java      |  16 +-
 .../cache/GridCacheUpdateTxResult.java          |   8 +-
 .../processors/cache/GridCacheUtilityKey.java   |   4 +-
 .../processors/cache/GridCacheUtils.java        | 130 ++++++---
 .../cache/GridCacheValueCollection.java         |  22 +-
 .../cache/IgniteCacheExpiryPolicy.java          |  15 +-
 .../processors/cache/IgniteCacheFutureImpl.java |  17 +-
 .../processors/cache/IgniteCacheProxy.java      |  96 +++++--
 .../processors/cache/IgniteInternalCache.java   |  53 ++--
 .../processors/cache/KeyCacheObject.java        |   2 +-
 .../processors/cache/KeyCacheObjectImpl.java    |   6 +-
 .../processors/cache/QueryCursorImpl.java       |  14 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |  28 +-
 .../cache/affinity/GridCacheAffinityProxy.java  |  22 +-
 .../CacheDataStructuresManager.java             |  78 +++--
 .../distributed/GridCacheCommittedTxInfo.java   |  22 +-
 .../distributed/GridCacheMappedVersion.java     |   6 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |  30 +-
 .../distributed/GridCacheTxFinishSync.java      |  27 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |  40 +--
 .../distributed/GridCacheTxRecoveryRequest.java |  18 +-
 .../GridCacheTxRecoveryResponse.java            |  16 +-
 .../distributed/GridDistributedBaseMessage.java |  32 ++-
 .../GridDistributedCacheAdapter.java            |  72 +++--
 .../distributed/GridDistributedCacheEntry.java  |  35 ++-
 .../distributed/GridDistributedLockRequest.java |  40 +--
 .../GridDistributedLockResponse.java            |  36 ++-
 .../GridDistributedTxFinishRequest.java         |  24 +-
 .../GridDistributedTxFinishResponse.java        |  18 +-
 .../distributed/GridDistributedTxMapping.java   |  34 ++-
 .../GridDistributedTxPrepareRequest.java        |  42 ++-
 .../GridDistributedTxPrepareResponse.java       |  21 +-
 .../GridDistributedTxRemoteAdapter.java         |  85 ++++--
 .../GridDistributedUnlockRequest.java           |  26 +-
 .../GridFutureRemapTimeoutObject.java           |  13 +-
 .../IgniteExternalizableExpiryPolicy.java       |  18 +-
 .../dht/GridClientPartitionTopology.java        |  48 ++--
 .../dht/GridDhtAffinityAssignmentRequest.java   |  16 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |  29 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |  37 +--
 .../cache/distributed/dht/GridDhtCache.java     |  15 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  91 ++++--
 .../distributed/dht/GridDhtCacheEntry.java      |  49 ++--
 .../distributed/dht/GridDhtEmbeddedFuture.java  |  16 +-
 .../distributed/dht/GridDhtFinishedFuture.java  |  10 +-
 .../cache/distributed/dht/GridDhtFuture.java    |   7 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  52 ++--
 .../dht/GridDhtInvalidPartitionException.java   |   2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  73 +++--
 .../distributed/dht/GridDhtLockFuture.java      |  84 ++++--
 .../distributed/dht/GridDhtLockRequest.java     |  47 ++--
 .../distributed/dht/GridDhtLockResponse.java    |  38 +--
 .../dht/GridDhtOffHeapCacheEntry.java           |   9 +-
 .../distributed/dht/GridDhtPartitionState.java  |   4 +-
 .../dht/GridDhtPartitionTopology.java           |  22 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  59 ++--
 .../dht/GridDhtPartitionsReservation.java       |  16 +-
 .../distributed/dht/GridDhtTopologyFuture.java  |   8 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  92 ++++--
 .../distributed/dht/GridDhtTxFinishFuture.java  |  52 ++--
 .../distributed/dht/GridDhtTxFinishRequest.java |  34 ++-
 .../dht/GridDhtTxFinishResponse.java            |  18 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |  65 +++--
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  79 ++++--
 .../cache/distributed/dht/GridDhtTxMapping.java |  21 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  99 +++++--
 .../dht/GridDhtTxPrepareRequest.java            |  45 +--
 .../dht/GridDhtTxPrepareResponse.java           |  40 ++-
 .../cache/distributed/dht/GridDhtTxRemote.java  |  49 ++--
 .../distributed/dht/GridDhtUnlockRequest.java   |  25 +-
 .../GridDhtUnreservedPartitionException.java    |   6 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |  20 +-
 .../dht/GridPartitionedGetFuture.java           |  72 +++--
 .../cache/distributed/dht/GridReservable.java   |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 138 ++++++---
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |  14 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |  22 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |   9 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  59 ++--
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  46 +--
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  32 ++-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  77 +++--
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  58 ++--
 .../atomic/GridNearAtomicUpdateResponse.java    |  41 ++-
 .../dht/colocated/GridDhtColocatedCache.java    |  78 +++--
 .../colocated/GridDhtColocatedCacheEntry.java   |  13 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  81 ++++--
 .../GridDhtColocatedOffHeapCacheEntry.java      |   9 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |  17 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |  70 +++--
 .../dht/preloader/GridDhtForceKeysRequest.java  |  33 ++-
 .../dht/preloader/GridDhtForceKeysResponse.java |  34 ++-
 .../GridDhtPartitionDemandMessage.java          |  30 +-
 .../preloader/GridDhtPartitionDemandPool.java   |  93 ++++--
 .../preloader/GridDhtPartitionExchangeId.java   |  31 +-
 .../dht/preloader/GridDhtPartitionFullMap.java  |  16 +-
 .../dht/preloader/GridDhtPartitionMap.java      |  22 +-
 .../GridDhtPartitionSupplyMessage.java          |  35 ++-
 .../preloader/GridDhtPartitionSupplyPool.java   |  56 ++--
 .../GridDhtPartitionsAbstractMessage.java       |  18 +-
 .../GridDhtPartitionsExchangeFuture.java        |  95 +++++--
 .../preloader/GridDhtPartitionsFullMessage.java |  30 +-
 .../GridDhtPartitionsSingleMessage.java         |  27 +-
 .../GridDhtPartitionsSingleRequest.java         |  12 +-
 .../dht/preloader/GridDhtPreloader.java         |  72 +++--
 .../preloader/GridDhtPreloaderAssignments.java  |  12 +-
 .../distributed/near/CacheVersionedValue.java   |  21 +-
 .../distributed/near/GridNearAtomicCache.java   |  75 +++--
 .../distributed/near/GridNearCacheAdapter.java  |  72 +++--
 .../near/GridNearCacheClearAllRunnable.java     |   9 +-
 .../distributed/near/GridNearCacheEntry.java    |  40 +--
 .../distributed/near/GridNearGetFuture.java     |  77 +++--
 .../distributed/near/GridNearGetRequest.java    |  43 +--
 .../distributed/near/GridNearGetResponse.java   |  40 +--
 .../distributed/near/GridNearLockFuture.java    |  78 +++--
 .../distributed/near/GridNearLockMapping.java   |  17 +-
 .../distributed/near/GridNearLockRequest.java   |  40 +--
 .../distributed/near/GridNearLockResponse.java  |  33 +--
 .../near/GridNearOffHeapCacheEntry.java         |   7 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  74 +++--
 .../GridNearPessimisticTxPrepareFuture.java     |  54 ++--
 .../near/GridNearTransactionalCache.java        |  64 +++--
 .../near/GridNearTxFinishFuture.java            |  58 ++--
 .../near/GridNearTxFinishRequest.java           |  26 +-
 .../near/GridNearTxFinishResponse.java          |  26 +-
 .../cache/distributed/near/GridNearTxLocal.java |  90 ++++--
 .../near/GridNearTxPrepareFutureAdapter.java    |  47 ++--
 .../near/GridNearTxPrepareRequest.java          |  37 +--
 .../near/GridNearTxPrepareResponse.java         |  45 +--
 .../distributed/near/GridNearTxRemote.java      |  39 ++-
 .../distributed/near/GridNearUnlockRequest.java |  14 +-
 .../cache/dr/GridCacheDrExpirationInfo.java     |   8 +-
 .../processors/cache/dr/GridCacheDrInfo.java    |  15 +-
 .../processors/cache/dr/GridCacheDrManager.java |  16 +-
 .../cache/dr/GridOsCacheDrManager.java          |  18 +-
 .../extras/GridCacheAttributesEntryExtras.java  |   8 +-
 .../GridCacheAttributesMvccEntryExtras.java     |  10 +-
 ...dCacheAttributesMvccObsoleteEntryExtras.java |  10 +-
 ...cheAttributesMvccObsoleteTtlEntryExtras.java |  10 +-
 .../GridCacheAttributesMvccTtlEntryExtras.java  |  10 +-
 .../GridCacheAttributesObsoleteEntryExtras.java |   8 +-
 ...idCacheAttributesObsoleteTtlEntryExtras.java |   8 +-
 .../GridCacheAttributesTtlEntryExtras.java      |   8 +-
 .../cache/extras/GridCacheEntryExtras.java      |   8 +-
 .../extras/GridCacheEntryExtrasAdapter.java     |   6 +-
 .../cache/extras/GridCacheMvccEntryExtras.java  |   8 +-
 .../GridCacheMvccObsoleteEntryExtras.java       |   8 +-
 .../GridCacheMvccObsoleteTtlEntryExtras.java    |   8 +-
 .../extras/GridCacheMvccTtlEntryExtras.java     |   7 +-
 .../extras/GridCacheObsoleteEntryExtras.java    |   8 +-
 .../extras/GridCacheObsoleteTtlEntryExtras.java |   8 +-
 .../cache/extras/GridCacheTtlEntryExtras.java   |   8 +-
 .../cache/jta/CacheJtaManagerAdapter.java       |  11 +-
 .../cache/jta/CacheNoopJtaManager.java          |   8 +-
 .../processors/cache/local/GridLocalCache.java  |  43 +--
 .../cache/local/GridLocalCacheEntry.java        |  21 +-
 .../cache/local/GridLocalLockCallback.java      |   4 +-
 .../cache/local/GridLocalLockFuture.java        |  42 ++-
 .../local/atomic/GridLocalAtomicCache.java      |  91 ++++--
 .../CacheDefaultPortableAffinityKeyMapper.java  |  12 +-
 .../portable/CacheObjectPortableContext.java    |  23 +-
 .../portable/CacheObjectPortableProcessor.java  |  18 +-
 .../CacheObjectPortableProcessorImpl.java       | 138 ++++++---
 .../cache/portable/IgnitePortablesImpl.java     |  19 +-
 .../cache/portable/PortableMetaDataKey.java     |  12 +-
 .../processors/cache/query/CacheQuery.java      |  18 +-
 .../CacheQueryCloseableScanBiPredicate.java     |   4 +-
 .../cache/query/CacheQueryFuture.java           |  11 +-
 .../processors/cache/query/CacheQueryType.java  |   2 +-
 .../GridCacheDistributedFieldsQueryFuture.java  |  20 +-
 .../query/GridCacheDistributedQueryFuture.java  |  25 +-
 .../query/GridCacheDistributedQueryManager.java |  58 ++--
 .../query/GridCacheLocalFieldsQueryFuture.java  |  17 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |  18 +-
 .../cache/query/GridCacheLocalQueryManager.java |  17 +-
 .../cache/query/GridCacheQueryAdapter.java      |  65 +++--
 .../cache/query/GridCacheQueryBean.java         |   9 +-
 .../cache/query/GridCacheQueryErrorFuture.java  |  13 +-
 .../query/GridCacheQueryFutureAdapter.java      |  43 ++-
 .../cache/query/GridCacheQueryInfo.java         |  12 +-
 .../cache/query/GridCacheQueryManager.java      | 149 +++++++---
 .../query/GridCacheQueryMetadataAware.java      |   9 +-
 .../query/GridCacheQueryMetricsAdapter.java     |  12 +-
 .../cache/query/GridCacheQueryMetricsKey.java   |  14 +-
 .../cache/query/GridCacheQueryRequest.java      |  41 +--
 .../cache/query/GridCacheQueryResponse.java     |  34 ++-
 .../query/GridCacheQueryResponseEntry.java      |  12 +-
 .../cache/query/GridCacheQueryType.java         |   4 +-
 .../cache/query/GridCacheSqlIndexMetadata.java  |   6 +-
 .../cache/query/GridCacheSqlMetadata.java       |  12 +-
 .../cache/query/GridCacheSqlQuery.java          |  24 +-
 .../cache/query/GridCacheTwoStepQuery.java      |  11 +-
 .../processors/cache/query/QueryCursorEx.java   |  11 +-
 .../continuous/CacheContinuousQueryEntry.java   |  29 +-
 .../continuous/CacheContinuousQueryEvent.java   |  14 +-
 .../CacheContinuousQueryFilterEx.java           |   4 +-
 .../continuous/CacheContinuousQueryHandler.java |  55 ++--
 .../CacheContinuousQueryListener.java           |   2 +-
 .../continuous/CacheContinuousQueryManager.java |  73 +++--
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |  46 +--
 .../query/jdbc/GridCacheQueryJdbcTask.java      |  62 ++--
 .../jdbc/GridCacheQueryJdbcValidationTask.java  |  25 +-
 .../processors/cache/store/CacheLocalStore.java |   8 +-
 .../cache/store/CacheOsStoreManager.java        |   8 +-
 .../cache/store/CacheStoreManager.java          |  24 +-
 .../store/GridCacheStoreManagerAdapter.java     |  69 +++--
 .../cache/store/GridCacheWriteBehindStore.java  |  55 ++--
 .../cache/transactions/IgniteInternalTx.java    |  40 ++-
 .../transactions/IgniteTransactionsImpl.java    |  24 +-
 .../cache/transactions/IgniteTxAdapter.java     | 113 +++++---
 .../cache/transactions/IgniteTxEntry.java       |  61 ++--
 .../cache/transactions/IgniteTxHandler.java     |  90 ++++--
 .../cache/transactions/IgniteTxKey.java         |  20 +-
 .../transactions/IgniteTxLocalAdapter.java      | 131 ++++++---
 .../cache/transactions/IgniteTxLocalEx.java     |  26 +-
 .../cache/transactions/IgniteTxManager.java     | 119 +++++---
 .../cache/transactions/IgniteTxMap.java         |  23 +-
 .../cache/transactions/IgniteTxRemoteEx.java    |   7 +-
 .../transactions/TransactionMetricsAdapter.java |  13 +-
 .../cache/transactions/TransactionProxy.java    |   4 +-
 .../transactions/TransactionProxyImpl.java      |  38 ++-
 .../cache/transactions/TxEntryValueHolder.java  |  31 +-
 .../version/CacheVersionConflictResolver.java   |   4 +-
 .../version/GridCachePlainVersionedEntry.java   |   6 +-
 .../version/GridCacheRawVersionedEntry.java     |  29 +-
 .../cache/version/GridCacheVersion.java         |  20 +-
 .../cache/version/GridCacheVersionAware.java    |   2 +-
 .../GridCacheVersionConflictContext.java        |  10 +-
 .../cache/version/GridCacheVersionEx.java       |  13 +-
 .../cache/version/GridCacheVersionManager.java  |  26 +-
 .../cache/version/GridCacheVersionable.java     |   2 +-
 .../cache/version/GridCacheVersionedEntry.java  |   4 +-
 .../version/GridCacheVersionedEntryEx.java      |   2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |  18 +-
 .../IgniteCacheObjectProcessorImpl.java         |  46 +--
 .../clock/GridClockDeltaSnapshot.java           |  20 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |  21 +-
 .../processors/clock/GridClockDeltaVersion.java |  16 +-
 .../processors/clock/GridClockMessage.java      |  10 +-
 .../processors/clock/GridClockServer.java       |  24 +-
 .../processors/clock/GridClockSource.java       |   2 +-
 .../clock/GridClockSyncProcessor.java           |  52 ++--
 .../processors/clock/GridJvmClockSource.java    |   2 +-
 .../processors/closure/AffinityTask.java        |   4 +-
 .../processors/closure/GridClosurePolicy.java   |   4 +-
 .../closure/GridClosureProcessor.java           |  80 ++++--
 .../closure/GridPeerDeployAwareTaskAdapter.java |  10 +-
 .../processors/cluster/ClusterProcessor.java    |  12 +-
 .../continuous/AbstractContinuousMessage.java   |   9 +-
 .../continuous/GridContinuousHandler.java       |  14 +-
 .../continuous/GridContinuousMessage.java       |  30 +-
 .../continuous/GridContinuousMessageType.java   |   4 +-
 .../continuous/GridContinuousProcessor.java     |  96 ++++---
 .../processors/continuous/StartRequestData.java |  23 +-
 .../StartRoutineAckDiscoveryMessage.java        |  15 +-
 .../StartRoutineDiscoveryMessage.java           |  13 +-
 .../StopRoutineAckDiscoveryMessage.java         |  11 +-
 .../continuous/StopRoutineDiscoveryMessage.java |  11 +-
 .../datastreamer/DataStreamProcessor.java       |  48 ++--
 .../datastreamer/DataStreamerCacheUpdaters.java |  20 +-
 .../datastreamer/DataStreamerEntry.java         |  19 +-
 .../datastreamer/DataStreamerFuture.java        |  10 +-
 .../datastreamer/DataStreamerImpl.java          | 125 +++++---
 .../datastreamer/DataStreamerRequest.java       |  30 +-
 .../datastreamer/DataStreamerResponse.java      |  11 +-
 .../datastreamer/DataStreamerUpdateJob.java     |  25 +-
 .../CacheDataStructuresCacheKey.java            |  10 +-
 .../CacheDataStructuresConfigurationKey.java    |  10 +-
 .../datastructures/DataStructuresProcessor.java | 103 +++++--
 .../GridAtomicCacheQueueImpl.java               |  20 +-
 .../GridCacheAnnotationHelper.java              |  23 +-
 .../datastructures/GridCacheAtomicLongEx.java   |   4 +-
 .../datastructures/GridCacheAtomicLongImpl.java |  39 +--
 .../GridCacheAtomicLongValue.java               |  12 +-
 .../GridCacheAtomicReferenceEx.java             |   4 +-
 .../GridCacheAtomicReferenceImpl.java           |  38 ++-
 .../GridCacheAtomicReferenceValue.java          |  14 +-
 .../GridCacheAtomicSequenceEx.java              |   4 +-
 .../GridCacheAtomicSequenceImpl.java            |  52 ++--
 .../GridCacheAtomicSequenceValue.java           |  12 +-
 .../GridCacheAtomicStampedEx.java               |   4 +-
 .../GridCacheAtomicStampedImpl.java             |  44 +--
 .../GridCacheAtomicStampedValue.java            |  18 +-
 .../GridCacheCountDownLatchEx.java              |   4 +-
 .../GridCacheCountDownLatchImpl.java            |  44 +--
 .../GridCacheCountDownLatchValue.java           |  12 +-
 .../datastructures/GridCacheInternalKey.java    |   4 +-
 .../GridCacheInternalKeyImpl.java               |  15 +-
 .../datastructures/GridCacheQueueAdapter.java   |  49 ++--
 .../datastructures/GridCacheQueueHeader.java    |  24 +-
 .../datastructures/GridCacheQueueHeaderKey.java |  13 +-
 .../datastructures/GridCacheQueueItemKey.java   |  15 +-
 .../datastructures/GridCacheQueueProxy.java     |  33 ++-
 .../datastructures/GridCacheRemovable.java      |   2 +-
 .../datastructures/GridCacheSetHeader.java      |  15 +-
 .../datastructures/GridCacheSetHeaderKey.java   |  13 +-
 .../datastructures/GridCacheSetImpl.java        |  57 ++--
 .../datastructures/GridCacheSetItemKey.java     |  17 +-
 .../datastructures/GridCacheSetProxy.java       |  34 ++-
 .../datastructures/GridSetQueryPredicate.java   |  19 +-
 .../GridTransactionalCacheQueueImpl.java        |  28 +-
 .../internal/processors/dr/GridDrType.java      |   2 +-
 .../dr/IgniteDrDataStreamerCacheUpdater.java    |  40 ++-
 .../internal/processors/hadoop/Hadoop.java      |  12 +-
 .../processors/hadoop/HadoopFileBlock.java      |  16 +-
 .../processors/hadoop/HadoopInputSplit.java     |   4 +-
 .../internal/processors/hadoop/HadoopJob.java   |   8 +-
 .../internal/processors/hadoop/HadoopJobId.java |  14 +-
 .../processors/hadoop/HadoopJobInfo.java        |  10 +-
 .../processors/hadoop/HadoopJobPhase.java       |   2 +-
 .../processors/hadoop/HadoopJobProperty.java    |   4 +-
 .../processors/hadoop/HadoopJobStatus.java      |  11 +-
 .../processors/hadoop/HadoopMapReducePlan.java  |  10 +-
 .../hadoop/HadoopMapReducePlanner.java          |  11 +-
 .../processors/hadoop/HadoopNoopProcessor.java  |  13 +-
 .../processors/hadoop/HadoopPartitioner.java    |   2 +-
 .../hadoop/HadoopProcessorAdapter.java          |  13 +-
 .../processors/hadoop/HadoopSerialization.java  |  10 +-
 .../internal/processors/hadoop/HadoopTask.java  |   7 +-
 .../processors/hadoop/HadoopTaskContext.java    |  12 +-
 .../processors/hadoop/HadoopTaskInfo.java       |  12 +-
 .../processors/hadoop/HadoopTaskInput.java      |   7 +-
 .../processors/hadoop/HadoopTaskOutput.java     |   4 +-
 .../processors/hadoop/HadoopTaskType.java       |   4 +-
 .../hadoop/counter/HadoopCounter.java           |   2 +-
 .../hadoop/counter/HadoopCounterWriter.java     |   6 +-
 .../hadoop/counter/HadoopCounters.java          |   4 +-
 .../processors/igfs/IgfsAckMessage.java         |  20 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |  34 ++-
 .../processors/igfs/IgfsAttributes.java         |  16 +-
 .../internal/processors/igfs/IgfsBlockKey.java  |  26 +-
 .../processors/igfs/IgfsBlockLocationImpl.java  |  28 +-
 .../processors/igfs/IgfsBlocksMessage.java      |  17 +-
 .../processors/igfs/IgfsClientSession.java      |  13 +-
 .../igfs/IgfsCommunicationMessage.java          |  15 +-
 .../internal/processors/igfs/IgfsContext.java   |  23 +-
 .../processors/igfs/IgfsDataManager.java        | 117 +++++---
 .../processors/igfs/IgfsDeleteMessage.java      |  22 +-
 .../processors/igfs/IgfsDeleteWorker.java       |  46 +--
 .../ignite/internal/processors/igfs/IgfsEx.java |  19 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |  27 +-
 .../internal/processors/igfs/IgfsFileImpl.java  |  22 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |  29 +-
 .../internal/processors/igfs/IgfsFileMap.java   |  28 +-
 .../processors/igfs/IgfsFileWorkerBatch.java    |  18 +-
 .../igfs/IgfsFragmentizerManager.java           |  71 +++--
 .../igfs/IgfsFragmentizerRequest.java           |  21 +-
 .../igfs/IgfsFragmentizerResponse.java          |  12 +-
 .../processors/igfs/IgfsHandshakeResponse.java  |  10 +-
 .../internal/processors/igfs/IgfsHelper.java    |   6 +-
 .../processors/igfs/IgfsHelperImpl.java         |  14 +-
 .../internal/processors/igfs/IgfsImpl.java      | 134 ++++++---
 .../processors/igfs/IgfsInputStreamAdapter.java |   9 +-
 .../igfs/IgfsInputStreamDescriptor.java         |   7 +-
 .../processors/igfs/IgfsInputStreamImpl.java    |  39 ++-
 .../igfs/IgfsInvalidRangeException.java         |   4 +-
 .../processors/igfs/IgfsIpcHandler.java         |  45 +--
 .../internal/processors/igfs/IgfsJobImpl.java   |  24 +-
 .../processors/igfs/IgfsListingEntry.java       |  15 +-
 .../processors/igfs/IgfsLocalMetrics.java       |   8 +-
 .../internal/processors/igfs/IgfsManager.java   |   8 +-
 .../processors/igfs/IgfsMetaManager.java        |  99 +++++--
 .../processors/igfs/IgfsMetricsAdapter.java     |  12 +-
 .../processors/igfs/IgfsModeResolver.java       |  20 +-
 .../processors/igfs/IgfsNoopHelper.java         |   6 +-
 .../processors/igfs/IgfsNoopProcessor.java      |  23 +-
 .../igfs/IgfsOutputStreamAdapter.java           |  18 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |  40 ++-
 .../internal/processors/igfs/IgfsPaths.java     |  21 +-
 .../internal/processors/igfs/IgfsProcessor.java |  67 +++--
 .../processors/igfs/IgfsProcessorAdapter.java   |  22 +-
 .../processors/igfs/IgfsSamplingKey.java        |  15 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |  19 +-
 .../IgfsSecondaryInputStreamDescriptor.java     |   4 +-
 .../IgfsSecondaryOutputStreamDescriptor.java    |   7 +-
 .../internal/processors/igfs/IgfsServer.java    |  47 ++--
 .../processors/igfs/IgfsServerHandler.java      |  13 +-
 .../processors/igfs/IgfsServerManager.java      |  35 +--
 .../internal/processors/igfs/IgfsStatus.java    |   7 +-
 .../processors/igfs/IgfsSyncMessage.java        |  12 +-
 .../processors/igfs/IgfsTaskArgsImpl.java       |  18 +-
 .../internal/processors/igfs/IgfsThread.java    |   4 +-
 .../internal/processors/igfs/IgfsUtils.java     |  40 +--
 .../processors/job/GridJobEventListener.java    |   4 +-
 .../processors/job/GridJobHoldListener.java     |   4 +-
 .../processors/job/GridJobProcessor.java        | 112 +++++---
 .../internal/processors/job/GridJobWorker.java  |  75 +++--
 .../processors/jobmetrics/GridJobMetrics.java   |   4 +-
 .../jobmetrics/GridJobMetricsProcessor.java     |  21 +-
 .../jobmetrics/GridJobMetricsSnapshot.java      |   5 +-
 .../DiscoveryNodeValidationProcessor.java       |   4 +-
 .../OsDiscoveryNodeValidationProcessor.java     |  19 +-
 .../offheap/GridOffHeapProcessor.java           |  34 +--
 .../platform/PlatformAwareEventFilter.java      |  12 +-
 .../processors/platform/PlatformContext.java    |  44 +--
 .../platform/PlatformLocalEventListener.java    |   2 +-
 .../platform/PlatformNoopProcessor.java         |   9 +-
 .../processors/platform/PlatformProcessor.java  |   7 +-
 .../processors/platform/PlatformTarget.java     |   6 +-
 .../cache/PlatformCacheEntryFilter.java         |   6 +-
 .../cache/query/PlatformContinuousQuery.java    |  15 +-
 .../callback/PlatformCallbackGateway.java       |  89 +++++-
 .../callback/PlatformCallbackUtils.java         |  23 +-
 .../platform/compute/PlatformJob.java           |   4 +-
 .../platform/memory/PlatformInputStream.java    |   4 +-
 .../platform/memory/PlatformMemory.java         |   2 +-
 .../platform/memory/PlatformMemoryManager.java  |   2 +-
 .../platform/memory/PlatformOutputStream.java   |   4 +-
 .../platform/services/PlatformService.java      |   6 +-
 .../processors/plugin/CachePluginManager.java   |  33 ++-
 .../plugin/IgnitePluginProcessor.java           |  37 ++-
 .../processors/port/GridPortListener.java       |   4 +-
 .../processors/port/GridPortProcessor.java      |  21 +-
 .../processors/port/GridPortRecord.java         |   6 +-
 .../query/GridQueryCacheObjectsIterator.java    |   9 +-
 .../query/GridQueryFieldMetadata.java           |   4 +-
 .../processors/query/GridQueryFieldsResult.java |   7 +-
 .../query/GridQueryFieldsResultAdapter.java     |  10 +-
 .../query/GridQueryIndexDescriptor.java         |   4 +-
 .../processors/query/GridQueryIndexType.java    |   2 +-
 .../processors/query/GridQueryIndexing.java     |  36 +--
 .../processors/query/GridQueryProcessor.java    |  99 +++++--
 .../query/GridQueryTypeDescriptor.java          |   7 +-
 .../messages/GridQueryCancelRequest.java        |  11 +-
 .../twostep/messages/GridQueryFailResponse.java |  11 +-
 .../messages/GridQueryNextPageRequest.java      |  11 +-
 .../messages/GridQueryNextPageResponse.java     |  22 +-
 .../h2/twostep/messages/GridQueryRequest.java   |  26 +-
 .../resource/GridNoImplicitInjection.java       |   2 +-
 .../resource/GridResourceBasicInjector.java     |   8 +-
 .../processors/resource/GridResourceField.java  |  13 +-
 .../resource/GridResourceInjector.java          |   6 +-
 .../processors/resource/GridResourceIoc.java    |  34 ++-
 .../GridResourceJobContextInjector.java         |   9 +-
 .../resource/GridResourceLoggerInjector.java    |   9 +-
 .../processors/resource/GridResourceMethod.java |  11 +-
 .../resource/GridResourceProcessor.java         |  54 ++--
 .../resource/GridResourceServiceInjector.java   |  14 +-
 .../processors/resource/GridResourceUtils.java  |  13 +-
 .../resource/GridSpringResourceContext.java     |   5 +-
 .../processors/rest/GridRestCommand.java        |   8 +-
 .../processors/rest/GridRestProcessor.java      |  84 ++++--
 .../processors/rest/GridRestProtocol.java       |   9 +-
 .../rest/GridRestProtocolHandler.java           |   8 +-
 .../processors/rest/GridRestResponse.java       |  15 +-
 .../message/GridClientAbstractMessage.java      |  13 +-
 .../GridClientAuthenticationRequest.java        |   9 +-
 .../client/message/GridClientCacheRequest.java  |  15 +-
 .../message/GridClientHandshakeRequest.java     |   7 +-
 .../message/GridClientHandshakeResponse.java    |   4 +-
 .../rest/client/message/GridClientMessage.java  |   6 +-
 .../rest/client/message/GridClientNodeBean.java |  15 +-
 .../message/GridClientNodeMetricsBean.java      |   7 +-
 .../client/message/GridClientPingPacket.java    |   4 +-
 .../message/GridClientPortableMetaData.java     |   7 +-
 .../rest/client/message/GridClientResponse.java |   9 +-
 .../client/message/GridClientTaskRequest.java   |   9 +-
 .../message/GridClientTaskResultBean.java       |  10 +-
 .../message/GridClientTopologyRequest.java      |  11 +-
 .../rest/client/message/GridRouterRequest.java  |   9 +-
 .../rest/client/message/GridRouterResponse.java |   9 +-
 .../rest/handlers/GridRestCommandHandler.java   |  12 +-
 .../handlers/GridRestCommandHandlerAdapter.java |   6 +-
 .../handlers/cache/GridCacheCommandHandler.java | 103 +++++--
 .../handlers/cache/GridCacheRestMetrics.java    |   7 +-
 .../handlers/cache/GridCacheRestResponse.java   |  12 +-
 .../DataStructuresCommandHandler.java           |  32 ++-
 .../query/CacheQueryFieldsMetaResult.java       |  12 +-
 .../rest/handlers/query/CacheQueryResult.java   |  13 +-
 .../handlers/query/QueryCommandHandler.java     |  48 ++--
 .../handlers/task/GridTaskCommandHandler.java   | 102 ++++---
 .../handlers/task/GridTaskResultRequest.java    |  15 +-
 .../handlers/task/GridTaskResultResponse.java   |  13 +-
 .../top/GridTopologyCommandHandler.java         |  61 ++--
 .../version/GridVersionCommandHandler.java      |  24 +-
 .../rest/protocols/GridRestProtocolAdapter.java |  36 +--
 .../protocols/tcp/GridClientPacketType.java     |   2 +-
 .../protocols/tcp/GridMemcachedMessage.java     |  12 +-
 .../tcp/GridTcpMemcachedNioListener.java        |  65 +++--
 .../protocols/tcp/GridTcpRestNioListener.java   |  83 ++++--
 .../rest/protocols/tcp/GridTcpRestParser.java   |  62 ++--
 .../rest/protocols/tcp/GridTcpRestProtocol.java |  63 +++--
 .../rest/request/DataStructuresRequest.java     |   2 +-
 .../rest/request/GridRestCacheRequest.java      |   7 +-
 .../rest/request/GridRestLogRequest.java        |   4 +-
 .../rest/request/GridRestRequest.java           |  13 +-
 .../rest/request/GridRestTaskRequest.java       |   7 +-
 .../rest/request/GridRestTopologyRequest.java   |   7 +-
 .../rest/request/RestSqlQueryRequest.java       |   2 +-
 .../schedule/GridScheduleStatistics.java        |   5 +-
 .../schedule/IgniteNoopScheduleProcessor.java   |  11 +-
 .../IgniteScheduleProcessorAdapter.java         |  11 +-
 .../security/GridSecurityProcessor.java         |  19 +-
 .../processors/security/SecurityContext.java    |   5 +-
 .../security/os/GridOsSecurityProcessor.java    |  25 +-
 .../segmentation/GridSegmentationProcessor.java |   4 +-
 .../os/GridOsSegmentationProcessor.java         |   8 +-
 .../service/GridServiceAssignments.java         |  22 +-
 .../service/GridServiceAssignmentsKey.java      |   6 +-
 .../service/GridServiceDeployment.java          |  13 +-
 .../service/GridServiceDeploymentFuture.java    |   8 +-
 .../service/GridServiceDeploymentKey.java       |   6 +-
 .../GridServiceMethodNotFoundException.java     |   7 +-
 .../service/GridServiceMethodReflectKey.java    |   4 +-
 .../service/GridServiceNotFoundException.java   |   4 +-
 .../service/GridServiceProcessor.java           | 105 ++++---
 .../processors/service/GridServiceProxy.java    |  54 ++--
 .../processors/service/ServiceContextImpl.java  |  20 +-
 .../service/ServiceDescriptorImpl.java          |  15 +-
 .../session/GridTaskSessionProcessor.java       |  28 +-
 .../internal/processors/task/GridInternal.java  |   8 +-
 .../processors/task/GridTaskEventListener.java  |   8 +-
 .../processors/task/GridTaskProcessor.java      |  99 +++++--
 .../task/GridTaskThreadContextKey.java          |   2 +-
 .../processors/task/GridTaskWorker.java         | 113 +++++---
 .../timeout/GridSpiTimeoutObject.java           |  10 +-
 .../processors/timeout/GridTimeoutObject.java   |   4 +-
 .../timeout/GridTimeoutObjectAdapter.java       |   6 +-
 .../timeout/GridTimeoutProcessor.java           |  29 +-
 .../internal/tck/TCKMBeanServerBuilder.java     |  14 +-
 .../IgniteTxHeuristicCheckedException.java      |   4 +-
 .../IgniteTxOptimisticCheckedException.java     |   4 +-
 .../IgniteTxRollbackCheckedException.java       |   4 +-
 .../IgniteTxTimeoutCheckedException.java        |   4 +-
 .../org/apache/ignite/internal/util/F0.java     |  29 +-
 .../internal/util/GridAnnotationsCache.java     |  17 +-
 .../ignite/internal/util/GridArgumentCheck.java |   7 +-
 .../internal/util/GridAtomicInitializer.java    |  12 +-
 .../ignite/internal/util/GridAtomicInteger.java |   7 +-
 .../ignite/internal/util/GridAtomicLong.java    |   7 +-
 .../GridBoundedConcurrentLinkedHashMap.java     |   8 +-
 .../GridBoundedConcurrentLinkedHashSet.java     |  18 +-
 .../util/GridBoundedConcurrentOrderedMap.java   |  18 +-
 .../util/GridBoundedConcurrentOrderedSet.java   |   9 +-
 .../internal/util/GridBoundedLinkedHashMap.java |   5 +-
 .../internal/util/GridBoundedLinkedHashSet.java |   7 +-
 .../ignite/internal/util/GridBusyLock.java      |   7 +-
 .../ignite/internal/util/GridByteArrayList.java |  26 +-
 .../internal/util/GridCircularBuffer.java       |  23 +-
 .../internal/util/GridClassLoaderCache.java     |  13 +-
 .../internal/util/GridClientByteUtils.java      |   7 +-
 .../util/GridCloseableIteratorAdapter.java      |  10 +-
 .../util/GridCloseableIteratorAdapterEx.java    |  12 +-
 .../ignite/internal/util/GridCollections.java   |  14 +-
 .../internal/util/GridConcurrentFactory.java    |  11 +-
 .../internal/util/GridConcurrentHashSet.java    |  13 +-
 .../util/GridConcurrentLinkedHashSet.java       |  16 +-
 .../util/GridConcurrentPhantomHashSet.java      |  25 +-
 .../util/GridConcurrentSkipListSet.java         |  22 +-
 .../util/GridConcurrentWeakHashSet.java         |  25 +-
 .../internal/util/GridConfigurationFinder.java  |  19 +-
 .../internal/util/GridConsistentHash.java       |  32 ++-
 .../apache/ignite/internal/util/GridDebug.java  |  33 ++-
 .../util/GridEmptyCloseableIterator.java        |   6 +-
 .../ignite/internal/util/GridEmptyIterator.java |   9 +-
 .../ignite/internal/util/GridEnumCache.java     |   7 +-
 .../internal/util/GridExecutionStatistics.java  |  19 +-
 .../internal/util/GridFixedSizeInputStream.java |   5 +-
 .../ignite/internal/util/GridHandleTable.java   |   7 +-
 .../ignite/internal/util/GridJavaProcess.java   |  25 +-
 .../ignite/internal/util/GridKeyLock.java       |  11 +-
 .../internal/util/GridLeanIdentitySet.java      |   7 +-
 .../ignite/internal/util/GridLeanMap.java       |  19 +-
 .../ignite/internal/util/GridLeanSet.java       |  10 +-
 .../ignite/internal/util/GridListSet.java       |  19 +-
 .../ignite/internal/util/GridLogThrottle.java   |  17 +-
 .../ignite/internal/util/GridLongList.java      |  26 +-
 .../apache/ignite/internal/util/GridMutex.java  |  10 +-
 .../apache/ignite/internal/util/GridQueue.java  |  16 +-
 .../apache/ignite/internal/util/GridRandom.java |   6 +-
 .../internal/util/GridReflectionCache.java      |  29 +-
 .../util/GridSerializableCollection.java        |   6 +-
 .../internal/util/GridSerializableIterable.java |   4 +-
 .../internal/util/GridSerializableIterator.java |   6 +-
 .../internal/util/GridSerializableList.java     |   6 +-
 .../internal/util/GridSerializableMap.java      |   6 +-
 .../internal/util/GridSerializableSet.java      |   7 +-
 .../ignite/internal/util/GridSetWrapper.java    |  12 +-
 .../ignite/internal/util/GridSnapshotLock.java  |   7 +-
 .../util/GridSpiCloseableIteratorWrapper.java   |   8 +-
 .../ignite/internal/util/GridSpinBusyLock.java  |   4 +-
 .../internal/util/GridSpinReadWriteLock.java    |  12 +-
 .../ignite/internal/util/GridStringBuilder.java |   7 +-
 .../internal/util/GridStringBuilderFactory.java |   4 +-
 .../ignite/internal/util/GridStripedLock.java   |  11 +-
 .../internal/util/GridStripedReadWriteLock.java |  14 +-
 .../internal/util/GridSynchronizedMap.java      |  12 +-
 .../apache/ignite/internal/util/GridTimer.java  |  10 +-
 .../ignite/internal/util/GridTimerTask.java     |   4 +-
 .../apache/ignite/internal/util/GridUnsafe.java |  11 +-
 .../ignite/internal/util/GridWeakIterator.java  |  10 +-
 .../internal/util/IgniteExceptionRegistry.java  |  27 +-
 .../ignite/internal/util/IgniteUtils.java       | 282 +++++++++++++++----
 .../ignite/internal/util/IgniteUuidCache.java   |   6 +-
 .../util/future/GridCompoundFuture.java         |  34 ++-
 .../util/future/GridCompoundIdentityFuture.java |  10 +-
 .../util/future/GridEmbeddedFuture.java         |  16 +-
 .../util/future/GridFinishedFuture.java         |  17 +-
 .../internal/util/future/GridFutureAdapter.java |  27 +-
 .../util/future/GridFutureChainListener.java    |   9 +-
 .../util/future/IgniteFinishedFutureImpl.java   |   4 +-
 .../internal/util/future/IgniteFutureImpl.java  |  21 +-
 .../util/gridify/GridifyArgumentBuilder.java    |  20 +-
 .../util/gridify/GridifyJobAdapter.java         |  13 +-
 .../util/gridify/GridifyRangeArgument.java      |   9 +-
 .../internal/util/gridify/GridifyUtils.java     |  35 ++-
 .../util/io/GridByteArrayInputStream.java       |   9 +-
 .../util/io/GridByteArrayOutputStream.java      |  13 +-
 .../ignite/internal/util/io/GridDataInput.java  |   6 +-
 .../ignite/internal/util/io/GridDataOutput.java |   6 +-
 .../internal/util/io/GridFilenameUtils.java     |  10 +-
 .../util/io/GridReversedLinesFileReader.java    |  12 +-
 .../internal/util/io/GridUnsafeDataInput.java   |  22 +-
 .../internal/util/io/GridUnsafeDataOutput.java  |  15 +-
 .../ignite/internal/util/ipc/IpcEndpoint.java   |   9 +-
 .../util/ipc/IpcEndpointBindException.java      |   4 +-
 .../internal/util/ipc/IpcEndpointFactory.java   |  13 +-
 .../internal/util/ipc/IpcEndpointType.java      |   2 +-
 .../internal/util/ipc/IpcServerEndpoint.java    |   9 +-
 .../internal/util/ipc/IpcToNioAdapter.java      |  31 +-
 .../util/ipc/loopback/IpcClientTcpEndpoint.java |  16 +-
 .../util/ipc/loopback/IpcServerTcpEndpoint.java |  23 +-
 .../shmem/IpcOutOfSystemResourcesException.java |   6 +-
 .../shmem/IpcSharedMemoryClientEndpoint.java    |  21 +-
 .../ipc/shmem/IpcSharedMemoryInitRequest.java   |   7 +-
 .../ipc/shmem/IpcSharedMemoryInitResponse.java  |  12 +-
 .../ipc/shmem/IpcSharedMemoryInputStream.java   |  10 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |  35 ++-
 ...cSharedMemoryOperationTimedoutException.java |   6 +-
 .../ipc/shmem/IpcSharedMemoryOutputStream.java  |  10 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |  58 ++--
 .../util/ipc/shmem/IpcSharedMemorySpace.java    |  19 +-
 .../util/ipc/shmem/IpcSharedMemoryUtils.java    |  18 +-
 .../internal/util/lang/GridAbsClosure.java      |   4 +-
 .../internal/util/lang/GridAbsClosureX.java     |   6 +-
 .../internal/util/lang/GridAbsPredicate.java    |   4 +-
 .../internal/util/lang/GridAbsPredicateX.java   |   6 +-
 .../util/lang/GridCloseableIterator.java        |   6 +-
 .../ignite/internal/util/lang/GridClosure3.java |   4 +-
 .../internal/util/lang/GridClosure3X.java       |   7 +-
 .../util/lang/GridClosureException.java         |   5 +-
 .../util/lang/GridFilteredIterator.java         |   5 +-
 .../ignite/internal/util/lang/GridFunc.java     |  76 +++--
 .../internal/util/lang/GridInClosure3.java      |   5 +-
 .../ignite/internal/util/lang/GridIterable.java |   4 +-
 .../internal/util/lang/GridIterableAdapter.java |  10 +-
 .../ignite/internal/util/lang/GridIterator.java |  10 +-
 .../internal/util/lang/GridIteratorAdapter.java |   8 +-
 .../ignite/internal/util/lang/GridMapEntry.java |  13 +-
 .../util/lang/GridMetadataAwareAdapter.java     |  18 +-
 .../internal/util/lang/GridNodePredicate.java   |  24 +-
 .../internal/util/lang/GridPeerDeployAware.java |   4 +-
 .../util/lang/GridPeerDeployAwareAdapter.java   |   4 +-
 .../internal/util/lang/GridPlainAbsClosure.java |   4 +-
 .../internal/util/lang/GridPlainCallable.java   |   4 +-
 .../internal/util/lang/GridPlainClosure.java    |   4 +-
 .../internal/util/lang/GridPlainClosure2.java   |   4 +-
 .../internal/util/lang/GridPlainInClosure.java  |   4 +-
 .../internal/util/lang/GridPlainOutClosure.java |   4 +-
 .../internal/util/lang/GridPlainRunnable.java   |   2 +-
 .../internal/util/lang/GridPredicate3.java      |   4 +-
 .../internal/util/lang/GridPredicate3X.java     |   7 +-
 .../ignite/internal/util/lang/GridTriple.java   |   7 +-
 .../ignite/internal/util/lang/GridTuple.java    |  17 +-
 .../ignite/internal/util/lang/GridTuple3.java   |  19 +-
 .../ignite/internal/util/lang/GridTuple4.java   |  19 +-
 .../ignite/internal/util/lang/GridTuple5.java   |  19 +-
 .../ignite/internal/util/lang/GridTuple6.java   |  19 +-
 .../ignite/internal/util/lang/GridTupleV.java   |  18 +-
 .../internal/util/lang/IgniteClosure2X.java     |   9 +-
 .../internal/util/lang/IgniteClosureX.java      |   9 +-
 .../internal/util/lang/IgniteInClosure2X.java   |   9 +-
 .../internal/util/lang/IgniteInClosureX.java    |   9 +-
 .../internal/util/lang/IgniteOutClosureX.java   |   8 +-
 .../ignite/internal/util/lang/IgnitePair.java   |   9 +-
 .../internal/util/lang/IgnitePredicate2X.java   |   9 +-
 .../internal/util/lang/IgnitePredicateX.java    |   9 +-
 .../internal/util/lang/IgniteReducer2.java      |   6 +-
 .../internal/util/lang/IgniteReducer2X.java     |   7 +-
 .../internal/util/lang/IgniteReducer3.java      |   6 +-
 .../internal/util/lang/IgniteReducer3X.java     |   7 +-
 .../internal/util/lang/IgniteReducerX.java      |   9 +-
 .../nio/GridAbstractCommunicationClient.java    |  10 +-
 .../internal/util/nio/GridBufferedParser.java   |  10 +-
 .../util/nio/GridCommunicationClient.java       |  21 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |  11 +-
 .../internal/util/nio/GridDelimitedParser.java  |   9 +-
 .../internal/util/nio/GridDirectParser.java     |  17 +-
 .../util/nio/GridNioAsyncNotifyFilter.java      |  13 +-
 .../util/nio/GridNioBackPressureControl.java    |   4 +-
 .../internal/util/nio/GridNioCodecFilter.java   |  15 +-
 .../util/nio/GridNioDelimitedBuffer.java        |   9 +-
 .../util/nio/GridNioEmbeddedFuture.java         |  12 +-
 .../internal/util/nio/GridNioException.java     |   6 +-
 .../ignite/internal/util/nio/GridNioFilter.java |   4 +-
 .../internal/util/nio/GridNioFilterAdapter.java |   4 +-
 .../internal/util/nio/GridNioFilterChain.java   |   7 +-
 .../util/nio/GridNioFinishedFuture.java         |  10 +-
 .../ignite/internal/util/nio/GridNioFuture.java |   8 +-
 .../internal/util/nio/GridNioFutureImpl.java    |  10 +-
 .../internal/util/nio/GridNioMessageReader.java |  12 +-
 .../util/nio/GridNioMessageTracker.java         |  12 +-
 .../internal/util/nio/GridNioMessageWriter.java |  14 +-
 .../util/nio/GridNioMetricsListener.java        |   2 +-
 .../ignite/internal/util/nio/GridNioParser.java |  11 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |  20 +-
 .../ignite/internal/util/nio/GridNioServer.java |  82 ++++--
 .../internal/util/nio/GridNioServerBuffer.java  |   9 +-
 .../util/nio/GridNioServerListener.java         |   4 +-
 .../util/nio/GridNioServerListenerAdapter.java  |   2 +-
 .../internal/util/nio/GridNioSession.java       |   7 +-
 .../internal/util/nio/GridNioSessionImpl.java   |  16 +-
 .../util/nio/GridNioSessionMetaKey.java         |   4 +-
 .../util/nio/GridSelectorNioSessionImpl.java    |  26 +-
 .../util/nio/GridShmemCommunicationClient.java  |  30 +-
 .../util/nio/GridTcpNioCommunicationClient.java |  30 +-
 .../util/nio/ssl/BlockingSslHandler.java        |  35 ++-
 .../internal/util/nio/ssl/GridNioSslFilter.java |  30 +-
 .../util/nio/ssl/GridNioSslHandler.java         |  44 ++-
 .../util/nodestart/IgniteNodeStartUtils.java    |  30 +-
 .../IgniteRemoteStartSpecification.java         |  11 +-
 .../util/nodestart/IgniteSshHelper.java         |   4 +-
 .../util/nodestart/StartNodeCallable.java       |   7 +-
 .../internal/util/offheap/GridOffHeapEvent.java |   4 +-
 .../util/offheap/GridOffHeapEventListener.java  |   2 +-
 .../util/offheap/GridOffHeapEvictListener.java  |   2 +-
 .../internal/util/offheap/GridOffHeapMap.java   |  11 +-
 .../util/offheap/GridOffHeapMapFactory.java     |   7 +-
 .../GridOffHeapOutOfMemoryException.java        |   2 +-
 .../util/offheap/GridOffHeapPartitionedMap.java |  14 +-
 .../offheap/unsafe/GridOffHeapSmartPointer.java |   2 +-
 .../unsafe/GridOffHeapSmartPointerFactory.java  |   2 +-
 .../offheap/unsafe/GridOffHeapSnapTreeMap.java  |  33 ++-
 .../unsafe/GridUnsafeCompoundMemory.java        |   2 +-
 .../util/offheap/unsafe/GridUnsafeGuard.java    |  12 +-
 .../util/offheap/unsafe/GridUnsafeLru.java      |  15 +-
 .../offheap/unsafe/GridUnsafeLruPoller.java     |   2 +-
 .../util/offheap/unsafe/GridUnsafeMap.java      |  36 ++-
 .../util/offheap/unsafe/GridUnsafeMemory.java   |  27 +-
 .../unsafe/GridUnsafePartitionedMap.java        |  26 +-
 .../util/portscanner/GridJmxPortFinder.java     |  15 +-
 .../util/snaptree/CopyOnWriteManager.java       |   6 +-
 .../ignite/internal/util/snaptree/Epoch.java    |   2 +-
 .../internal/util/snaptree/EpochNode.java       |   5 +-
 .../internal/util/snaptree/SnapTreeMap.java     |  22 +-
 .../util/spring/IgniteSpringHelper.java         |  19 +-
 .../internal/util/test/GridTestPrintStream.java |  11 +-
 .../util/test/GridTestPrintStreamFactory.java   |   4 +-
 .../util/tostring/GridToStringBuilder.java      |  33 ++-
 .../tostring/GridToStringClassDescriptor.java   |   7 +-
 .../util/tostring/GridToStringExclude.java      |   8 +-
 .../tostring/GridToStringFieldDescriptor.java   |   2 +-
 .../util/tostring/GridToStringInclude.java      |   8 +-
 .../util/tostring/GridToStringOrder.java        |   8 +-
 .../util/tostring/GridToStringThreadLocal.java  |   4 +-
 .../apache/ignite/internal/util/typedef/C1.java |   6 +-
 .../apache/ignite/internal/util/typedef/C2.java |   6 +-
 .../apache/ignite/internal/util/typedef/C3.java |   5 +-
 .../apache/ignite/internal/util/typedef/CA.java |   5 +-
 .../ignite/internal/util/typedef/CAX.java       |   5 +-
 .../ignite/internal/util/typedef/CI1.java       |   6 +-
 .../ignite/internal/util/typedef/CI2.java       |   6 +-
 .../ignite/internal/util/typedef/CIX1.java      |   5 +-
 .../ignite/internal/util/typedef/CIX2.java      |   5 +-
 .../ignite/internal/util/typedef/CIX3.java      |   5 +-
 .../apache/ignite/internal/util/typedef/CO.java |   6 +-
 .../ignite/internal/util/typedef/COX.java       |   5 +-
 .../ignite/internal/util/typedef/CX1.java       |   5 +-
 .../ignite/internal/util/typedef/CX2.java       |   5 +-
 .../ignite/internal/util/typedef/CX3.java       |   5 +-
 .../apache/ignite/internal/util/typedef/F.java  |   4 +-
 .../apache/ignite/internal/util/typedef/G.java  |   4 +-
 .../apache/ignite/internal/util/typedef/P1.java |   6 +-
 .../apache/ignite/internal/util/typedef/P2.java |   6 +-
 .../apache/ignite/internal/util/typedef/P3.java |   5 +-
 .../apache/ignite/internal/util/typedef/PA.java |   5 +-
 .../ignite/internal/util/typedef/PAX.java       |   6 +-
 .../ignite/internal/util/typedef/PCE.java       |   9 +-
 .../apache/ignite/internal/util/typedef/PE.java |   8 +-
 .../ignite/internal/util/typedef/PKV.java       |   6 +-
 .../apache/ignite/internal/util/typedef/PN.java |   8 +-
 .../ignite/internal/util/typedef/PX1.java       |   5 +-
 .../ignite/internal/util/typedef/PX2.java       |   5 +-
 .../ignite/internal/util/typedef/PX3.java       |   5 +-
 .../apache/ignite/internal/util/typedef/R1.java |   6 +-
 .../apache/ignite/internal/util/typedef/R2.java |   5 +-
 .../apache/ignite/internal/util/typedef/R3.java |   5 +-
 .../ignite/internal/util/typedef/RX1.java       |   5 +-
 .../ignite/internal/util/typedef/RX2.java       |   5 +-
 .../ignite/internal/util/typedef/RX3.java       |   5 +-
 .../apache/ignite/internal/util/typedef/T1.java |   8 +-
 .../apache/ignite/internal/util/typedef/T2.java |  10 +-
 .../apache/ignite/internal/util/typedef/T3.java |   9 +-
 .../apache/ignite/internal/util/typedef/T4.java |   9 +-
 .../apache/ignite/internal/util/typedef/T5.java |   9 +-
 .../apache/ignite/internal/util/typedef/T6.java |   9 +-
 .../apache/ignite/internal/util/typedef/X.java  |  37 ++-
 .../internal/util/typedef/internal/A.java       |   4 +-
 .../internal/util/typedef/internal/CU.java      |   4 +-
 .../internal/util/typedef/internal/D.java       |   4 +-
 .../internal/util/typedef/internal/GPC.java     |   4 +-
 .../internal/util/typedef/internal/GPR.java     |   4 +-
 .../internal/util/typedef/internal/LT.java      |   4 +-
 .../internal/util/typedef/internal/S.java       |   4 +-
 .../internal/util/typedef/internal/SB.java      |   4 +-
 .../internal/util/typedef/internal/U.java       |   4 +-
 .../ignite/internal/util/worker/GridWorker.java |  18 +-
 .../internal/util/worker/GridWorkerFuture.java  |   6 +-
 .../util/worker/GridWorkerListener.java         |   4 +-
 .../util/worker/GridWorkerListenerAdapter.java  |   2 +-
 .../internal/util/worker/GridWorkerPool.java    |  17 +-
 .../apache/ignite/internal/visor/VisorJob.java  |  17 +-
 .../internal/visor/VisorMultiNodeTask.java      |  31 +-
 .../ignite/internal/visor/VisorOneNodeTask.java |  11 +-
 .../internal/visor/VisorTaskArgument.java       |   8 +-
 .../ignite/internal/visor/cache/VisorCache.java |  44 +--
 .../cache/VisorCacheAffinityConfiguration.java  |  17 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  14 +-
 .../visor/cache/VisorCacheClearTask.java        |  23 +-
 .../visor/cache/VisorCacheConfiguration.java    |  25 +-
 .../VisorCacheConfigurationCollectorJob.java    |  17 +-
 .../VisorCacheConfigurationCollectorTask.java   |  12 +-
 .../cache/VisorCacheDefaultConfiguration.java   |   9 +-
 .../cache/VisorCacheEvictionConfiguration.java  |  16 +-
 .../visor/cache/VisorCacheLoadTask.java         |  26 +-
 .../visor/cache/VisorCacheMetadataTask.java     |  21 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  16 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |  25 +-
 .../cache/VisorCacheNearConfiguration.java      |  17 +-
 .../visor/cache/VisorCacheNodesTask.java        |  16 +-
 .../cache/VisorCacheQueryConfiguration.java     |   9 +-
 .../visor/cache/VisorCacheQueryMetrics.java     |   9 +-
 .../cache/VisorCacheRebalanceConfiguration.java |  11 +-
 .../visor/cache/VisorCacheRebalanceTask.java    |  21 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |  11 +-
 .../visor/cache/VisorCacheStartTask.java        |  33 ++-
 .../visor/cache/VisorCacheStopTask.java         |  11 +-
 .../cache/VisorCacheStoreConfiguration.java     |  21 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |  28 +-
 .../cache/VisorCacheTypeFieldMetadata.java      |   9 +-
 .../visor/cache/VisorCacheTypeMetadata.java     |  20 +-
 .../compute/VisorComputeCancelSessionsTask.java |  24 +-
 .../compute/VisorComputeMonitoringHolder.java   |  14 +-
 .../compute/VisorComputeResetMetricsTask.java   |   9 +-
 .../VisorComputeToggleMonitoringTask.java       |  29 +-
 .../visor/debug/VisorThreadDumpTask.java        |  16 +-
 .../internal/visor/debug/VisorThreadInfo.java   |   6 +-
 .../visor/debug/VisorThreadLockInfo.java        |   6 +-
 .../visor/debug/VisorThreadMonitorInfo.java     |   4 +-
 .../visor/event/VisorGridDeploymentEvent.java   |  11 +-
 .../visor/event/VisorGridDiscoveryEvent.java    |  11 +-
 .../internal/visor/event/VisorGridEvent.java    |  13 +-
 .../visor/event/VisorGridEventsLost.java        |   9 +-
 .../internal/visor/event/VisorGridJobEvent.java |  11 +-
 .../visor/event/VisorGridTaskEvent.java         |  11 +-
 .../internal/visor/file/VisorFileBlock.java     |   7 +-
 .../internal/visor/file/VisorFileBlockTask.java |  26 +-
 .../visor/file/VisorLatestTextFilesTask.java    |  30 +-
 .../ignite/internal/visor/igfs/VisorIgfs.java   |  11 +-
 .../internal/visor/igfs/VisorIgfsEndpoint.java  |   9 +-
 .../visor/igfs/VisorIgfsFormatTask.java         |  11 +-
 .../internal/visor/igfs/VisorIgfsMetrics.java   |   9 +-
 .../internal/visor/igfs/VisorIgfsProfiler.java  |  10 +-
 .../visor/igfs/VisorIgfsProfilerClearTask.java  |  30 +-
 .../visor/igfs/VisorIgfsProfilerEntry.java      |  11 +-
 .../visor/igfs/VisorIgfsProfilerTask.java       |  51 +++-
 .../VisorIgfsProfilerUniformityCounters.java    |  12 +-
 .../visor/igfs/VisorIgfsResetMetricsTask.java   |  14 +-
 .../visor/igfs/VisorIgfsSamplingStateTask.java  |  17 +-
 .../ignite/internal/visor/log/VisorLogFile.java |   8 +-
 .../visor/log/VisorLogSearchResult.java         |   9 +-
 .../internal/visor/log/VisorLogSearchTask.java  |  45 +--
 .../internal/visor/misc/VisorAckTask.java       |  16 +-
 .../visor/misc/VisorLatestVersionTask.java      |   9 +-
 .../internal/visor/misc/VisorNopTask.java       |  21 +-
 .../visor/misc/VisorResolveHostNameTask.java    |  23 +-
 .../visor/node/VisorAtomicConfiguration.java    |  11 +-
 .../visor/node/VisorBasicConfiguration.java     |  34 ++-
 .../node/VisorExecutorServiceConfiguration.java |  10 +-
 .../visor/node/VisorGridConfiguration.java      |  19 +-
 .../visor/node/VisorIgfsConfiguration.java      |  29 +-
 .../visor/node/VisorLifecycleConfiguration.java |  13 +-
 .../visor/node/VisorMetricsConfiguration.java   |   9 +-
 .../VisorNodeConfigurationCollectorJob.java     |   6 +-
 .../VisorNodeConfigurationCollectorTask.java    |   6 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |  41 +--
 .../node/VisorNodeDataCollectorJobResult.java   |  15 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |  30 +-
 .../node/VisorNodeDataCollectorTaskArg.java     |   4 +-
 .../node/VisorNodeDataCollectorTaskResult.java  |  21 +-
 .../node/VisorNodeEventsCollectorTask.java      |  46 +--
 .../internal/visor/node/VisorNodeGcTask.java    |  24 +-
 .../internal/visor/node/VisorNodePingTask.java  |  21 +-
 .../visor/node/VisorNodeRestartTask.java        |  18 +-
 .../internal/visor/node/VisorNodeStopTask.java  |  18 +-
 .../node/VisorNodeSuppressedErrorsTask.java     |  26 +-
 .../node/VisorPeerToPeerConfiguration.java      |  13 +-
 .../visor/node/VisorRestConfiguration.java      |  22 +-
 .../node/VisorSegmentationConfiguration.java    |  15 +-
 .../visor/node/VisorSpisConfiguration.java      |  27 +-
 .../node/VisorTransactionConfiguration.java     |  12 +-
 .../internal/visor/query/VisorQueryArg.java     |   4 +-
 .../visor/query/VisorQueryCleanupTask.java      |  32 ++-
 .../internal/visor/query/VisorQueryCursor.java  |  14 +-
 .../internal/visor/query/VisorQueryField.java   |   9 +-
 .../internal/visor/query/VisorQueryJob.java     |  43 +--
 .../visor/query/VisorQueryNextPageTask.java     |  21 +-
 .../internal/visor/query/VisorQueryResult.java  |   9 +-
 .../visor/query/VisorQueryResultEx.java         |   9 +-
 .../internal/visor/query/VisorQueryTask.java    |  10 +-
 .../internal/visor/query/VisorQueryUtils.java   |  17 +-
 .../util/VisorClusterGroupEmptyException.java   |   4 +-
 .../internal/visor/util/VisorEventMapper.java   |  24 +-
 .../visor/util/VisorExceptionWrapper.java       |   2 +-
 .../internal/visor/util/VisorMimeTypes.java     |  13 +-
 .../internal/visor/util/VisorTaskUtils.java     |  97 ++++---
 .../apache/ignite/lang/IgniteAsyncSupport.java  |   2 +-
 .../ignite/lang/IgniteAsyncSupported.java       |   8 +-
 .../org/apache/ignite/lang/IgniteBiClosure.java |   4 +-
 .../apache/ignite/lang/IgniteBiInClosure.java   |   4 +-
 .../apache/ignite/lang/IgniteBiPredicate.java   |   4 +-
 .../org/apache/ignite/lang/IgniteBiTuple.java   |  24 +-
 .../org/apache/ignite/lang/IgniteCallable.java  |   6 +-
 .../org/apache/ignite/lang/IgniteClosure.java   |   4 +-
 .../org/apache/ignite/lang/IgniteFuture.java    |   8 +-
 .../lang/IgniteFutureCancelledException.java    |   6 +-
 .../lang/IgniteFutureTimeoutException.java      |   6 +-
 .../org/apache/ignite/lang/IgniteInClosure.java |   4 +-
 .../ignite/lang/IgniteNotPeerDeployable.java    |   8 +-
 .../apache/ignite/lang/IgniteOutClosure.java    |   4 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |   4 +-
 .../ignite/lang/IgniteProductVersion.java       |  21 +-
 .../org/apache/ignite/lang/IgniteReducer.java   |   9 +-
 .../org/apache/ignite/lang/IgniteRunnable.java  |   4 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |  20 +-
 .../apache/ignite/lifecycle/LifecycleAware.java |   4 +-
 .../apache/ignite/lifecycle/LifecycleBean.java  |   4 +-
 .../ignite/lifecycle/LifecycleEventType.java    |   4 +-
 .../apache/ignite/logger/LoggerNodeIdAware.java |   4 +-
 .../org/apache/ignite/logger/NullLogger.java    |   6 +-
 .../apache/ignite/logger/java/JavaLogger.java   |  40 ++-
 .../logger/java/JavaLoggerFileHandler.java      |  22 +-
 .../ignite/logger/java/JavaLoggerFormatter.java |  14 +-
 .../ignite/marshaller/AbstractMarshaller.java   |  13 +-
 .../apache/ignite/marshaller/Marshaller.java    |  10 +-
 .../ignite/marshaller/MarshallerContext.java    |   4 +-
 .../ignite/marshaller/MarshallerExclusions.java |  27 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |  18 +-
 .../jdk/JdkMarshallerDummySerializable.java     |   4 +-
 .../jdk/JdkMarshallerInputStreamWrapper.java    |   5 +-
 .../jdk/JdkMarshallerObjectInputStream.java     |   9 +-
 .../jdk/JdkMarshallerObjectOutputStream.java    |  10 +-
 .../jdk/JdkMarshallerOutputStreamWrapper.java   |   5 +-
 .../optimized/OptimizedClassDescriptor.java     |  83 +++++-
 .../optimized/OptimizedFieldType.java           |   2 +-
 .../optimized/OptimizedMarshaller.java          |  26 +-
 .../optimized/OptimizedMarshallerIdMapper.java  |   2 +-
 .../optimized/OptimizedMarshallerUtils.java     |  32 ++-
 .../optimized/OptimizedObjectInputStream.java   |  91 +++++-
 .../optimized/OptimizedObjectOutputStream.java  |  58 +++-
 .../OptimizedObjectStreamRegistry.java          |  17 +-
 .../marshaller/portable/PortableMarshaller.java |  30 +-
 .../ignite/messaging/MessagingListenActor.java  |  22 +-
 .../ignite/mxbean/CacheMetricsMXBean.java       |  10 +-
 .../mxbean/ClusterLocalNodeMetricsMXBean.java   |   4 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |   7 +-
 .../apache/ignite/mxbean/IgnitionMXBean.java    |   2 +-
 .../apache/ignite/mxbean/MXBeanDescription.java |   8 +-
 .../mxbean/MXBeanParametersDescriptions.java    |   8 +-
 .../ignite/mxbean/MXBeanParametersNames.java    |   8 +-
 .../apache/ignite/mxbean/ThreadPoolMXBean.java  |   2 +-
 .../ignite/plugin/CachePluginConfiguration.java |   5 +-
 .../ignite/plugin/CachePluginContext.java       |  10 +-
 .../ignite/plugin/CachePluginProvider.java      |  10 +-
 .../org/apache/ignite/plugin/Extension.java     |   2 +-
 .../apache/ignite/plugin/ExtensionRegistry.java |   2 +-
 .../org/apache/ignite/plugin/IgnitePlugin.java  |   2 +-
 .../ignite/plugin/PluginConfiguration.java      |   2 +-
 .../org/apache/ignite/plugin/PluginContext.java |  16 +-
 .../ignite/plugin/PluginNotFoundException.java  |   4 +-
 .../apache/ignite/plugin/PluginProvider.java    |  16 +-
 .../plugin/PluginValidationException.java       |   7 +-
 .../plugin/extensions/communication/IoPool.java |   7 +-
 .../extensions/communication/Message.java       |   6 +-
 .../MessageCollectionItemType.java              |   4 +-
 .../communication/MessageFactory.java           |   6 +-
 .../communication/MessageFormatter.java         |   4 +-
 .../extensions/communication/MessageReader.java |  13 +-
 .../extensions/communication/MessageWriter.java |  12 +-
 .../plugin/security/AuthenticationContext.java  |   6 +-
 .../plugin/security/SecurityCredentials.java    |  16 +-
 .../SecurityCredentialsBasicProvider.java       |   4 +-
 .../security/SecurityCredentialsProvider.java   |   4 +-
 .../plugin/security/SecurityException.java      |   6 +-
 .../plugin/security/SecurityPermission.java     |   4 +-
 .../plugin/security/SecurityPermissionSet.java  |  10 +-
 .../ignite/plugin/security/SecuritySubject.java |   8 +-
 .../plugin/security/SecuritySubjectType.java    |   6 +-
 .../plugin/segmentation/SegmentationPolicy.java |   2 +-
 .../segmentation/SegmentationResolver.java      |   9 +-
 .../apache/ignite/portable/PortableBuilder.java |   7 +-
 .../ignite/portable/PortableException.java      |   7 +-
 .../ignite/portable/PortableIdMapper.java       |   4 +-
 .../portable/PortableInvalidClassException.java |   4 +-
 .../ignite/portable/PortableMarshalAware.java   |   2 +-
 .../ignite/portable/PortableMetadata.java       |  10 +-
 .../apache/ignite/portable/PortableObject.java  |  17 +-
 .../portable/PortableProtocolVersion.java       |   4 +-
 .../ignite/portable/PortableRawReader.java      |  13 +-
 .../ignite/portable/PortableRawWriter.java      |  13 +-
 .../apache/ignite/portable/PortableReader.java  |  13 +-
 .../ignite/portable/PortableSerializer.java     |   4 +-
 .../portable/PortableTypeConfiguration.java     |  11 +-
 .../apache/ignite/portable/PortableWriter.java  |  13 +-
 .../ignite/resources/CacheNameResource.java     |   8 +-
 .../resources/CacheStoreSessionResource.java    |   8 +-
 .../resources/IgniteInstanceResource.java       |   8 +-
 .../ignite/resources/JobContextResource.java    |   8 +-
 .../ignite/resources/LoadBalancerResource.java  |   8 +-
 .../apache/ignite/resources/LoggerResource.java |   8 +-
 .../ignite/resources/MBeanServerResource.java   |  10 +-
 .../ignite/resources/ServiceResource.java       |   8 +-
 .../SpringApplicationContextResource.java       |   8 +-
 .../apache/ignite/resources/SpringResource.java |  10 +-
 .../resources/TaskContinuousMapperResource.java |   8 +-
 .../ignite/resources/TaskSessionResource.java   |   8 +-
 .../apache/ignite/resources/package-info.java   |   2 +-
 .../ignite/scheduler/SchedulerFuture.java       |  14 +-
 .../org/apache/ignite/services/Service.java     |   4 +-
 .../ignite/services/ServiceConfiguration.java   |  13 +-
 .../apache/ignite/services/ServiceContext.java  |   9 +-
 .../ignite/services/ServiceDescriptor.java      |  10 +-
 .../ignite/spi/IgniteNodeValidationResult.java  |   4 +-
 .../apache/ignite/spi/IgnitePortProtocol.java   |   4 +-
 .../java/org/apache/ignite/spi/IgniteSpi.java   |   9 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |  68 +++--
 .../ignite/spi/IgniteSpiCloseableIterator.java  |   9 +-
 .../ignite/spi/IgniteSpiConfiguration.java      |   8 +-
 .../ignite/spi/IgniteSpiConsistencyChecked.java |   8 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |  27 +-
 .../apache/ignite/spi/IgniteSpiException.java   |   4 +-
 .../ignite/spi/IgniteSpiManagementMBean.java    |   7 +-
 .../ignite/spi/IgniteSpiMultiException.java     |  11 +-
 .../spi/IgniteSpiMultipleInstancesSupport.java  |   9 +-
 .../org/apache/ignite/spi/IgniteSpiNoop.java    |   8 +-
 .../spi/IgniteSpiOperationTimeoutException.java |  10 +-
 .../spi/IgniteSpiOperationTimeoutHelper.java    |  10 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  |  10 +-
 .../ignite/spi/IgniteSpiThreadFactory.java      |   7 +-
 .../ignite/spi/IgniteSpiTimeoutObject.java      |   4 +-
 .../spi/IgniteSpiVersionCheckException.java     |   2 +-
 .../spi/checkpoint/CheckpointListener.java      |   2 +-
 .../ignite/spi/checkpoint/CheckpointSpi.java    |   7 +-
 .../checkpoint/cache/CacheCheckpointSpi.java    |  35 ++-
 .../cache/CacheCheckpointSpiMBean.java          |   6 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |  30 +-
 .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java |   6 +-
 .../spi/checkpoint/noop/NoopCheckpointSpi.java  |  19 +-
 .../sharedfs/SharedFsCheckpointData.java        |   7 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |  40 ++-
 .../sharedfs/SharedFsCheckpointSpiMBean.java    |   9 +-
 .../checkpoint/sharedfs/SharedFsTimeData.java   |   4 +-
 .../sharedfs/SharedFsTimeoutTask.java           |  23 +-
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |  17 +-
 .../ignite/spi/collision/CollisionContext.java  |   4 +-
 .../collision/CollisionExternalListener.java    |   4 +-
 .../spi/collision/CollisionJobContext.java      |   6 +-
 .../ignite/spi/collision/CollisionSpi.java      |   6 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |  23 +-
 .../fifoqueue/FifoQueueCollisionSpiMBean.java   |   6 +-
 .../jobstealing/JobStealingCollisionSpi.java    |  65 +++--
 .../JobStealingCollisionSpiMBean.java           |  11 +-
 .../jobstealing/JobStealingDisabled.java        |   8 +-
 .../jobstealing/JobStealingRequest.java         |  13 +-
 .../spi/collision/noop/NoopCollisionSpi.java    |  15 +-
 .../PriorityQueueCollisionSpi.java              |  37 ++-
 .../PriorityQueueCollisionSpiMBean.java         |   6 +-
 .../communication/CommunicationListener.java    |   9 +-
 .../spi/communication/CommunicationSpi.java     |  14 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 147 +++++++---
 .../tcp/TcpCommunicationSpiMBean.java           |   6 +-
 .../spi/deployment/DeploymentListener.java      |   2 +-
 .../spi/deployment/DeploymentResource.java      |   2 +-
 .../deployment/DeploymentResourceAdapter.java   |   4 +-
 .../ignite/spi/deployment/DeploymentSpi.java    |   7 +-
 .../IgnoreIfPeerClassLoadingDisabled.java       |   9 +-
 .../deployment/local/LocalDeploymentSpi.java    |  44 +--
 .../local/LocalDeploymentSpiMBean.java          |   6 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |  11 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |  20 +-
 .../discovery/DiscoverySpiCustomMessage.java    |   7 +-
 .../spi/discovery/DiscoverySpiDataExchange.java |   7 +-
 .../discovery/DiscoverySpiHistorySupport.java   |   9 +-
 .../spi/discovery/DiscoverySpiListener.java     |  12 +-
 .../DiscoverySpiNodeAuthenticator.java          |  10 +-
 .../spi/discovery/DiscoverySpiOrderSupport.java |   9 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    | 123 ++++++--
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 160 ++++++++---
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |  36 ++-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 110 ++++++--
 .../spi/discovery/tcp/TcpDiscoverySpiMBean.java |  12 +-
 .../tcp/internal/TcpDiscoveryNode.java          |  50 ++--
 .../tcp/internal/TcpDiscoveryNodesRing.java     |  33 ++-
 .../tcp/internal/TcpDiscoverySpiState.java      |   2 +-
 .../tcp/internal/TcpDiscoveryStatistics.java    |  26 +-
 .../tcp/ipfinder/TcpDiscoveryIpFinder.java      |  10 +-
 .../ipfinder/TcpDiscoveryIpFinderAdapter.java   |  23 +-
 .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java |  42 +--
 .../TcpDiscoveryMulticastIpFinder.java          |  56 ++--
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |  37 ++-
 .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java |  31 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |  14 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  14 +-
 .../TcpDiscoveryCheckFailedMessage.java         |   7 +-
 .../messages/TcpDiscoveryClientAckResponse.java |  10 +-
 .../TcpDiscoveryClientHeartbeatMessage.java     |  11 +-
 .../messages/TcpDiscoveryClientPingRequest.java |   9 +-
 .../TcpDiscoveryClientPingResponse.java         |   9 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  12 +-
 .../TcpDiscoveryConnectionCheckMessage.java     |  12 +-
 .../TcpDiscoveryCustomEventMessage.java         |  15 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |   9 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |   9 +-
 .../messages/TcpDiscoveryEnsureDelivery.java    |   8 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   7 +-
 .../messages/TcpDiscoveryHandshakeResponse.java |   7 +-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  30 +-
 .../TcpDiscoveryJoinRequestMessage.java         |   9 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |   8 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  12 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  20 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |   9 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   7 +-
 .../tcp/messages/TcpDiscoveryPingRequest.java   |   9 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |   7 +-
 .../messages/TcpDiscoveryRedirectToClient.java  |   8 +-
 .../TcpDiscoveryStatusCheckMessage.java         |   9 +-
 .../spi/eventstorage/EventStorageSpi.java       |  12 +-
 .../memory/MemoryEventStorageSpi.java           |  32 ++-
 .../memory/MemoryEventStorageSpiMBean.java      |   6 +-
 .../ignite/spi/failover/FailoverContext.java    |  18 +-
 .../apache/ignite/spi/failover/FailoverSpi.java |   9 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |  31 +-
 .../failover/always/AlwaysFailoverSpiMBean.java |   6 +-
 .../jobstealing/JobStealingFailoverSpi.java     |  35 ++-
 .../JobStealingFailoverSpiMBean.java            |   6 +-
 .../spi/failover/never/NeverFailoverSpi.java    |  21 +-
 .../failover/never/NeverFailoverSpiMBean.java   |   6 +-
 .../spi/indexing/IndexingQueryFilter.java       |   6 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |  13 +-
 .../spi/indexing/noop/NoopIndexingSpi.java      |  17 +-
 .../spi/loadbalancing/LoadBalancingSpi.java     |  14 +-
 .../adaptive/AdaptiveCpuLoadProbe.java          |   8 +-
 .../adaptive/AdaptiveJobCountLoadProbe.java     |   7 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |  67 +++--
 .../adaptive/AdaptiveLoadBalancingSpiMBean.java |   6 +-
 .../adaptive/AdaptiveLoadProbe.java             |   4 +-
 .../AdaptiveProcessingTimeLoadProbe.java        |   7 +-
 .../RoundRobinGlobalLoadBalancer.java           |  39 ++-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |  48 ++--
 .../RoundRobinLoadBalancingSpiMBean.java        |   6 +-
 .../RoundRobinPerTaskLoadBalancer.java          |  10 +-
 .../WeightedRandomLoadBalancingSpi.java         |  55 ++--
 .../WeightedRandomLoadBalancingSpiMBean.java    |   6 +-
 .../ignite/spi/swapspace/SwapContext.java       |   4 +-
 .../apache/ignite/spi/swapspace/SwapKey.java    |   9 +-
 .../ignite/spi/swapspace/SwapSpaceSpi.java      |  16 +-
 .../spi/swapspace/SwapSpaceSpiListener.java     |   4 +-
 .../spi/swapspace/file/FileSwapArray.java       |   7 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |  81 ++++--
 .../swapspace/file/FileSwapSpaceSpiMBean.java   |   6 +-
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |  33 ++-
 .../apache/ignite/ssl/SslContextFactory.java    |  29 +-
 .../ignite/startup/BasicWarmupClosure.java      |  45 +--
 .../ignite/startup/cmdline/AboutDialog.java     |  41 ++-
 .../CommandLineRandomNumberGenerator.java       |   4 +-
 .../startup/cmdline/CommandLineStartup.java     |  53 ++--
 .../startup/cmdline/CommandLineTransformer.java |   7 +-
 .../org/apache/ignite/startup/package-info.java |   2 +-
 .../org/apache/ignite/stream/StreamAdapter.java |   6 +-
 .../apache/ignite/stream/StreamReceiver.java    |  12 +-
 .../apache/ignite/stream/StreamTransformer.java |  15 +-
 .../ignite/stream/StreamTupleExtractor.java     |   4 +-
 .../org/apache/ignite/stream/StreamVisitor.java |  11 +-
 .../org/apache/ignite/stream/package-info.java  |   2 +-
 .../stream/socket/SocketMessageConverter.java   |   2 +-
 .../ignite/stream/socket/SocketStreamer.java    |  35 ++-
 .../thread/IgniteStripedThreadPoolExecutor.java |  18 +-
 .../org/apache/ignite/thread/IgniteThread.java  |   9 +-
 .../ignite/thread/IgniteThreadFactory.java      |   7 +-
 .../ignite/thread/IgniteThreadPoolExecutor.java |  13 +-
 .../apache/ignite/transactions/Transaction.java |  12 +-
 .../transactions/TransactionConcurrency.java    |   4 +-
 .../TransactionHeuristicException.java          |   4 +-
 .../transactions/TransactionIsolation.java      |   4 +-
 .../ignite/transactions/TransactionMetrics.java |   4 +-
 .../TransactionOptimisticException.java         |   4 +-
 .../TransactionRollbackException.java           |   4 +-
 .../ignite/transactions/TransactionState.java   |   4 +-
 .../TransactionTimeoutException.java            |   4 +-
 .../java/org/jetbrains/annotations/NotNull.java |   8 +-
 .../java/org/jsr166/ConcurrentHashMap8.java     |  20 +-
 .../java/org/jsr166/ConcurrentLinkedDeque8.java |  18 +-
 .../org/jsr166/ConcurrentLinkedHashMap.java     |  28 +-
 .../src/main/java/org/jsr166/LongAdder8.java    |   8 +-
 .../src/main/java/org/jsr166/Striped64_8.java   |   4 +-
 .../GridCacheAffinityBackupsSelfTest.java       |  20 +-
 .../ignite/GridSuppressedExceptionSelfTest.java |   9 +-
 .../java/org/apache/ignite/GridTestIoUtils.java |  28 +-
 .../java/org/apache/ignite/GridTestJob.java     |   6 +-
 .../org/apache/ignite/GridTestJobContext.java   |  12 +-
 .../org/apache/ignite/GridTestJobResult.java    |  11 +-
 .../org/apache/ignite/GridTestNodeStartup.java  |   7 +-
 .../apache/ignite/GridTestStoreNodeStartup.java |   8 +-
 .../java/org/apache/ignite/GridTestTask.java    |  13 +-
 .../org/apache/ignite/GridTestTaskSession.java  |  20 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |  30 +-
 .../IgniteExternalizableAbstractTest.java       |  16 +-
 .../cache/IgniteWarmupClosureSelfTest.java      |  15 +-
 .../affinity/IgniteClientNodeAffinityTest.java  |  34 +--
 .../GridFairAffinityFunctionNodesSelfTest.java  |  25 +-
 .../fair/GridFairAffinityFunctionSelfTest.java  |  26 +-
 .../IgniteFairAffinityDynamicCacheSelfTest.java |  25 +-
 ...cheStoreSessionListenerAbstractSelfTest.java |  36 +--
 ...heStoreSessionListenerLifecycleSelfTest.java |  40 +--
 .../store/GridCacheBalancingStoreSelfTest.java  |  34 ++-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |  18 +-
 .../cache/store/GridGeneratingTestStore.java    |  19 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     |  39 ++-
 .../CacheJdbcPojoStoreMultitreadedSelfTest.java |   4 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |  57 ++--
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |  67 +++--
 .../CacheJdbcStoreSessionListenerSelfTest.java  |  28 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |  55 ++--
 .../jdbc/GridCacheJdbcBlobStoreSelfTest.java    |   9 +-
 .../cache/store/jdbc/model/Organization.java    |   3 +-
 .../cache/store/jdbc/model/OrganizationKey.java |   3 +-
 .../ignite/cache/store/jdbc/model/Person.java   |   3 +-
 .../store/jdbc/model/PersonComplexKey.java      |   4 +-
 .../cache/store/jdbc/model/PersonKey.java       |   3 +-
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |  64 +++--
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |  30 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |  23 +-
 .../igfs/IgfsFragmentizerTopologySelfTest.java  |   4 +-
 .../apache/ignite/igfs/IgfsPathSelfTest.java    |  26 +-
 .../ignite/igfs/IgfsTestInputGenerator.java     |   7 +-
 .../internal/ClusterGroupAbstractTest.java      |  64 +++--
 .../internal/ClusterGroupHostsSelfTest.java     |  24 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  21 +-
 .../ignite/internal/ClusterMetricsSelfTest.java |  34 ++-
 .../internal/ClusterNodeMetricsSelfTest.java    |  41 +--
 .../ignite/internal/GridAffinityMappedTest.java |  33 ++-
 .../internal/GridAffinityP2PSelfTest.java       |  41 +--
 .../ignite/internal/GridAffinitySelfTest.java   |  34 ++-
 .../GridAlwaysFailoverSpiFailSelfTest.java      |  32 ++-
 .../internal/GridCancelOnGridStopSelfTest.java  |  27 +-
 .../internal/GridCancelUnusedJobSelfTest.java   |  39 ++-
 .../GridCancelledJobsMetricsSelfTest.java       |  47 +++-
 .../GridCollisionJobsContextSelfTest.java       |  28 +-
 .../internal/GridCommunicationSelfTest.java     |  19 +-
 .../GridContinuousJobAnnotationSelfTest.java    |  36 ++-
 .../GridContinuousJobSiblingsSelfTest.java      |  29 +-
 .../internal/GridContinuousTaskSelfTest.java    |  44 ++-
 .../GridDeploymentMultiThreadedSelfTest.java    |  29 +-
 .../ignite/internal/GridDeploymentSelfTest.java |  43 +--
 .../internal/GridDiscoveryEventSelfTest.java    |  48 ++--
 .../ignite/internal/GridDiscoverySelfTest.java  |  60 ++--
 .../GridEventStorageCheckAllEventsSelfTest.java |  67 +++--
 ...ventStorageRuntimeConfigurationSelfTest.java |  38 ++-
 .../internal/GridEventStorageSelfTest.java      |  38 ++-
 .../internal/GridFactoryVmShutdownTest.java     |  21 +-
 ...ridFailFastNodeFailureDetectionSelfTest.java |  37 ++-
 .../GridFailedInputParametersSelfTest.java      |  14 +-
 .../GridFailoverCustomTopologySelfTest.java     |  38 ++-
 .../ignite/internal/GridFailoverSelfTest.java   |  36 ++-
 .../GridFailoverTaskWithPredicateSelfTest.java  |  41 ++-
 .../internal/GridFailoverTopologySelfTest.java  |  34 ++-
 .../ignite/internal/GridHomePathSelfTest.java   |  13 +-
 .../GridJobCheckpointCleanupSelfTest.java       |  35 ++-
 .../GridJobCollisionCancelSelfTest.java         |  41 ++-
 .../ignite/internal/GridJobContextSelfTest.java |  26 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |  71 +++--
 .../internal/GridJobStealingSelfTest.java       |  51 ++--
 .../GridJobStealingZeroActiveJobsSelfTest.java  |  36 ++-
 .../internal/GridJobSubjectIdSelfTest.java      |  32 ++-
 .../GridKernalConcurrentAccessStopSelfTest.java |  12 +-
 .../ignite/internal/GridKernalTestUtils.java    |   4 +-
 .../internal/GridLifecycleAwareSelfTest.java    |  28 +-
 .../internal/GridLifecycleBeanSelfTest.java     |  37 ++-
 .../internal/GridListenActorSelfTest.java       |  21 +-
 .../GridLocalEventListenerSelfTest.java         |  18 +-
 .../internal/GridMultipleJobsSelfTest.java      |  41 +--
 .../internal/GridMultipleSpisSelfTest.java      |  40 ++-
 .../GridMultipleVersionsDeploymentSelfTest.java |  48 ++--
 .../GridMultithreadedJobStealingSelfTest.java   |  41 +--
 .../ignite/internal/GridNodeFilterSelfTest.java |  13 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |  17 +-
 .../GridNodeVisorAttributesSelfTest.java        |  11 +-
 .../internal/GridNonHistoryMetricsSelfTest.java |  37 +--
 .../GridProjectionForCachesSelfTest.java        |  36 +--
 ...ectionLocalJobMultipleArgumentsSelfTest.java |  33 ++-
 .../ignite/internal/GridReduceSelfTest.java     |  20 +-
 .../internal/GridReleaseTypeSelfTest.java       |  22 +-
 .../internal/GridRuntimeExceptionSelfTest.java  |  40 ++-
 .../internal/GridSameVmStartupSelfTest.java     |  29 +-
 .../apache/ignite/internal/GridSelfTest.java    |  24 +-
 .../internal/GridSpiExceptionSelfTest.java      |  33 ++-
 .../ignite/internal/GridStartStopSelfTest.java  |  31 +-
 .../apache/ignite/internal/GridStartupMain.java |   9 +-
 .../apache/ignite/internal/GridStartupTest.java |  12 +-
 .../internal/GridStopWithCancelSelfTest.java    |  28 +-
 .../internal/GridStopWithWaitSelfTest.java      |  46 ++-
 .../GridTaskCancelSingleNodeSelfTest.java       |  41 ++-
 .../GridTaskContinuousMapperSelfTest.java       |  31 +-
 .../GridTaskExecutionContextSelfTest.java       |  34 ++-
 .../internal/GridTaskExecutionSelfTest.java     |  11 +-
 .../GridTaskFailoverAffinityRunTest.java        |  38 +--
 .../internal/GridTaskFailoverSelfTest.java      |  25 +-
 .../GridTaskFutureImplStopGridSelfTest.java     |  34 ++-
 .../GridTaskInstanceExecutionSelfTest.java      |  23 +-
 .../internal/GridTaskInstantiationSelfTest.java |  26 +-
 .../internal/GridTaskJobRejectSelfTest.java     |  46 +--
 .../internal/GridTaskListenerSelfTest.java      |  28 +-
 .../internal/GridTaskMapAsyncSelfTest.java      |  33 ++-
 .../GridTaskNameAnnotationSelfTest.java         |  30 +-
 .../internal/GridTaskResultCacheSelfTest.java   |  23 +-
 .../internal/GridTaskTimeoutSelfTest.java       |  42 ++-
 .../GridTopicExternalizableSelfTest.java        |  14 +-
 .../internal/GridUpdateNotifierSelfTest.java    |  23 +-
 .../ignite/internal/GridVersionSelfTest.java    |  10 +-
 .../IgniteClientReconnectAbstractTest.java      |  66 +++--
 .../IgniteClientReconnectApiExceptionTest.java  |  57 ++--
 .../IgniteClientReconnectAtomicsTest.java       |  18 +-
 .../IgniteClientReconnectCacheTest.java         | 102 ++++---
 .../IgniteClientReconnectCollectionsTest.java   |  26 +-
 .../IgniteClientReconnectComputeTest.java       |  17 +-
 ...eClientReconnectContinuousProcessorTest.java |  29 +-
 ...IgniteClientReconnectDiscoveryStateTest.java |  24 +-
 ...niteClientReconnectFailoverAbstractTest.java |  38 +--
 .../IgniteClientReconnectFailoverTest.java      |  34 ++-
 .../IgniteClientReconnectServicesTest.java      |  23 +-
 .../internal/IgniteClientReconnectStopTest.java |  21 +-
 .../IgniteClientReconnectStreamerTest.java      |  28 +-
 .../IgniteComputeEmptyClusterGroupTest.java     |  35 +--
 .../IgniteComputeTopologyExceptionTest.java     |  25 +-
 .../internal/IgniteExecutorServiceTest.java     |  25 +-
 ...gniteExplicitImplicitDeploymentSelfTest.java |  43 ++-
 .../internal/IgniteInternalCacheRemoveTest.java |   6 +-
 .../IgniteSlowClientDetectionSelfTest.java      |  47 ++--
 .../managers/GridManagerStopSelfTest.java       |  64 ++---
 .../managers/GridNoopManagerSelfTest.java       |  19 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |  77 +++--
 .../GridCheckpointManagerSelfTest.java          |   4 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |  49 ++--
 ...idCommunicationManagerListenersSelfTest.java |  26 +-
 .../GridCommunicationSendMessageSelfTest.java   |  35 +--
 .../communication/GridIoManagerSelfTest.java    |  45 +--
 .../GridDeploymentManagerStopSelfTest.java      |  25 +-
 .../GridDeploymentMessageCountSelfTest.java     |  45 +--
 .../managers/deployment/GridTestDeployment.java |   6 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |  49 ++--
 .../GridDiscoveryManagerAttributesSelfTest.java |  29 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |  29 +-
 .../IgniteTopologyPrintFormatSelfTest.java      |  32 +--
 .../events/GridEventStorageManagerSelfTest.java |  24 +-
 .../GridSwapSpaceCustomLocalValue.java          |   7 +-
 .../swapspace/GridSwapSpaceManagerSelfTest.java |  38 +--
 .../GridPortableAffinityKeySelfTest.java        |  45 +--
 .../GridPortableBuilderAdditionalSelfTest.java  |  63 +++--
 .../portable/GridPortableBuilderSelfTest.java   |  45 +--
 ...eBuilderStringAsCharsAdditionalSelfTest.java |   2 +-
 ...ridPortableBuilderStringAsCharsSelfTest.java |   2 +-
 ...idPortableMarshallerCtxDisabledSelfTest.java |  14 +-
 .../GridPortableMarshallerSelfTest.java         |  77 +++--
 .../GridPortableMetaDataDisabledSelfTest.java   |  19 +-
 .../portable/GridPortableMetaDataSelfTest.java  |  27 +-
 .../portable/GridPortableWildcardsSelfTest.java |  18 +-
 .../GridPortableMarshalerAwareTestClass.java    |  13 +-
 .../mutabletest/GridPortableTestClasses.java    |  23 +-
 .../portable/test/GridPortableTestClass1.java   |   2 +-
 .../portable/test/GridPortableTestClass2.java   |   2 +-
 .../test/subpackage/GridPortableTestClass3.java |   2 +-
 .../GridCacheTxLoadFromStoreOnLockSelfTest.java |  36 ++-
 .../GridAffinityProcessorAbstractSelfTest.java  |  32 ++-
 ...GridAffinityProcessorRendezvousSelfTest.java |   6 +-
 .../cache/CacheAffinityCallSelfTest.java        |  42 +--
 .../cache/CacheClientStoreSelfTest.java         |  33 ++-
 ...cheDhtLocalPartitionAfterRemoveSelfTest.java |  13 +-
 .../cache/CacheFutureExceptionSelfTest.java     |  32 ++-
 .../processors/cache/CacheGetFromJobTest.java   |  19 +-
 .../CacheMetricsForClusterGroupSelfTest.java    |  31 +-
 ...cheNearUpdateTopologyChangeAbstractTest.java |  27 +-
 .../cache/CacheOffheapMapEntrySelfTest.java     |  36 ++-
 .../CacheReadThroughAtomicRestartSelfTest.java  |   6 +-
 ...heReadThroughLocalAtomicRestartSelfTest.java |   6 +-
 .../CacheReadThroughLocalRestartSelfTest.java   |   6 +-
 ...dThroughReplicatedAtomicRestartSelfTest.java |   6 +-
 ...cheReadThroughReplicatedRestartSelfTest.java |   6 +-
 .../cache/CacheReadThroughRestartSelfTest.java  |  28 +-
 .../cache/CacheRemoveAllSelfTest.java           |  17 +-
 .../cache/CacheStopAndDestroySelfTest.java      |  50 ++--
 .../CacheStoreUsageMultinodeAbstractTest.java   |  64 +++--
 ...eUsageMultinodeDynamicStartAbstractTest.java |   8 +-
 ...oreUsageMultinodeDynamicStartAtomicTest.java |   6 +-
 ...heStoreUsageMultinodeDynamicStartTxTest.java |   6 +-
 ...reUsageMultinodeStaticStartAbstractTest.java |   9 +-
 ...toreUsageMultinodeStaticStartAtomicTest.java |   6 +-
 ...cheStoreUsageMultinodeStaticStartTxTest.java |   6 +-
 .../cache/CrossCacheTxRandomOperationsTest.java |  59 ++--
 ...ridCacheAbstractByteArrayValuesSelfTest.java |  12 +-
 .../GridCacheAbstractFailoverSelfTest.java      |  42 +--
 .../GridCacheAbstractFailoverTxSelfTest.java    |   9 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |  35 ++-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 132 ++++++---
 .../GridCacheAbstractIteratorsSelfTest.java     |  14 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |  73 +++--
 .../cache/GridCacheAbstractMetricsSelfTest.java |  42 +--
 .../GridCacheAbstractRemoveFailureTest.java     |  45 +--
 .../cache/GridCacheAbstractSelfTest.java        |  70 +++--
 .../cache/GridCacheAbstractTxReadTest.java      |  14 +-
 ...acheAbstractUsersAffinityMapperSelfTest.java |  37 ++-
 .../cache/GridCacheAffinityApiSelfTest.java     |  34 ++-
 .../cache/GridCacheAffinityMapperSelfTest.java  |  14 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |  45 +--
 .../cache/GridCacheAlwaysEvictionPolicy.java    |  11 +-
 .../GridCacheAsyncOperationsLimitSelfTest.java  |  15 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |  49 ++--
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |   7 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |  50 ++--
 .../cache/GridCacheBasicStoreAbstractTest.java  |  47 ++--
 ...acheBasicStoreMultithreadedAbstractTest.java |  29 +-
 .../cache/GridCacheClearAllSelfTest.java        |  31 +-
 .../cache/GridCacheClearLocallySelfTest.java    |  42 +--
 ...dCacheColocatedTxStoreExceptionSelfTest.java |   8 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |  35 +--
 .../cache/GridCacheConcurrentMapTest.java       |  28 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |  97 ++++---
 ...idCacheConfigurationConsistencySelfTest.java |  85 +++---
 ...ridCacheConfigurationValidationSelfTest.java |  27 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |  35 +--
 .../GridCacheDeploymentOffHeapSelfTest.java     |   9 +-
 .../cache/GridCacheDeploymentSelfTest.java      |  42 +--
 .../cache/GridCacheEntryMemorySizeSelfTest.java |  47 ++--
 .../cache/GridCacheEntryVersionSelfTest.java    |  37 +--
 .../GridCacheEvictionEventAbstractTest.java     |  39 +--
 .../GridCacheFinishPartitionsSelfTest.java      |  42 +--
 ...CacheFullTextQueryMultithreadedSelfTest.java |  29 +-
 .../cache/GridCacheGenericTestStore.java        |  29 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |  40 +--
 .../cache/GridCacheIncrementTransformTest.java  |  46 +--
 .../GridCacheInterceptorAbstractSelfTest.java   |  57 ++--
 ...cheInterceptorAtomicNearEnabledSelfTest.java |   4 +-
 ...erceptorAtomicPrimaryWriteOrderSelfTest.java |  14 +-
 ...omicReplicatedPrimaryWriteOrderSelfTest.java |  14 +-
 ...acheInterceptorAtomicReplicatedSelfTest.java |  14 +-
 .../GridCacheInterceptorAtomicSelfTest.java     |  14 +-
 ...ceptorAtomicWithStoreReplicatedSelfTest.java |   2 +-
 ...CacheInterceptorAtomicWithStoreSelfTest.java |   2 +-
 ...GridCacheInterceptorLocalAtomicSelfTest.java |  14 +-
 ...InterceptorLocalAtomicWithStoreSelfTest.java |   2 +-
 .../GridCacheInterceptorLocalSelfTest.java      |   9 +-
 ...dCacheInterceptorLocalWithStoreSelfTest.java |   2 +-
 ...GridCacheInterceptorNearEnabledSelfTest.java |   6 +-
 .../GridCacheInterceptorReplicatedSelfTest.java |   9 +-
 ...eInterceptorReplicatedWithStoreSelfTest.java |   2 +-
 .../cache/GridCacheInterceptorSelfTest.java     |   9 +-
 .../GridCacheInterceptorWithStoreSelfTest.java  |   2 +-
 .../cache/GridCacheIteratorPerformanceTest.java |  27 +-
 .../GridCacheKeyCheckNearEnabledSelfTest.java   |   4 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |  25 +-
 .../processors/cache/GridCacheLeakTest.java     |  33 +--
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  52 ++--
 .../GridCacheLocalTxStoreExceptionSelfTest.java |   6 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |  42 +--
 .../GridCacheMarshallerTxAbstractTest.java      |  28 +-
 .../GridCacheMarshallingNodeJoinSelfTest.java   |  50 ++--
 .../cache/GridCacheMemoryModeSelfTest.java      |  37 +--
 .../GridCacheMissingCommitVersionSelfTest.java  |  33 ++-
 ...GridCacheMixedPartitionExchangeSelfTest.java |  47 ++--
 .../cache/GridCacheMultiUpdateLockSelfTest.java |  46 +--
 ...ridCacheMultinodeUpdateAbstractSelfTest.java |  26 +-
 ...ultinodeUpdateAtomicNearEnabledSelfTest.java |   8 +-
 .../GridCacheMultinodeUpdateAtomicSelfTest.java |   8 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |   4 +-
 ...CacheMultinodeUpdateNearEnabledSelfTest.java |   8 +-
 .../cache/GridCacheMultinodeUpdateSelfTest.java |   8 +-
 .../cache/GridCacheMvccFlagsTest.java           |  16 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |  31 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  29 +-
 .../processors/cache/GridCacheMvccSelfTest.java |  30 +-
 .../GridCacheNearTxStoreExceptionSelfTest.java  |   6 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  40 +--
 .../cache/GridCacheObjectToStringSelfTest.java  |  41 +--
 ...ffHeapAtomicMultiThreadedUpdateSelfTest.java |   6 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |  34 +--
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |  18 +-
 .../processors/cache/GridCacheOffHeapTest.java  |  35 +--
 .../GridCacheOffHeapTieredAbstractSelfTest.java |  49 ++--
 .../GridCacheOffHeapTieredAtomicSelfTest.java   |   6 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |  34 +--
 ...acheOffHeapTieredEvictionAtomicSelfTest.java |   6 +-
 .../GridCacheOffHeapTieredEvictionSelfTest.java |   6 +-
 .../cache/GridCacheOffHeapTieredSelfTest.java   |   6 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |  26 +-
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  40 +--
 .../GridCacheOnCopyFlagAtomicSelfTest.java      |   9 +-
 .../cache/GridCacheOnCopyFlagLocalSelfTest.java |   9 +-
 .../GridCacheOnCopyFlagReplicatedSelfTest.java  |   9 +-
 ...ridCacheOnCopyFlagTxPartitionedSelfTest.java |   9 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |  29 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |  50 ++--
 .../GridCachePartitionedAffinitySpreadTest.java |  19 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |  42 +--
 .../GridCachePartitionedLocalStoreSelfTest.java |  11 +-
 ...chePartitionedOffHeapLocalStoreSelfTest.java |  11 +-
 ...hePartitionedProjectionAffinitySelfTest.java |  31 +-
 .../cache/GridCachePartitionedWritesTest.java   |  28 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |  61 ++--
 .../cache/GridCachePutAllFailoverSelfTest.java  |  79 ++++--
 .../processors/cache/GridCachePutAllTask.java   |  37 ++-
 .../cache/GridCacheQueryEmbeddedValue.java      |   9 +-
 .../GridCacheQueryIndexingDisabledSelfTest.java |  20 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |  33 ++-
 .../GridCacheReferenceCleanupSelfTest.java      |  45 +--
 .../cache/GridCacheReloadSelfTest.java          |  29 +-
 .../GridCacheReplicatedLocalStoreSelfTest.java  |  11 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |  50 ++--
 ...CacheReplicatedTxStoreExceptionSelfTest.java |   8 +-
 ...heReplicatedUsersAffinityMapperSelfTest.java |   7 +-
 .../GridCacheReturnValueTransferSelfTest.java   |  35 ++-
 .../cache/GridCacheSlowTxWarnTest.java          |  26 +-
 .../processors/cache/GridCacheStopSelfTest.java |  35 ++-
 .../cache/GridCacheStorePutxSelfTest.java       |  39 +--
 .../cache/GridCacheStoreValueBytesSelfTest.java |  24 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |  46 +--
 .../cache/GridCacheSwapReloadSelfTest.java      |  54 ++--
 ...acheTcpClientDiscoveryMultiThreadedTest.java |  31 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  32 ++-
 .../processors/cache/GridCacheTestKey.java      |   7 +-
 .../processors/cache/GridCacheTestStore.java    |  45 +--
 .../processors/cache/GridCacheTestValue.java    |   9 +-
 .../processors/cache/GridCacheTestValue2.java   |  11 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |  22 +-
 .../cache/GridCacheTtlManagerLoadTest.java      |  23 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |  35 +--
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |  11 +-
 .../GridCacheTxUsersAffinityMapperSelfTest.java |   7 +-
 .../cache/GridCacheUtilsSelfTest.java           |  18 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |  26 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |  37 +--
 ...istencyTransactionalNearEnabledSelfTest.java |   4 +-
 ...heValueConsistencyTransactionalSelfTest.java |   6 +-
 .../GridCacheVariableTopologySelfTest.java      |  43 +--
 .../cache/GridCacheVersionMultinodeTest.java    |  39 ++-
 .../cache/GridCacheVersionSelfTest.java         |  16 +-
 ...ProjectionForCachesOnDaemonNodeSelfTest.java |  20 +-
 ...teAtomicCacheEntryProcessorNodeJoinTest.java |   6 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |  62 ++--
 .../cache/IgniteCacheAbstractTest.java          |  47 ++--
 ...IgniteCacheAtomicCopyOnReadDisabledTest.java |   6 +-
 .../cache/IgniteCacheAtomicInvokeTest.java      |  14 +-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |  11 +-
 .../IgniteCacheAtomicLocalPeekModesTest.java    |   9 +-
 .../IgniteCacheAtomicLocalStoreValueTest.java   |  11 +-
 ...niteCacheAtomicLocalWithStoreInvokeTest.java |   7 +-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |   4 +-
 ...iteCacheAtomicNearEnabledStoreValueTest.java |   4 +-
 .../IgniteCacheAtomicNearPeekModesTest.java     |   2 +-
 .../cache/IgniteCacheAtomicPeekModesTest.java   |  12 +-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |  14 +-
 ...maryWriteOrderNearEnabledStoreValueTest.java |   4 +-
 ...heAtomicPrimaryWriteOrderStoreValueTest.java |   6 +-
 ...micPrimaryWriteOrderWithStoreInvokeTest.java |   7 +-
 ...IgniteCacheAtomicPutAllFailoverSelfTest.java |   6 +-
 ...gniteCacheAtomicReplicatedPeekModesTest.java |   6 +-
 .../IgniteCacheAtomicStopBusySelfTest.java      |   6 +-
 .../cache/IgniteCacheAtomicStoreValueTest.java  |  14 +-
 ...teCacheConfigurationDefaultTemplateTest.java |  16 +-
 .../IgniteCacheConfigurationTemplateTest.java   |  36 +--
 .../IgniteCacheContainsKeyAbstractSelfTest.java |  23 +-
 ...niteCacheCopyOnReadDisabledAbstractTest.java |  12 +-
 .../cache/IgniteCacheDynamicStopSelfTest.java   |  18 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  71 +++--
 ...IgniteCacheEntryListenerAtomicLocalTest.java |  11 +-
 ...eCacheEntryListenerAtomicReplicatedTest.java |   6 +-
 .../IgniteCacheEntryListenerAtomicTest.java     |  14 +-
 ...eCacheEntryListenerEagerTtlDisabledTest.java |   4 +-
 .../IgniteCacheEntryListenerTxLocalTest.java    |  11 +-
 ...gniteCacheEntryListenerTxReplicatedTest.java |   6 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |  11 +-
 .../IgniteCacheEntryProcessorNodeJoinTest.java  |  49 ++--
 .../IgniteCacheInterceptorSelfTestSuite.java    |   4 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |  47 ++--
 .../cache/IgniteCacheInvokeReadThroughTest.java |  22 +-
 .../IgniteCacheManyAsyncOperationsTest.java     |  26 +-
 .../cache/IgniteCacheNearLockValueSelfTest.java |  45 +--
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |  23 +-
 ...gniteCacheP2pUnmarshallingNearErrorTest.java |   7 +-
 ...CacheP2pUnmarshallingRebalanceErrorTest.java |  11 +-
 .../IgniteCacheP2pUnmarshallingTxErrorTest.java |  25 +-
 .../IgniteCachePartitionMapUpdateTest.java      |  32 ++-
 .../cache/IgniteCachePeekModesAbstractTest.java |  53 ++--
 .../cache/IgniteCachePutAllRestartTest.java     |  40 +--
 .../cache/IgniteCacheStartStopLoadTest.java     |  20 +-
 .../IgniteCacheStoreValueAbstractTest.java      |  46 +--
 .../IgniteCacheTopologySafeGetSelfTest.java     |  44 +--
 ...gniteCacheTransactionalStopBusySelfTest.java |   4 +-
 .../IgniteCacheTxCopyOnReadDisabledTest.java    |   6 +-
 .../cache/IgniteCacheTxInvokeTest.java          |  11 +-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |  11 +-
 .../cache/IgniteCacheTxLocalPeekModesTest.java  |   9 +-
 .../cache/IgniteCacheTxLocalStoreValueTest.java |  11 +-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |   4 +-
 .../IgniteCacheTxNearEnabledStoreValueTest.java |   4 +-
 .../cache/IgniteCacheTxNearPeekModesTest.java   |   2 +-
 .../cache/IgniteCacheTxPeekModesTest.java       |  12 +-
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |  40 +--
 .../IgniteCacheTxReplicatedPeekModesTest.java   |   6 +-
 .../cache/IgniteCacheTxStoreValueTest.java      |  11 +-
 .../cache/IgniteCachingProviderSelfTest.java    |  18 +-
 .../IgniteClientAffinityAssignmentSelfTest.java |  34 +--
 .../IgniteDaemonNodeMarshallerCacheTest.java    |  31 +-
 ...eDynamicCacheStartNoExchangeTimeoutTest.java |  55 ++--
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  57 ++--
 ...niteDynamicCacheWithConfigStartSelfTest.java |  15 +-
 .../IgniteDynamicClientCacheStartSelfTest.java  |  38 +--
 .../cache/IgniteExchangeFutureHistoryTest.java  |  17 +-
 .../cache/IgniteInternalCacheTypesTest.java     |  30 +-
 .../cache/IgnitePutAllLargeBatchSelfTest.java   |  37 ++-
 ...tAllUpdateNonPreloadedPartitionSelfTest.java |  26 +-
 ...teStartCacheInTransactionAtomicSelfTest.java |   6 +-
 .../IgniteStartCacheInTransactionSelfTest.java  |  28 +-
 .../cache/IgniteStaticCacheStartSelfTest.java   |  14 +-
 .../cache/IgniteSystemCacheOnClientTest.java    |  25 +-
 ...gniteTopologyValidatorAbstractCacheTest.java |  20 +-
 ...iteTopologyValidatorAbstractTxCacheTest.java |  12 +-
 ...ValidatorNearPartitionedAtomicCacheTest.java |   4 +-
 ...logyValidatorNearPartitionedTxCacheTest.java |   4 +-
 ...logyValidatorPartitionedAtomicCacheTest.java |  12 +-
 ...TopologyValidatorPartitionedTxCacheTest.java |   4 +-
 ...ologyValidatorReplicatedAtomicCacheTest.java |  12 +-
 ...eTopologyValidatorReplicatedTxCacheTest.java |   4 +-
 .../processors/cache/IgniteTxAbstractTest.java  |  48 ++--
 .../IgniteTxConcurrentGetAbstractTest.java      |  33 ++-
 .../IgniteTxExceptionAbstractSelfTest.java      |  49 ++--
 .../cache/IgniteTxMultiNodeAbstractTest.java    |  65 +++--
 .../IgniteTxMultiThreadedAbstractTest.java      |  36 ++-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |  51 ++--
 .../IgniteTxSingleThreadedAbstractTest.java     |  11 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |  48 ++--
 .../cache/OffHeapTieredTransactionSelfTest.java |  40 +--
 ...IgniteCacheAbstractExecutionContextTest.java |  17 +-
 .../IgniteCacheAtomicExecutionContextTest.java  |  12 +-
 ...niteCacheContinuousExecutionContextTest.java |   5 +-
 ...IgniteCacheIsolatedExecutionContextTest.java |   5 +-
 ...niteCacheP2PDisableExecutionContextTest.java |   4 +-
 ...iteCachePartitionedExecutionContextTest.java |  12 +-
 .../IgniteCachePrivateExecutionContextTest.java |   5 +-
 ...niteCacheReplicatedExecutionContextTest.java |  12 +-
 .../IgniteCacheSharedExecutionContextTest.java  |   5 +-
 .../IgniteCacheTxExecutionContextTest.java      |  12 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  41 ++-
 ...actQueueFailoverDataConsistencySelfTest.java |  41 +--
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   8 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |  11 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |   8 +-
 .../GridCacheMultiNodeDataStructureTest.java    |  11 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  31 +-
 .../GridCacheQueueCleanupSelfTest.java          |  41 +--
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |  36 +--
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  38 ++-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  34 ++-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  28 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |  43 +--
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |  27 +-
 .../GridCacheSetAbstractSelfTest.java           |  45 +--
 .../GridCacheSetFailoverAbstractSelfTest.java   |  36 ++-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |  17 +-
 .../IgniteAtomicsAbstractTest.java              |  15 +-
 .../IgniteClientDataStructuresAbstractTest.java |  30 +-
 .../IgniteClientDataStructuresTest.java         |   2 +-
 ...IgniteClientDiscoveryDataStructuresTest.java |   2 +-
 .../IgniteCollectionAbstractTest.java           |  30 +-
 .../IgniteCountDownLatchAbstractSelfTest.java   |  44 ++-
 .../IgniteDataStructureUniqueNameTest.java      |  42 ++-
 .../IgniteDataStructureWithJobTest.java         |  28 +-
 .../GridCacheLocalAtomicOffheapSetSelfTest.java |   6 +-
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |   9 +-
 .../local/GridCacheLocalAtomicSetSelfTest.java  |  14 +-
 .../GridCacheLocalOffheapQueueApiSelfTest.java  |   6 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |  14 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |   8 +-
 .../local/GridCacheLocalSetSelfTest.java        |  14 +-
 .../local/IgniteLocalAtomicLongApiSelfTest.java |   8 +-
 .../IgniteLocalCountDownLatchSelfTest.java      |  24 +-
 ...artitionedAtomicOffheapQueueApiSelfTest.java |   6 +-
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |   6 +-
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java |   6 +-
 ...dCachePartitionedAtomicQueueApiSelfTest.java |   9 +-
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |   9 +-
 ...micQueueFailoverDataConsistencySelfTest.java |  11 +-
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |   9 +-
 ...itionedAtomicQueueRotativeMultiNodeTest.java |   9 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |  10 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |  10 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  23 +-
 ...chePartitionedAtomicSetFailoverSelfTest.java |  11 +-
 .../GridCachePartitionedAtomicSetSelfTest.java  |   6 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |  10 +-
 ...rtitionedDataStructuresFailoverSelfTest.java |  14 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |  39 +--
 ...artitionedOffHeapValuesQueueApiSelfTest.java |   6 +-
 ...achePartitionedOffHeapValuesSetSelfTest.java |   6 +-
 ...edOffheapDataStructuresFailoverSelfTest.java |   6 +-
 ...hePartitionedOffheapSetFailoverSelfTest.java |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |  14 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  46 +--
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  50 ++--
 ...nedQueueFailoverDataConsistencySelfTest.java |  11 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |  14 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |  14 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |  14 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |  10 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |  10 +-
 ...GridCachePartitionedSetFailoverSelfTest.java |  11 +-
 .../GridCachePartitionedSetSelfTest.java        |  14 +-
 .../IgnitePartitionedAtomicLongApiSelfTest.java |   8 +-
 ...IgnitePartitionedCountDownLatchSelfTest.java |   8 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |  16 +-
 ...cheReplicatedAtomicReferenceApiSelfTest.java |   8 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |   8 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |   8 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |  14 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |  14 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |  14 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |  14 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |   8 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |  10 +-
 .../GridCacheReplicatedSetSelfTest.java         |  14 +-
 .../IgniteReplicatedAtomicLongApiSelfTest.java  |   8 +-
 .../IgniteReplicatedCountDownLatchSelfTest.java |   8 +-
 ...acheAsyncOperationsFailoverAbstractTest.java |  40 +--
 .../CacheAsyncOperationsFailoverAtomicTest.java |   6 +-
 .../CacheAsyncOperationsFailoverTxTest.java     |   6 +-
 .../distributed/CacheAsyncOperationsTest.java   |  43 +--
 ...CacheAtomicNearUpdateTopologyChangeTest.java |  11 +-
 .../CacheGetFutureHangsSelfTest.java            |  35 ++-
 ...CacheLoadingConcurrentGridStartSelfTest.java |  40 +--
 .../CacheNoValueClassOnServerNodeTest.java      |  30 +-
 .../CacheTxNearUpdateTopologyChangeTest.java    |   8 +-
 ...tractDistributedByteArrayValuesSelfTest.java |  32 ++-
 .../GridCacheAbstractJobExecutionTest.java      |  44 +--
 .../GridCacheAbstractNodeRestartSelfTest.java   |  57 ++--
 ...tractPartitionedByteArrayValuesSelfTest.java |  17 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |  32 ++-
 .../GridCacheBasicOpAbstractTest.java           |  45 +--
 .../GridCacheClientModesAbstractSelfTest.java   |  30 +-
 ...ientModesTcpClientDiscoveryAbstractTest.java |  13 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |  31 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |  19 +-
 .../distributed/GridCacheEventAbstractTest.java |  51 ++--
 ...heExpiredEntriesPreloadAbstractSelfTest.java |  36 +--
 .../distributed/GridCacheLockAbstractTest.java  |  50 ++--
 .../distributed/GridCacheMixedModeSelfTest.java |  15 +-
 .../GridCacheModuloAffinityFunction.java        |  21 +-
 .../GridCacheMultiNodeAbstractTest.java         |  46 +--
 .../GridCacheMultiNodeLockAbstractTest.java     |  47 ++--
 ...dCacheMultithreadedFailoverAbstractTest.java |  79 ++++--
 .../GridCacheNodeFailureAbstractTest.java       |  59 ++--
 ...ridCachePartitionNotLoadedEventSelfTest.java |  43 +--
 ...dCachePartitionedAffinityFilterSelfTest.java |  38 +--
 ...chePartitionedReloadAllAbstractSelfTest.java |  51 ++--
 .../GridCachePreloadEventsAbstractSelfTest.java |  41 +--
 .../GridCachePreloadLifecycleAbstractTest.java  |  30 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |  40 +--
 .../GridCacheTransformEventSelfTest.java        |  69 +++--
 .../distributed/IgniteCache150ClientsTest.java  |  44 +--
 .../IgniteCacheAtomicMessageRecoveryTest.java   |   6 +-
 .../IgniteCacheAtomicNodeJoinTest.java          |  11 +-
 .../IgniteCacheAtomicNodeRestartTest.java       |   8 +-
 ...niteCacheClientNodeChangingTopologyTest.java | 120 +++++---
 .../IgniteCacheClientNodeConcurrentStart.java   |  25 +-
 ...teCacheClientNodePartitionsExchangeTest.java |  72 +++--
 .../IgniteCacheClientReconnectTest.java         |  36 +--
 .../distributed/IgniteCacheManyClientsTest.java |  49 ++--
 .../IgniteCacheMessageRecoveryAbstractTest.java |  45 +--
 .../IgniteCacheNearOffheapGetSelfTest.java      |  29 +-
 .../IgniteCacheNodeJoinAbstractTest.java        |  26 +-
 .../IgniteCachePutGetRestartAbstractTest.java   |  42 +--
 .../IgniteCacheServerNodeConcurrentStart.java   |  18 +-
 .../IgniteCacheSizeFailoverTest.java            |  35 +--
 .../IgniteCacheSystemTransactionsSelfTest.java  |  39 +--
 .../IgniteCacheTxFairAffinityNodeJoinTest.java  |   6 +-
 .../IgniteCacheTxMessageRecoveryTest.java       |   6 +-
 ...arDisabledFairAffinityPutGetRestartTest.java |   6 +-
 ...iteCacheTxNearDisabledPutGetRestartTest.java |   4 +-
 .../distributed/IgniteCacheTxNodeJoinTest.java  |   8 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        |  39 +--
 ...iteTxConsistencyRestartAbstractSelfTest.java |  47 ++--
 .../distributed/IgniteTxGetAfterStopTest.java   |  22 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |  57 ++--
 ...cOriginatingNodeFailureAbstractSelfTest.java |  68 +++--
 .../IgniteTxPreloadAbstractTest.java            |  41 +--
 .../IgniteTxTimeoutAbstractTest.java            |  30 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |  18 +-
 ...heAbstractTransformWriteThroughSelfTest.java |  42 +--
 ...acheAtomicExpiredEntriesPreloadSelfTest.java |  13 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |  29 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |  58 ++--
 ...idCacheAtomicNearEnabledFullApiSelfTest.java |   4 +-
 ...EnabledPrimaryWriteOrderFullApiSelfTest.java |   4 +-
 ...eAtomicPrimaryWriteOrderFullApiSelfTest.java |   6 +-
 ...tomicPrimaryWriteOrderReloadAllSelfTest.java |   6 +-
 .../dht/GridCacheAtomicReloadAllSelfTest.java   |   8 +-
 .../dht/GridCacheClientOnlySelfTest.java        |  15 +-
 .../dht/GridCacheColocatedDebugTest.java        |  64 +++--
 .../dht/GridCacheColocatedFailoverSelfTest.java |  10 +-
 ...eColocatedOptimisticTransactionSelfTest.java |  34 +--
 ...ridCacheColocatedPreloadRestartSelfTest.java |   4 +-
 .../GridCacheColocatedPrimarySyncSelfTest.java  |   6 +-
 .../GridCacheColocatedReloadAllSelfTest.java    |   4 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |  10 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |  17 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |  26 +-
 .../GridCacheDaemonNodePartitionedSelfTest.java |   6 +-
 ...cheDhtAtomicEvictionNearReadersSelfTest.java |   6 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |  13 +-
 .../GridCacheDhtClientRemoveFailureTest.java    |   2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  47 ++--
 .../dht/GridCacheDhtEntrySetSelfTest.java       |  10 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  52 ++--
 .../dht/GridCacheDhtEvictionSelfTest.java       |  53 ++--
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |  24 +-
 ...idCacheDhtExpiredEntriesPreloadSelfTest.java |  10 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |  43 +--
 .../dht/GridCacheDhtMappingSelfTest.java        |  30 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |  18 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |  39 +--
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |  65 +++--
 .../GridCacheDhtPreloadDisabledSelfTest.java    |  56 ++--
 .../GridCacheDhtPreloadMessageCountTest.java    |  50 ++--
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |  34 +--
 .../dht/GridCacheDhtPreloadOffHeapSelfTest.java |   8 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |  44 +--
 .../dht/GridCacheDhtPreloadSelfTest.java        |  74 +++--
 .../GridCacheDhtPreloadStartStopSelfTest.java   |  50 ++--
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |  40 +--
 .../dht/GridCacheDhtRemoveFailureTest.java      |  10 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |  42 ++-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |  10 +-
 .../dht/GridCacheGlobalLoadTest.java            |  39 +--
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...ePartitionedNearDisabledFullApiSelfTest.java |   6 +-
 ...achePartitionedNearDisabledLockSelfTest.java |   6 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |  18 +-
 ...nedNearDisabledMultiNodeFullApiSelfTest.java |   6 +-
 ...bledMultiNodeP2PDisabledFullApiSelfTest.java |   6 +-
 ...ionedNearDisabledOffHeapFullApiSelfTest.java |   6 +-
 ...DisabledOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...abledOffHeapTieredAtomicFullApiSelfTest.java |  13 +-
 ...earDisabledOffHeapTieredFullApiSelfTest.java |   6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...NearDisabledOptimisticTxNodeRestartTest.java |   4 +-
 ...isabledTxOriginatingNodeFailureSelfTest.java |   4 +-
 ...dOnlyP2PDisabledByteArrayValuesSelfTest.java |   2 +-
 ...edOnlyP2PEnabledByteArrayValuesSelfTest.java |   2 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |  37 ++-
 ...dCachePartitionedTopologyChangeSelfTest.java |  65 +++--
 ...ransformWriteThroughBatchUpdateSelfTest.java |   2 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |  19 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |  42 +--
 ...IgniteCacheContainsKeyColocatedSelfTest.java |   8 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |  64 +++--
 .../dht/IgniteCacheLockFailoverSelfTest.java    |  24 +-
 .../dht/IgniteCacheMultiTxLockSelfTest.java     |  42 +--
 ...rDisabledPrimaryNodeFailureRecoveryTest.java |   4 +-
 ...rtitionedPrimaryNodeFailureRecoveryTest.java |   4 +-
 ...woBackupsPrimaryNodeFailureRecoveryTest.java |   4 +-
 ...ePrimaryNodeFailureRecoveryAbstractTest.java |  72 +++--
 .../IgniteCachePutRetryAbstractSelfTest.java    |  47 ++--
 .../dht/IgniteCachePutRetryAtomicSelfTest.java  |  34 +--
 ...gniteCachePutRetryTransactionalSelfTest.java |  48 ++--
 ...teTxConsistencyColocatedRestartSelfTest.java |   8 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |  15 +-
 ...cClientInvalidPartitionHandlingSelfTest.java |   2 +-
 .../GridCacheAtomicClientRemoveFailureTest.java |   2 +-
 .../atomic/GridCacheAtomicFailoverSelfTest.java |  16 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  81 +++---
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |  40 +--
 ...AtomicPrimaryWriteOrderFailoverSelfTest.java |   6 +-
 ...tomicPrimaryWriteOrderRemoveFailureTest.java |  16 +-
 .../GridCacheAtomicRemoveFailureTest.java       |  16 +-
 ...idCacheAtomicReplicatedFailoverSelfTest.java |   8 +-
 ...lueConsistencyAtomicNearEnabledSelfTest.java |   4 +-
 ...micPrimaryWriteOrderNearEnabledSelfTest.java |   8 +-
 ...sistencyAtomicPrimaryWriteOrderSelfTest.java |   6 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |   8 +-
 ...CacheContainsKeyColocatedAtomicSelfTest.java |   9 +-
 ...gniteCacheContainsKeyNearAtomicSelfTest.java |   7 +-
 ...PutRetryAtomicPrimaryWriteOrderSelfTest.java |   8 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |   6 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |  43 +--
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |  43 +--
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |   4 +-
 ...micFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |  14 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |  12 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...omicNearEnabledMultiNodeFullApiSelfTest.java |   4 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |   4 +-
 ...ridCacheAtomicNearEvictionEventSelfTest.java |  11 +-
 .../GridCacheAtomicNearEvictionSelfTest.java    |   6 +-
 .../GridCacheAtomicNearMultiNodeSelfTest.java   |   6 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |  27 +-
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../GridCacheAtomicNearReadersSelfTest.java     |   6 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |  14 +-
 .../GridCacheAtomicOffHeapFullApiSelfTest.java  |  12 +-
 ...heAtomicOffHeapMultiNodeFullApiSelfTest.java |  12 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |  16 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |   9 +-
 ...derFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |   6 +-
 ...rderMultiNodeP2PDisabledFullApiSelfTest.java |   6 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |  14 +-
 ...PrimaryWriteOrderOffHeapFullApiSelfTest.java |   6 +-
 ...yWriteOrderOffHeapTieredFullApiSelfTest.java |   6 +-
 ...ityOrderOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...erOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |  43 +--
 .../GridCacheNearEvictionEventSelfTest.java     |   9 +-
 .../near/GridCacheNearEvictionSelfTest.java     |  41 +--
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |   8 +-
 .../near/GridCacheNearJobExecutionSelfTest.java |  13 +-
 .../near/GridCacheNearMetricsSelfTest.java      |  16 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |  49 ++--
 .../near/GridCacheNearMultiNodeSelfTest.java    |  79 ++++--
 .../near/GridCacheNearOneNodeSelfTest.java      |  40 +--
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java |   6 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  61 ++--
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../near/GridCacheNearOnlySelfTest.java         |  16 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |  43 +--
 .../GridCacheNearPartitionedClearSelfTest.java  |  35 +--
 ...ionedP2PDisabledByteArrayValuesSelfTest.java |   2 +-
 ...tionedP2PEnabledByteArrayValuesSelfTest.java |   2 +-
 .../GridCacheNearPreloadRestartSelfTest.java    |   4 +-
 .../near/GridCacheNearPrimarySyncSelfTest.java  |   6 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |  34 ++-
 .../near/GridCacheNearReadersSelfTest.java      |  59 ++--
 .../near/GridCacheNearReloadAllSelfTest.java    |   4 +-
 .../near/GridCacheNearRemoveFailureTest.java    |  11 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |   8 +-
 .../near/GridCacheNearTxForceKeyTest.java       |  25 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |  55 ++--
 ...ssimisticOriginatingNodeFailureSelfTest.java |  15 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |  11 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |  35 +--
 ...rtitionedAffinityHashIdResolverSelfTest.java |  30 +-
 .../GridCachePartitionedAffinitySelfTest.java   |  57 ++--
 ...ionedAtomicGetAndTransformStoreSelfTest.java |   6 +-
 .../near/GridCachePartitionedBasicApiTest.java  |  12 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |  14 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  42 +--
 .../GridCachePartitionedBasicStoreSelfTest.java |   8 +-
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |  19 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |   4 +-
 .../GridCachePartitionedEntryLockSelfTest.java  |   9 +-
 .../near/GridCachePartitionedEventSelfTest.java |  15 +-
 .../GridCachePartitionedEvictionSelfTest.java   |  50 ++--
 ...titionedExplicitLockNodeFailureSelfTest.java |  42 +--
 .../GridCachePartitionedFailoverSelfTest.java   |   8 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |  32 ++-
 ...PartitionedFullApiMultithreadedSelfTest.java |   8 +-
 .../GridCachePartitionedFullApiSelfTest.java    |  23 +-
 ...PartitionedGetAndTransformStoreSelfTest.java |   8 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |  40 +--
 .../GridCachePartitionedIteratorsSelfTest.java  |   8 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |  36 +--
 .../near/GridCachePartitionedLockSelfTest.java  |  14 +-
 .../GridCachePartitionedMetricsSelfTest.java    |  13 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |  72 +++--
 ...achePartitionedMultiNodeFullApiSelfTest.java |  47 ++--
 ...idCachePartitionedMultiNodeLockSelfTest.java |  13 +-
 ...onedMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../GridCachePartitionedMultiNodeSelfTest.java  |  13 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |  44 +--
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |   4 +-
 ...itionedNearOnlyNoPrimaryFullApiSelfTest.java |   4 +-
 .../near/GridCachePartitionedNestedTxTest.java  |  11 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |  13 +-
 .../GridCachePartitionedNodeRestartTest.java    |  15 +-
 ...dCachePartitionedOffHeapFullApiSelfTest.java |   6 +-
 ...titionedOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |   9 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |  18 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  42 +--
 .../GridCachePartitionedStorePutSelfTest.java   |  34 +--
 ...GridCachePartitionedTxConcurrentGetTest.java |  11 +-
 ...GridCachePartitionedTxMultiNodeSelfTest.java |  11 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |  22 +-
 .../near/GridCachePartitionedTxReadTest.java    |   6 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |  49 ++--
 ...achePartitionedTxSingleThreadedSelfTest.java |  26 +-
 .../GridCachePartitionedTxTimeoutSelfTest.java  |  18 +-
 .../near/GridCachePutArrayValueSelfTest.java    |  21 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |  28 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   6 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |  34 +--
 .../IgniteCacheContainsKeyNearSelfTest.java     |   6 +-
 .../near/IgniteCacheNearOnlyTxTest.java         |  34 ++-
 .../near/IgniteCacheNearReadCommittedTest.java  |  19 +-
 .../near/IgniteCacheNearTxRollbackTest.java     |  39 +--
 .../near/IgniteTxReentryNearSelfTest.java       |  15 +-
 .../near/NoneRebalanceModeSelfTest.java         |  15 +-
 ...stractReplicatedByteArrayValuesSelfTest.java |  16 +-
 ...ridCacheAtomicReplicatedMetricsSelfTest.java |  12 +-
 .../GridCacheDaemonNodeReplicatedSelfTest.java  |   6 +-
 ...nedFairAffinityMultiNodeFullApiSelfTest.java |   8 +-
 ...ridCacheReplicatedAtomicFullApiSelfTest.java |   6 +-
 ...catedAtomicGetAndTransformStoreSelfTest.java |   6 +-
 ...eplicatedAtomicMultiNodeFullApiSelfTest.java |  11 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |   6 +-
 .../GridCacheReplicatedBasicApiTest.java        |   9 +-
 .../GridCacheReplicatedBasicOpSelfTest.java     |   9 +-
 .../GridCacheReplicatedBasicStoreSelfTest.java  |   8 +-
 .../GridCacheReplicatedEntrySetSelfTest.java    |   8 +-
 .../GridCacheReplicatedEventSelfTest.java       |   8 +-
 ...ridCacheReplicatedEvictionEventSelfTest.java |   9 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |  31 +-
 .../GridCacheReplicatedFailoverSelfTest.java    |  10 +-
 ...eReplicatedFullApiMultithreadedSelfTest.java |   8 +-
 ...ReplicatedFullApiMultithreadedSelfTest1.java |   4 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |  12 +-
 ...eReplicatedGetAndTransformStoreSelfTest.java |   8 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |  56 ++--
 .../GridCacheReplicatedIteratorsSelfTest.java   |   8 +-
 .../GridCacheReplicatedJobExecutionTest.java    |  11 +-
 .../GridCacheReplicatedLockSelfTest.java        |   8 +-
 .../GridCacheReplicatedMarshallerTxTest.java    |  11 +-
 .../GridCacheReplicatedMetricsSelfTest.java     |   9 +-
 ...CacheReplicatedMultiNodeFullApiSelfTest.java |   2 +-
 ...ridCacheReplicatedMultiNodeLockSelfTest.java |   8 +-
 ...atedMultiNodeP2PDisabledFullApiSelfTest.java |   4 +-
 .../GridCacheReplicatedMultiNodeSelfTest.java   |   9 +-
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |   8 +-
 .../GridCacheReplicatedNodeFailureSelfTest.java |  11 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |  13 +-
 ...idCacheReplicatedOffHeapFullApiSelfTest.java |   6 +-
 ...plicatedOffHeapMultiNodeFullApiSelfTest.java |   6 +-
 ...eReplicatedOffHeapTieredFullApiSelfTest.java |   6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |   6 +-
 ...catedP2PDisabledByteArrayValuesSelfTest.java |   2 +-
 ...icatedP2PEnabledByteArrayValuesSelfTest.java |   2 +-
 ...ridCacheReplicatedPreloadEventsSelfTest.java |   8 +-
 .../GridCacheReplicatedTxConcurrentGetTest.java |  11 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java |  10 +-
 ...GridCacheReplicatedTxMultiNodeBasicTest.java |  10 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |  23 +-
 ...licatedTxOriginatingNodeFailureSelfTest.java |   7 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |  18 +-
 .../GridCacheReplicatedTxReadTest.java          |   6 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |  22 +-
 .../GridCacheReplicatedTxTimeoutSelfTest.java   |  15 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |  43 +--
 .../GridCacheSyncReplicatedPreloadSelfTest.java |  34 +--
 .../replicated/GridReplicatedTxPreloadTest.java |   8 +-
 ...acheAtomicReplicatedNodeRestartSelfTest.java |   6 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |  48 ++--
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |   6 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  68 +++--
 ...eplicatedPreloadStartStopEventsSelfTest.java |  29 +-
 ...GridCacheReplicatedPreloadUndeploysTest.java |  13 +-
 .../cache/eviction/EvictionAbstractTest.java    |  71 +++--
 .../GridCacheBatchEvictUnswapSelfTest.java      |  30 +-
 ...heConcurrentEvictionConsistencySelfTest.java |  52 ++--
 .../GridCacheConcurrentEvictionsSelfTest.java   |  44 +--
 .../GridCacheDistributedEvictionsSelfTest.java  |  45 +--
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |  44 +--
 .../GridCacheEmptyEntriesLocalSelfTest.java     |   6 +-
 ...ridCacheEmptyEntriesPartitionedSelfTest.java |   6 +-
 .../GridCacheEvictionFilterSelfTest.java        |  45 +--
 .../GridCacheEvictionLockUnlockSelfTest.java    |  46 +--
 .../GridCacheEvictionTouchSelfTest.java         |  51 ++--
 .../cache/eviction/GridCacheMockEntry.java      |  15 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |  37 +--
 .../fifo/FifoEvictionPolicySelfTest.java        |   6 +-
 .../eviction/lru/LruEvictionPolicySelfTest.java |  10 +-
 .../lru/LruNearEvictionPolicySelfTest.java      |  38 +--
 .../LruNearOnlyNearEvictionPolicySelfTest.java  |  38 ++-
 .../RandomEvictionPolicyCacheSizeSelfTest.java  |  13 +-
 .../random/RandomEvictionPolicySelfTest.java    |  16 +-
 .../SortedEvictionPolicyPerformanceTest.java    |  26 +-
 .../sorted/SortedEvictionPolicySelfTest.java    |   6 +-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |  14 +-
 ...iteCacheAtomicExpiryPolicyWithStoreTest.java |  12 +-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |  11 +-
 ...AtomicPrimaryWriteOrderExpiryPolicyTest.java |   6 +-
 ...maryWriteOrderWithStoreExpiryPolicyTest.java |   7 +-
 ...teCacheAtomicReplicatedExpiryPolicyTest.java |   6 +-
 ...iteCacheAtomicWithStoreExpiryPolicyTest.java |   7 +-
 .../IgniteCacheClientNearCacheExpiryTest.java   |  29 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  72 +++--
 .../IgniteCacheExpiryPolicyTestSuite.java       |   6 +-
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |  35 +--
 .../expiry/IgniteCacheTtlCleanupSelfTest.java   |  26 +-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |  11 +-
 .../IgniteCacheTxExpiryPolicyWithStoreTest.java |   9 +-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |  11 +-
 ...IgniteCacheTxReplicatedExpiryPolicyTest.java |   6 +-
 .../IgniteCacheTxWithStoreExpiryPolicyTest.java |   7 +-
 .../IgniteCacheAtomicLoadAllTest.java           |  14 +-
 .../IgniteCacheAtomicLoaderWriterTest.java      |  14 +-
 .../IgniteCacheAtomicLocalLoadAllTest.java      |  11 +-
 ...CacheAtomicLocalNoLoadPreviousValueTest.java |  11 +-
 ...IgniteCacheAtomicLocalNoReadThroughTest.java |  11 +-
 ...gniteCacheAtomicLocalNoWriteThroughTest.java |  11 +-
 ...tomicNearEnabledNoLoadPreviousValueTest.java |   4 +-
 ...CacheAtomicNearEnabledNoReadThroughTest.java |   4 +-
 ...acheAtomicNearEnabledNoWriteThroughTest.java |   4 +-
 ...gniteCacheAtomicNoLoadPreviousValueTest.java |  14 +-
 .../IgniteCacheAtomicNoReadThroughTest.java     |  14 +-
 .../IgniteCacheAtomicNoWriteThroughTest.java    |  14 +-
 .../IgniteCacheAtomicStoreSessionTest.java      |  14 +-
 ...eCacheAtomicStoreSessionWriteBehindTest.java |   9 +-
 ...IgniteCacheJdbcBlobStoreNodeRestartTest.java |  14 +-
 .../IgniteCacheLoadAllAbstractTest.java         |  33 ++-
 .../IgniteCacheLoaderWriterAbstractTest.java    |  35 ++-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |  30 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |  40 +--
 .../IgniteCacheNoWriteThroughAbstractTest.java  |  33 ++-
 ...IgniteCacheStoreNodeRestartAbstractTest.java |  12 +-
 .../IgniteCacheStoreSessionAbstractTest.java    |  44 +--
 ...acheStoreSessionWriteBehindAbstractTest.java |  35 ++-
 .../integration/IgniteCacheTxLoadAllTest.java   |  11 +-
 .../IgniteCacheTxLoaderWriterTest.java          |  11 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |  11 +-
 ...niteCacheTxLocalNoLoadPreviousValueTest.java |  11 +-
 .../IgniteCacheTxLocalNoReadThroughTest.java    |  11 +-
 .../IgniteCacheTxLocalNoWriteThroughTest.java   |  11 +-
 ...cheTxNearEnabledNoLoadPreviousValueTest.java |   4 +-
 ...niteCacheTxNearEnabledNoReadThroughTest.java |   4 +-
 ...iteCacheTxNearEnabledNoWriteThroughTest.java |   4 +-
 .../IgniteCacheTxNoLoadPreviousValueTest.java   |  11 +-
 .../IgniteCacheTxNoReadThroughTest.java         |  11 +-
 .../IgniteCacheTxNoWriteThroughTest.java        |  11 +-
 .../IgniteCacheTxStoreSessionTest.java          |  30 +-
 ...gniteCacheTxStoreSessionWriteBehindTest.java |   6 +-
 ...CacheLocalOffHeapAndSwapMetricsSelfTest.java |  17 +-
 ...dCacheAtomicLocalMetricsNoStoreSelfTest.java |   4 +-
 .../GridCacheAtomicLocalMetricsSelfTest.java    |  12 +-
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |   9 +-
 .../local/GridCacheDaemonNodeLocalSelfTest.java |   9 +-
 .../GridCacheLocalAtomicBasicStoreSelfTest.java |   6 +-
 .../GridCacheLocalAtomicFullApiSelfTest.java    |   6 +-
 ...LocalAtomicGetAndTransformStoreSelfTest.java |   6 +-
 ...dCacheLocalAtomicOffHeapFullApiSelfTest.java |   6 +-
 ...LocalAtomicOffHeapTieredFullApiSelfTest.java |   6 +-
 .../local/GridCacheLocalBasicApiSelfTest.java   |   9 +-
 ...cheLocalBasicStoreMultithreadedSelfTest.java |   6 +-
 .../local/GridCacheLocalBasicStoreSelfTest.java |   8 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |  40 +--
 .../local/GridCacheLocalEventSelfTest.java      |   8 +-
 .../GridCacheLocalEvictionEventSelfTest.java    |   9 +-
 ...dCacheLocalFullApiMultithreadedSelfTest.java |   8 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |  25 +-
 ...dCacheLocalGetAndTransformStoreSelfTest.java |   8 +-
 .../GridCacheLocalIsolatedNodesSelfTest.java    |  18 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |   8 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |  27 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |  29 +-
 .../local/GridCacheLocalMetricsSelfTest.java    |   9 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |  36 ++-
 .../GridCacheLocalOffHeapFullApiSelfTest.java   |   4 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |   8 +-
 .../GridCacheLocalTxMultiThreadedSelfTest.java  |  13 +-
 .../cache/local/GridCacheLocalTxReadTest.java   |   6 +-
 .../GridCacheLocalTxSingleThreadedSelfTest.java |  13 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |  36 ++-
 ...OnlyFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...AtomicClientOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...pyOnReadDisabledMultiJvmFullApiSelfTest.java |   4 +-
 ...omicFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 .../GridCacheAtomicMultiJvmFullApiSelfTest.java |   4 +-
 ...tomicMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...tomicNearEnabledMultiJvmFullApiSelfTest.java |   4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |   4 +-
 ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...micOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...rderFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |   4 +-
 ...OrderMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...rityOrderOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...derOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...OnlyFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...pyOnReadDisabledMultiJvmFullApiSelfTest.java |   4 +-
 ...onedFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...CachePartitionedMultiJvmFullApiSelfTest.java |   4 +-
 ...ionedMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...micOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   4 +-
 ...onedNearDisabledMultiJvmFullApiSelfTest.java |   4 +-
 ...abledMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...rDisabledOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...ledOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...rtitionedOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...nedOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...ReplicatedAtomicMultiJvmFullApiSelfTest.java |   4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |   4 +-
 ...dCacheReplicatedMultiJvmFullApiSelfTest.java |   4 +-
 ...catedMultiJvmP2PDisabledFullApiSelfTest.java |   4 +-
 ...plicatedNearOnlyMultiJvmFullApiSelfTest.java |   4 +-
 ...eplicatedOffHeapMultiJvmFullApiSelfTest.java |   4 +-
 ...tedOffHeapTieredMultiJvmFullApiSelfTest.java |   4 +-
 ...ClientNodePortableMetadataMultinodeTest.java |  47 ++--
 ...GridCacheClientNodePortableMetadataTest.java |  32 ++-
 ...ableObjectsAbstractDataStreamerSelfTest.java |  41 +--
 ...bleObjectsAbstractMultiThreadedSelfTest.java |  45 +--
 ...ridCachePortableObjectsAbstractSelfTest.java |  80 ++++--
 .../GridCachePortableStoreAbstractSelfTest.java |  33 ++-
 .../GridCachePortableStoreObjectsSelfTest.java  |   4 +-
 ...GridCachePortableStorePortablesSelfTest.java |   7 +-
 ...ridPortableCacheEntryMemorySizeSelfTest.java |  19 +-
 ...leDuplicateIndexObjectsAbstractSelfTest.java |  27 +-
 .../DataStreamProcessorPortableSelfTest.java    |  19 +-
 .../GridDataStreamerImplSelfTest.java           |  47 ++--
 ...ridCacheAffinityRoutingPortableSelfTest.java |  13 +-
 ...lyPortableDataStreamerMultiNodeSelfTest.java |   2 +-
 ...rtableDataStreamerMultithreadedSelfTest.java |  13 +-
 ...artitionedOnlyPortableMultiNodeSelfTest.java |   2 +-
 ...tionedOnlyPortableMultithreadedSelfTest.java |  13 +-
 .../GridCacheMemoryModePortableSelfTest.java    |   8 +-
 ...acheOffHeapTieredAtomicPortableSelfTest.java |  11 +-
 ...eapTieredEvictionAtomicPortableSelfTest.java |  13 +-
 ...heOffHeapTieredEvictionPortableSelfTest.java |  13 +-
 .../GridCacheOffHeapTieredPortableSelfTest.java |  11 +-
 ...ateIndexObjectPartitionedAtomicSelfTest.java |   7 +-
 ...xObjectPartitionedTransactionalSelfTest.java |  11 +-
 ...AtomicNearDisabledOffheapTieredSelfTest.java |   2 +-
 ...rtableObjectsAtomicNearDisabledSelfTest.java |  13 +-
 ...tableObjectsAtomicOffheapTieredSelfTest.java |   2 +-
 .../GridCachePortableObjectsAtomicSelfTest.java |  13 +-
 ...tionedNearDisabledOffheapTieredSelfTest.java |   2 +-
 ...eObjectsPartitionedNearDisabledSelfTest.java |  13 +-
 ...ObjectsPartitionedOffheapTieredSelfTest.java |   2 +-
 ...CachePortableObjectsPartitionedSelfTest.java |  13 +-
 ...sNearPartitionedByteArrayValuesSelfTest.java |   8 +-
 ...sPartitionedOnlyByteArrayValuesSelfTest.java |   8 +-
 ...dCachePortableObjectsReplicatedSelfTest.java |  13 +-
 ...CachePortableObjectsAtomicLocalSelfTest.java |   6 +-
 ...rtableObjectsLocalOffheapTieredSelfTest.java |   2 +-
 .../GridCachePortableObjectsLocalSelfTest.java  |  13 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |  45 +--
 .../query/GridCacheSwapScanQuerySelfTest.java   |   2 +-
 .../cache/query/GridCircularQueueTest.java      |   9 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java | 103 ++++---
 ...ontinuousQueryAtomicNearEnabledSelfTest.java |   4 +-
 ...ontinuousQueryAtomicP2PDisabledSelfTest.java |   2 +-
 .../GridCacheContinuousQueryAtomicSelfTest.java |   8 +-
 ...CacheContinuousQueryLocalAtomicSelfTest.java |   6 +-
 .../GridCacheContinuousQueryLocalSelfTest.java  |   6 +-
 ...eContinuousQueryPartitionedOnlySelfTest.java |   8 +-
 ...uousQueryPartitionedP2PDisabledSelfTest.java |   2 +-
 ...CacheContinuousQueryPartitionedSelfTest.java |   6 +-
 ...ContinuousQueryReplicatedAtomicSelfTest.java |   6 +-
 ...nuousQueryReplicatedP2PDisabledSelfTest.java |   2 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |  27 +-
 .../IgniteCacheContinuousQueryClientTest.java   |  40 +--
 ...idCacheWriteBehindStoreAbstractSelfTest.java |  25 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |  46 +--
 .../GridCacheWriteBehindStoreLocalTest.java     |   4 +-
 ...heWriteBehindStoreMultithreadedSelfTest.java |  10 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |  43 +--
 ...ridCacheWriteBehindStorePartitionedTest.java |   4 +-
 ...GridCacheWriteBehindStoreReplicatedTest.java |   4 +-
 .../GridCacheWriteBehindStoreSelfTest.java      |  22 +-
 ...CacheClientWriteBehindStoreAbstractTest.java |  22 +-
 ...teCacheClientWriteBehindStoreAtomicTest.java |   9 +-
 .../IgnteCacheClientWriteBehindStoreTxTest.java |   6 +-
 .../CacheVersionedEntryAbstractTest.java        |  21 +-
 ...nedEntryLocalAtomicSwapDisabledSelfTest.java |   5 +-
 ...ersionedEntryLocalTransactionalSelfTest.java |   5 +-
 ...edEntryPartitionedAtomicOffHeapSelfTest.java |   6 +-
 ...VersionedEntryPartitionedAtomicSelfTest.java |   5 +-
 ...PartitionedTransactionalOffHeapSelfTest.java |   6 +-
 ...edEntryPartitionedTransactionalSelfTest.java |   5 +-
 ...nedEntryReplicatedAtomicOffHeapSelfTest.java |   6 +-
 ...eVersionedEntryReplicatedAtomicSelfTest.java |   5 +-
 ...yReplicatedTransactionalOffHeapSelfTest.java |   6 +-
 ...nedEntryReplicatedTransactionalSelfTest.java |   5 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |  29 +-
 .../closure/GridClosureProcessorRemoteTest.java |  21 +-
 .../closure/GridClosureProcessorSelfTest.java   |  51 ++--
 .../continuous/GridEventConsumeSelfTest.java    |  69 +++--
 .../continuous/GridMessageListenSelfTest.java   |  43 +--
 .../DataStreamProcessorSelfTest.java            |  83 ++++--
 .../datastreamer/DataStreamerImplSelfTest.java  |  36 +--
 .../DataStreamerMultiThreadedSelfTest.java      |  38 +--
 .../DataStreamerMultinodeCreateCacheTest.java   |  25 +-
 .../IgniteDataStreamerPerformanceTest.java      |  34 ++-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  95 +++++--
 .../processors/igfs/IgfsAttributesSelfTest.java |  21 +-
 .../igfs/IgfsBackupFailoverSelfTest.java        |  52 ++--
 .../igfs/IgfsBackupsDualAsyncSelfTest.java      |   6 +-
 .../igfs/IgfsBackupsDualSyncSelfTest.java       |   6 +-
 .../igfs/IgfsBackupsPrimarySelfTest.java        |   6 +-
 ...sCachePerBlockLruEvictionPolicySelfTest.java |  55 ++--
 .../processors/igfs/IgfsCacheSelfTest.java      |  37 +--
 .../igfs/IgfsClientCacheSelfTest.java           |  22 +-
 .../processors/igfs/IgfsCommonAbstractTest.java |   8 +-
 .../igfs/IgfsDataManagerSelfTest.java           |  57 ++--
 .../igfs/IgfsDualAbstractSelfTest.java          |  36 ++-
 .../processors/igfs/IgfsDualAsyncSelfTest.java  |   4 +-
 .../processors/igfs/IgfsDualSyncSelfTest.java   |   4 +-
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |  12 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |  20 +-
 .../processors/igfs/IgfsFileMapSelfTest.java    |  21 +-
 ...IgfsGroupDataBlockKeyMapperHashSelfTest.java |  10 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |  50 ++--
 .../processors/igfs/IgfsMetricsSelfTest.java    |  44 +--
 .../igfs/IgfsModeResolverSelfTest.java          |  17 +-
 .../processors/igfs/IgfsModesSelfTest.java      |  48 ++--
 .../processors/igfs/IgfsOneClientNodeTest.java  |  27 +-
 .../igfs/IgfsPrimaryOffheapTieredSelfTest.java  |   6 +-
 .../igfs/IgfsPrimaryOffheapValuesSelfTest.java  |   6 +-
 .../processors/igfs/IgfsPrimarySelfTest.java    |   4 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  70 +++--
 .../igfs/IgfsProcessorValidationSelfTest.java   |  40 +--
 ...IpcEndpointRegistrationAbstractSelfTest.java |  47 ++--
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |  10 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |  19 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |  76 +++--
 .../processors/igfs/IgfsStartCacheTest.java     |  45 +--
 .../processors/igfs/IgfsStreamsSelfTest.java    |  66 +++--
 .../processors/igfs/IgfsTaskSelfTest.java       |  64 +++--
 .../processors/igfs/IgfsTestInputStream.java    |   5 +-
 .../igfs/UniversalFileSystemAdapter.java        |   8 +-
 .../IgfsAbstractRecordResolverSelfTest.java     |  41 +--
 ...IgfsByteDelimiterRecordResolverSelfTest.java |  10 +-
 .../IgfsFixedLengthRecordResolverSelfTest.java  |  10 +-
 ...sNewLineDelimiterRecordResolverSelfTest.java |  13 +-
 ...fsStringDelimiterRecordResolverSelfTest.java |  14 +-
 .../GridJobMetricsProcessorLoadTest.java        |  10 +-
 .../port/GridPortProcessorSelfTest.java         |  16 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |  45 +--
 .../service/ClosureServiceClientsNodesTest.java |  34 ++-
 .../processors/service/DummyService.java        |  13 +-
 .../service/GridServiceClientNodeTest.java      |  18 +-
 .../GridServiceProcessorAbstractSelfTest.java   |  49 ++--
 ...ServiceProcessorMultiNodeConfigSelfTest.java |  13 +-
 .../GridServiceProcessorMultiNodeSelfTest.java  |  12 +-
 .../GridServiceProcessorProxySelfTest.java      |  16 +-
 .../GridServiceProcessorSingleNodeSelfTest.java |   5 +-
 .../GridServiceReassignmentSelfTest.java        |  22 +-
 .../timeout/GridTimeoutProcessorSelfTest.java   |  25 +-
 .../product/GridProductVersionSelfTest.java     |  12 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |  35 +--
 ...dStartupWithUndefinedIgniteHomeSelfTest.java |  31 +-
 .../internal/util/GridTestClockTimer.java       |   2 +-
 .../util/IgniteExceptionRegistrySelfTest.java   |  15 +-
 .../internal/util/IgniteUtilsSelfTest.java      |  66 +++--
 .../util/future/GridCompoundFutureSelfTest.java |  17 +-
 .../util/future/GridEmbeddedFutureSelfTest.java |  25 +-
 .../util/future/GridFutureAdapterSelfTest.java  |  29 +-
 .../future/GridFutureListenPerformanceTest.java |  19 +-
 .../util/future/GridFutureQueueTest.java        |  10 +-
 .../util/future/IgniteFutureImplTest.java       |  23 +-
 .../nio/GridNioEmbeddedFutureSelfTest.java      |   9 +-
 .../util/future/nio/GridNioFutureSelfTest.java  |  24 +-
 ...GridUnsafeDataOutputArraySizingSelfTest.java |   6 +-
 .../ipc/shmem/IgfsSharedMemoryTestClient.java   |  15 +-
 .../ipc/shmem/IgfsSharedMemoryTestServer.java   |  18 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |  34 ++-
 .../ipc/shmem/IpcSharedMemoryFakeClient.java    |   6 +-
 .../IpcSharedMemoryNativeLoaderSelfTest.java    |  15 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |  28 +-
 .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java |  26 +-
 .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java |  11 +-
 .../LoadWithCorruptedLibFileTestRunner.java     |   6 +-
 .../IpcSharedMemoryBenchmarkParty.java          |   4 +-
 .../IpcSharedMemoryBenchmarkReader.java         |  22 +-
 .../IpcSharedMemoryBenchmarkWriter.java         |  21 +-
 .../nio/GridNioDelimitedBufferSelfTest.java     |   8 +-
 .../internal/util/nio/GridNioSelfTest.java      |  59 ++--
 .../util/nio/GridNioSessionMetaKeySelfTest.java |  13 +-
 .../internal/util/nio/GridNioSslSelfTest.java   |  17 +-
 .../internal/util/nio/GridRoundTripTest.java    |  20 +-
 .../nio/impl/GridNioFilterChainSelfTest.java    |  27 +-
 .../util/offheap/GridByteArrayWrapper.java      |   4 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |  31 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |  12 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |  31 +-
 ...apPartitionedMapPerformanceAbstractTest.java |  25 +-
 .../unsafe/GridOffheapSnapTreeSelfTest.java     |  20 +-
 .../unsafe/GridUnsafeMapPerformanceTest.java    |   6 +-
 .../offheap/unsafe/GridUnsafeMapSelfTest.java   |   6 +-
 .../unsafe/GridUnsafeMemorySelfTest.java        |  23 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |   8 +-
 .../GridUnsafePartitionedMapSelfTest.java       |   6 +-
 .../unsafe/GridUnsafeStripedLruSefTest.java     |  10 +-
 .../tostring/GridToStringBuilderSelfTest.java   |  17 +-
 .../ignite/jvmtest/BlockingQueueTest.java       |  17 +-
 .../ignite/jvmtest/ConcurrentMapTest.java       |  27 +-
 .../org/apache/ignite/jvmtest/FileIOTest.java   |  15 +-
 .../apache/ignite/jvmtest/FileLocksTest.java    |  12 +-
 .../ignite/jvmtest/LinkedHashMapTest.java       |  10 +-
 .../ignite/jvmtest/MultipleFileIOTest.java      |  11 +-
 .../ignite/jvmtest/NetworkFailureTest.java      |  29 +-
 .../QueueSizeCounterMultiThreadedTest.java      |  22 +-
 .../jvmtest/ReadWriteLockMultiThreadedTest.java |  18 +-
 .../org/apache/ignite/jvmtest/RegExpTest.java   |  12 +-
 .../jvmtest/ServerSocketMultiThreadedTest.java  |  23 +-
 .../ignite/lang/GridBasicPerformanceTest.java   |  49 ++--
 .../ignite/lang/GridByteArrayListSelfTest.java  |  17 +-
 .../ignite/lang/GridFuncPerformanceTest.java    |  13 +-
 .../lang/GridFutureListenPerformanceTest.java   |  20 +-
 .../GridMetadataAwareAdapterLoadSelfTest.java   |  13 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  |  10 +-
 .../ignite/lang/GridSetWrapperSelfTest.java     |  16 +-
 .../lang/GridSystemCurrentTimeMillisTest.java   |   2 +-
 .../ignite/lang/GridThreadPriorityTest.java     |   4 +-
 .../apache/ignite/lang/GridTupleSelfTest.java   |  15 +-
 .../org/apache/ignite/lang/GridXSelfTest.java   |  16 +-
 .../apache/ignite/lang/IgniteUuidSelfTest.java  |  20 +-
 ...dBoundedConcurrentLinkedHashMapSelfTest.java |  10 +-
 ...GridBoundedConcurrentOrderedMapSelfTest.java |  14 +-
 .../GridCircularBufferPerformanceTest.java      |  18 +-
 .../lang/utils/GridCircularBufferSelfTest.java  |  13 +-
 .../utils/GridConcurrentHashMapSelfTest.java    |  13 +-
 .../GridConcurrentLinkedHashMapSelfTest.java    |  14 +-
 .../GridConcurrentWeakHashSetSelfTest.java      |  20 +-
 .../lang/utils/GridConsistentHashSelfTest.java  |  23 +-
 .../lang/utils/GridLeanIdentitySetSelfTest.java |  10 +-
 .../lang/utils/GridLeanMapPerformanceTest.java  |   9 +-
 .../ignite/lang/utils/GridLeanMapSelfTest.java  |  16 +-
 .../ignite/lang/utils/GridListSetSelfTest.java  |  15 +-
 .../lang/utils/GridStripedLockSelfTest.java     |  16 +-
 .../ignite/loadtest/GridLoadTestStatistics.java |  16 +-
 .../loadtest/GridSingleExecutionTest.java       |  59 ++--
 ...idFileSwapSpaceSpiMultithreadedLoadTest.java |  33 ++-
 .../loadtests/GridCacheLoadPopulationTask.java  |  20 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |  25 +-
 .../cache/GridCacheAbstractLoadTest.java        |  58 ++--
 .../loadtests/cache/GridCacheBenchmark.java     |  20 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |  32 ++-
 .../loadtests/cache/GridCacheLoadTest.java      |  19 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |  39 ++-
 .../GridCacheWriteBehindStoreLoadTest.java      |  33 +--
 .../capacity/GridCapacityLoadTest.java          |  17 +-
 .../colocation/GridTestCacheStore.java          |  24 +-
 .../loadtests/colocation/GridTestConstants.java |   2 +-
 .../loadtests/colocation/GridTestKey.java       |  11 +-
 .../colocation/GridTestLifecycleBean.java       |  10 +-
 .../loadtests/colocation/GridTestMain.java      |  33 ++-
 .../communication/GridIoManagerBenchmark.java   |  54 ++--
 .../communication/GridIoManagerBenchmark0.java  |  57 ++--
 .../GridTcpCommunicationBenchmark.java          |   2 +-
 .../communication/GridTestMessage.java          |  18 +-
 .../GridContinuousOperationsLoadTest.java       |  60 ++--
 .../GridCachePartitionedAtomicLongLoadTest.java |  42 +--
 .../direct/multisplit/GridLoadTestJob.java      |  11 +-
 .../multisplit/GridLoadTestJobTarget.java       |   2 +-
 .../direct/multisplit/GridLoadTestTask.java     |  23 +-
 .../multisplit/GridMultiSplitsLoadTest.java     |  31 +-
 .../GridMultiSplitsRedeployLoadTest.java        |  22 +-
 .../GridSingleSplitNewNodesTestJobTarget.java   |   6 +-
 .../GridSingleSplitNewNodesTestTask.java        |  24 +-
 ...ridSingleSplitsNewNodesAbstractLoadTest.java |  27 +-
 ...idSingleSplitsNewNodesMulticastLoadTest.java |  10 +-
 .../GridSingleSplitsRedeployLoadTest.java       |  32 ++-
 .../direct/session/GridSessionLoadTest.java     |  20 +-
 .../direct/session/GridSessionLoadTestJob.java  |  13 +-
 .../direct/session/GridSessionLoadTestTask.java |  25 +-
 .../direct/stealing/GridStealingLoadTest.java   |  31 +-
 .../stealing/GridStealingLoadTestJob.java       |  17 +-
 .../stealing/GridStealingLoadTestTask.java      |  20 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |  13 +-
 .../ignite/loadtests/dsi/GridDsiClient.java     |  40 ++-
 .../loadtests/dsi/GridDsiLifecycleBean.java     |  13 +-
 .../ignite/loadtests/dsi/GridDsiMessage.java    |   6 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |  44 +--
 .../ignite/loadtests/dsi/GridDsiRequest.java    |   7 +-
 .../loadtests/dsi/GridDsiRequestTask.java       |  13 +-
 .../ignite/loadtests/dsi/GridDsiResponse.java   |   7 +-
 .../loadtests/dsi/GridDsiResponseTask.java      |  13 +-
 .../ignite/loadtests/dsi/GridDsiSession.java    |   7 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |   8 +-
 ...dBoundedConcurrentLinkedHashSetLoadTest.java |  29 +-
 .../loadtests/hashmap/GridCacheTestContext.java |  45 +--
 .../loadtests/hashmap/GridHashMapLoadTest.java  |  20 +-
 .../job/GridJobExecutionLoadTestClient.java     |  31 +-
 ...GridJobExecutionLoadTestClientSemaphore.java |  40 ++-
 .../job/GridJobExecutionLoadTestJob.java        |  10 +-
 .../job/GridJobExecutionLoadTestServer.java     |   4 +-
 .../job/GridJobExecutionLoadTestTask.java       |  20 +-
 .../job/GridJobExecutionSingleNodeLoadTest.java |  44 ++-
 ...JobExecutionSingleNodeSemaphoreLoadTest.java |  50 ++--
 .../ignite/loadtests/job/GridJobLoadTest.java   |  29 +-
 .../loadtests/job/GridJobLoadTestJob.java       |  23 +-
 .../loadtests/job/GridJobLoadTestParams.java    |   2 +-
 .../loadtests/job/GridJobLoadTestSubmitter.java |  16 +-
 .../loadtests/job/GridJobLoadTestTask.java      |  20 +-
 .../GridConcurrentLinkedHashMapBenchmark.java   |  13 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |   8 +-
 .../mapper/GridContinuousMapperLoadTest2.java   |  13 +-
 .../mapper/GridContinuousMapperTask1.java       |  32 ++-
 .../mapper/GridContinuousMapperTask2.java       |  26 +-
 .../loadtests/mapper/GridNodeStartup.java       |  11 +-
 .../ignite/loadtests/mapper/TestObject.java     |   7 +-
 .../mergesort/GridMergeSortLoadTask.java        |  24 +-
 .../mergesort/GridMergeSortLoadTest.java        |  19 +-
 .../loadtests/nio/GridNioBenchmarkClient.java   |  17 +-
 .../loadtests/nio/GridNioBenchmarkTest.java     |  25 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |  16 +-
 ...apPartitionedMapPerformanceAbstractTest.java |  28 +-
 .../unsafe/GridUnsafeMapPerformanceTest.java    |   6 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |   8 +-
 .../swap/GridSwapEvictAllBenchmark.java         |  45 +--
 .../loadtests/util/GridCumulativeAverage.java   |   2 +-
 .../ignite/loadtests/util/GridLoadTestArgs.java |  14 +-
 .../ignite/logger/java/JavaLoggerTest.java      |  15 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  82 ++++--
 .../GridMarshallerExternalizableBean.java       |  10 +-
 .../GridMarshallerPerformanceTest.java          |  43 ++-
 .../marshaller/GridMarshallerResourceBean.java  |  37 +--
 .../GridMarshallerTestAbstractBean.java         |   2 +-
 .../marshaller/GridMarshallerTestBean.java      |   9 +-
 .../GridMarshallerTestInheritedBean.java        |   2 +-
 .../marshaller/MarshallerContextTestImpl.java   |  15 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |   7 +-
 .../OptimizedMarshallerEnumSelfTest.java        |   6 +-
 .../OptimizedMarshallerNodeFailoverTest.java    |  39 +--
 .../optimized/OptimizedMarshallerSelfTest.java  |  21 +-
 ...arshallerSerialPersistentFieldsSelfTest.java |  12 +-
 .../optimized/OptimizedMarshallerTest.java      |  40 ++-
 .../OptimizedObjectStreamSelfTest.java          |  73 +++--
 .../TestTcpDiscoveryIpFinderAdapter.java        |  11 +-
 ...GridMessagingNoPeerClassLoadingSelfTest.java |  20 +-
 .../ignite/messaging/GridMessagingSelfTest.java |  62 ++--
 .../IgniteMessagingWithClientTest.java          |  39 +--
 .../p2p/GridAbstractMultinodeRedeployTest.java  |  24 +-
 ...MultinodeRedeployContinuousModeSelfTest.java |   6 +-
 ...idMultinodeRedeployIsolatedModeSelfTest.java |   6 +-
 ...ridMultinodeRedeployPrivateModeSelfTest.java |   6 +-
 ...GridMultinodeRedeploySharedModeSelfTest.java |   6 +-
 .../ignite/p2p/GridP2PClassLoadingSelfTest.java |  36 ++-
 .../GridP2PContinuousDeploymentSelfTest.java    |  25 +-
 .../GridP2PDifferentClassLoaderSelfTest.java    |  19 +-
 .../p2p/GridP2PDoubleDeploymentSelfTest.java    |  23 +-
 .../p2p/GridP2PHotRedeploymentSelfTest.java     |  15 +-
 .../p2p/GridP2PJobClassLoaderSelfTest.java      |  22 +-
 .../p2p/GridP2PLocalDeploymentSelfTest.java     |  33 ++-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |  31 +-
 .../ignite/p2p/GridP2PNodeLeftSelfTest.java     |  17 +-
 .../p2p/GridP2PRecursionTaskSelfTest.java       |  25 +-
 .../p2p/GridP2PRemoteClassLoadersSelfTest.java  |  32 ++-
 .../p2p/GridP2PSameClassLoaderSelfTest.java     |  19 +-
 .../org/apache/ignite/p2p/GridP2PTestJob.java   |  17 +-
 .../org/apache/ignite/p2p/GridP2PTestTask.java  |  22 +-
 .../p2p/GridP2PTestTaskExecutionTest.java       |  12 +-
 .../ignite/p2p/GridP2PTimeoutSelfTest.java      |  22 +-
 .../ignite/p2p/GridP2PUndeploySelfTest.java     |  27 +-
 .../ignite/p2p/GridSwapSpaceCustomKey.java      |   7 +-
 .../ignite/p2p/GridSwapSpaceCustomValue.java    |   7 +-
 ...SessionCancelSiblingsFromFutureSelfTest.java |  44 ++-
 ...ridSessionCancelSiblingsFromJobSelfTest.java |  49 ++--
 ...idSessionCancelSiblingsFromTaskSelfTest.java |  47 ++--
 .../GridSessionCheckpointAbstractSelfTest.java  |  36 ++-
 .../session/GridSessionCheckpointSelfTest.java  |  15 +-
 .../GridSessionCollisionSpiSelfTest.java        |  37 ++-
 ...idSessionFutureWaitJobAttributeSelfTest.java |  37 ++-
 ...dSessionFutureWaitTaskAttributeSelfTest.java |  38 ++-
 .../session/GridSessionJobFailoverSelfTest.java |  31 +-
 ...GridSessionJobWaitTaskAttributeSelfTest.java |  41 ++-
 .../ignite/session/GridSessionLoadSelfTest.java |  42 ++-
 .../GridSessionSetFutureAttributeSelfTest.java  |  44 ++-
 ...nSetFutureAttributeWaitListenerSelfTest.java |  42 ++-
 .../GridSessionSetJobAttribute2SelfTest.java    |  28 +-
 ...GridSessionSetJobAttributeOrderSelfTest.java |  31 +-
 .../GridSessionSetJobAttributeSelfTest.java     |  41 ++-
 ...sionSetJobAttributeWaitListenerSelfTest.java |  43 ++-
 .../GridSessionSetTaskAttributeSelfTest.java    |  35 ++-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |  35 ++-
 .../GridSessionWaitAttributeSelfTest.java       |  43 ++-
 .../ignite/session/GridThreadSerialNumber.java  |   2 +-
 .../spi/GridSpiLocalHostInjectionTest.java      |  16 +-
 .../spi/GridSpiStartStopAbstractTest.java       |   4 +-
 .../org/apache/ignite/spi/GridTcpForwarder.java |  15 +-
 .../spi/GridTcpSpiForwardingSelfTest.java       |  35 ++-
 .../GridCheckpointSpiAbstractTest.java          |   6 +-
 .../spi/checkpoint/GridCheckpointTestState.java |   4 +-
 .../cache/CacheCheckpointSpiConfigSelfTest.java |   5 +-
 .../CacheCheckpointSpiSecondCacheSelfTest.java  |  19 +-
 .../cache/CacheCheckpointSpiSelfTest.java       |   6 +-
 .../CacheCheckpointSpiStartStopSelfTest.java    |   6 +-
 .../jdbc/JdbcCheckpointSpiConfigSelfTest.java   |  19 +-
 .../JdbcCheckpointSpiCustomConfigSelfTest.java  |   8 +-
 .../JdbcCheckpointSpiDefaultConfigSelfTest.java |   8 +-
 .../JdbcCheckpointSpiStartStopSelfTest.java     |   8 +-
 ...GridSharedFsCheckpointSpiConfigSelfTest.java |   8 +-
 ...redFsCheckpointSpiMultiThreadedSelfTest.java |  26 +-
 ...heckpointSpiMultipleDirectoriesSelfTest.java |  19 +-
 .../GridSharedFsCheckpointSpiSelfTest.java      |  15 +-
 ...dSharedFsCheckpointSpiStartStopSelfTest.java |   6 +-
 .../spi/collision/GridCollisionTestContext.java |   5 +-
 .../collision/GridTestCollisionJobContext.java  |  12 +-
 .../collision/GridTestCollisionTaskSession.java |  15 +-
 ...GridFifoQueueCollisionSpiConfigSelfTest.java |   5 +-
 .../GridFifoQueueCollisionSpiSelfTest.java      |  17 +-
 ...dFifoQueueCollisionSpiStartStopSelfTest.java |   6 +-
 ...bStealingCollisionSpiAttributesSelfTest.java |  36 ++-
 ...idJobStealingCollisionSpiConfigSelfTest.java |   5 +-
 ...alingCollisionSpiCustomTopologySelfTest.java |  42 +--
 .../GridJobStealingCollisionSpiSelfTest.java    |  47 ++--
 ...obStealingCollisionSpiStartStopSelfTest.java |  18 +-
 ...PriorityQueueCollisionSpiConfigSelfTest.java |   5 +-
 .../GridPriorityQueueCollisionSpiSelfTest.java  |  27 +-
 ...orityQueueCollisionSpiStartStopSelfTest.java |   6 +-
 .../GridAbstractCommunicationSelfTest.java      |  47 ++--
 .../communication/GridCacheMessageSelfTest.java |  46 +--
 .../spi/communication/GridTestMessage.java      |  13 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |  53 ++--
 .../GridTcpCommunicationSpiAbstractTest.java    |  20 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |  59 ++--
 .../GridTcpCommunicationSpiConfigSelfTest.java  |   5 +-
 .../tcp/GridTcpCommunicationSpiLanTest.java     |  41 +--
 ...cpCommunicationSpiMultithreadedSelfTest.java |  68 +++--
 ...pCommunicationSpiMultithreadedShmemTest.java |   2 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |  51 ++--
 ...tionSpiRecoveryFailureDetectionSelfTest.java |   4 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |  56 ++--
 .../GridTcpCommunicationSpiShmemSelfTest.java   |   4 +-
 .../tcp/GridTcpCommunicationSpiSslSelfTest.java |   4 +-
 ...ridTcpCommunicationSpiStartStopSelfTest.java |   9 +-
 ...unicationSpiTcpFailureDetectionSelfTest.java |   6 +-
 ...cpCommunicationSpiTcpNoDelayOffSelfTest.java |   2 +-
 .../tcp/GridTcpCommunicationSpiTcpSelfTest.java |   4 +-
 .../tcp/IgniteCacheSslStartStopSelfTest.java    |  12 +-
 ...CommunicationRecoveryAckClosureSelfTest.java |  54 ++--
 .../local/GridLocalDeploymentSpiSelfTest.java   |  27 +-
 ...GridLocalDeploymentSpiStartStopSelfTest.java |   6 +-
 .../AbstractDiscoveryRandomStartStopTest.java   |  23 +-
 .../discovery/AbstractDiscoverySelfTest.java    |  53 ++--
 .../spi/discovery/AbstractDiscoveryTest.java    |  22 +-
 ...ClusterMetricsSnapshotSerializeSelfTest.java |   9 +-
 ...pClientDiscoveryMarshallerCheckSelfTest.java |  18 +-
 ...lientDiscoverySpiFailureTimeoutSelfTest.java |  18 +-
 .../tcp/TcpClientDiscoverySpiMulticastTest.java |  17 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |  94 +++++--
 .../tcp/TcpDiscoveryConcurrentStartTest.java    |  19 +-
 .../TcpDiscoveryMarshallerCheckSelfTest.java    |  18 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |  37 ++-
 ...DiscoveryNodeConfigConsistentIdSelfTest.java |  13 +-
 .../TcpDiscoveryNodeConsistentIdSelfTest.java   |  14 +-
 .../discovery/tcp/TcpDiscoveryRestartTest.java  |  41 +--
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  85 ++++--
 .../tcp/TcpDiscoverySnapshotHistoryTest.java    |  15 +-
 .../tcp/TcpDiscoverySpiConfigSelfTest.java      |   6 +-
 .../TcpDiscoverySpiFailureTimeoutSelfTest.java  |  34 ++-
 .../tcp/TcpDiscoverySpiRandomStartStopTest.java |  10 +-
 .../discovery/tcp/TcpDiscoverySpiSelfTest.java  |  11 +-
 .../tcp/TcpDiscoverySpiSslSelfTest.java         |   2 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |  20 +-
 .../tcp/TcpDiscoverySpiWildcardSelfTest.java    |  10 +-
 .../discovery/tcp/TcpDiscoverySslSelfTest.java  |   6 +-
 .../TcpDiscoveryIpFinderAbstractSelfTest.java   |  19 +-
 .../jdbc/TcpDiscoveryJdbcIpFinderSelfTest.java  |   8 +-
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |  12 +-
 .../TcpDiscoverySharedFsIpFinderSelfTest.java   |   9 +-
 .../vm/TcpDiscoveryVmIpFinderSelfTest.java      |  10 +-
 ...MemoryEventStorageMultiThreadedSelfTest.java |  17 +-
 ...GridMemoryEventStorageSpiConfigSelfTest.java |   5 +-
 .../GridMemoryEventStorageSpiSelfTest.java      |  17 +-
 ...dMemoryEventStorageSpiStartStopSelfTest.java |   6 +-
 .../spi/failover/GridFailoverTestContext.java   |  11 +-
 .../GridAlwaysFailoverSpiConfigSelfTest.java    |   5 +-
 .../always/GridAlwaysFailoverSpiSelfTest.java   |  26 +-
 .../GridAlwaysFailoverSpiStartStopSelfTest.java |   8 +-
 ...ridJobStealingFailoverSpiConfigSelfTest.java |   5 +-
 ...idJobStealingFailoverSpiOneNodeSelfTest.java |  25 +-
 .../GridJobStealingFailoverSpiSelfTest.java     |  35 ++-
 ...JobStealingFailoverSpiStartStopSelfTest.java |  18 +-
 .../never/GridNeverFailoverSpiSelfTest.java     |  19 +-
 .../GridNeverFailoverSpiStartStopSelfTest.java  |   8 +-
 ...dAdaptiveLoadBalancingSpiConfigSelfTest.java |   5 +-
 ...iveLoadBalancingSpiMultipleNodeSelfTest.java |  22 +-
 .../GridAdaptiveLoadBalancingSpiSelfTest.java   |  23 +-
 ...aptiveLoadBalancingSpiStartStopSelfTest.java |   6 +-
 ...alancingNotPerTaskMultithreadedSelfTest.java |  28 +-
 ...dRobinLoadBalancingSpiLocalNodeSelfTest.java |  15 +-
 ...inLoadBalancingSpiMultipleNodesSelfTest.java |  28 +-
 ...RobinLoadBalancingSpiNotPerTaskSelfTest.java |  34 ++-
 ...dRobinLoadBalancingSpiStartStopSelfTest.java |   6 +-
 ...nLoadBalancingSpiTopologyChangeSelfTest.java |  26 +-
 .../roundrobin/GridRoundRobinTestUtils.java     |  15 +-
 ...tedRandomLoadBalancingSpiConfigSelfTest.java |   5 +-
 ...dWeightedRandomLoadBalancingSpiSelfTest.java |  18 +-
 ...RandomLoadBalancingSpiStartStopSelfTest.java |   6 +-
 ...dRandomLoadBalancingSpiWeightedSelfTest.java |  28 +-
 .../GridSwapSpaceSpiAbstractSelfTest.java       |  40 ++-
 .../file/GridFileSwapCompactionSelfTest.java    |  18 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |  34 ++-
 .../inmemory/GridTestSwapSpaceSpi.java          |  40 ++-
 .../noop/GridNoopSwapSpaceSpiSelfTest.java      |  14 +-
 .../startup/GridRandomCommandLineLoader.java    |  54 ++--
 .../ignite/startup/GridVmNodesStarter.java      |  47 ++--
 .../cmdline/GridCommandLineLoaderTest.java      |  17 +-
 .../GridCommandLineTransformerSelfTest.java     |   9 +-
 .../startup/servlet/GridServletLoaderTest.java  |  21 +-
 .../stream/socket/SocketStreamerSelfTest.java   |  52 ++--
 .../ignite/testframework/GridFileLock.java      |  16 +-
 .../testframework/GridJarClassLoader.java       |  18 +-
 .../ignite/testframework/GridLoadTestUtils.java |  22 +-
 .../testframework/GridSpiTestContext.java       |  64 +++--
 .../ignite/testframework/GridStringLogger.java  |   8 +-
 .../testframework/GridTestClassLoader.java      |  13 +-
 .../GridTestExternalClassLoader.java            |  19 +-
 .../ignite/testframework/GridTestNode.java      |  24 +-
 .../GridTestSafeThreadFactory.java              |  26 +-
 .../ignite/testframework/GridTestThread.java    |   4 +-
 .../ignite/testframework/GridTestUtils.java     | 104 ++++---
 .../config/GridTestProperties.java              |  24 +-
 .../http/GridEmbeddedHttpServer.java            |  20 +-
 .../testframework/junits/GridAbstractTest.java  | 123 +++++---
 .../junits/GridTestKernalContext.java           |  24 +-
 .../ignite/testframework/junits/IgniteMock.java |  49 +++-
 .../junits/IgniteTestResources.java             |  38 +--
 .../cache/GridAbstractCacheStoreSelfTest.java   |  44 +--
 .../junits/cache/TestCacheSession.java          |  13 +-
 .../cache/TestThreadLocalCacheSession.java      |  11 +-
 .../junits/common/GridAbstractExamplesTest.java |   9 +-
 .../GridAbstractLifecycleAwareSelfTest.java     |  14 +-
 .../junits/common/GridCommonAbstractTest.java   |  96 ++++---
 .../junits/common/GridCommonTest.java           |   9 +-
 .../logger/GridLog4jRollingFileAppender.java    |  18 +-
 .../junits/logger/GridTestLog4jLogger.java      |  49 ++--
 .../junits/multijvm/AffinityProcessProxy.java   |  18 +-
 .../multijvm/IgniteCacheProcessProxy.java       |  50 ++--
 .../multijvm/IgniteClusterProcessProxy.java     |  31 +-
 .../multijvm/IgniteEventsProcessProxy.java      |  22 +-
 .../junits/multijvm/IgniteNodeRunner.java       |  46 +--
 .../junits/multijvm/IgniteProcessProxy.java     |  83 ++++--
 .../junits/spi/GridSpiAbstractConfigTest.java   |  13 +-
 .../junits/spi/GridSpiAbstractTest.java         |  66 +++--
 .../testframework/junits/spi/GridSpiTest.java   |  16 +-
 .../junits/spi/GridSpiTestConfig.java           |   8 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |  47 ++--
 .../IgniteCacheDataStructuresSelfTestSuite.java |  67 ++++-
 .../IgniteCacheEvictionSelfTestSuite.java       |  32 ++-
 .../IgniteCacheFailoverTestSuite.java           |  38 ++-
 .../IgniteCacheFailoverTestSuite2.java          |  21 +-
 ...IgniteCacheFullApiMultiJvmSelfTestSuite.java |  46 ++-
 .../IgniteCacheFullApiSelfTestSuite.java        |  86 +++++-
 .../IgniteCacheIteratorsSelfTestSuite.java      |  10 +-
 .../IgniteCacheMetricsSelfTestSuite.java        |  21 +-
 .../IgniteCacheNearOnlySelfTestSuite.java       |   9 +-
 ...niteCacheP2pUnmarshallingErrorTestSuite.java |  14 +-
 .../testsuites/IgniteCacheRestartTestSuite.java |  18 +-
 .../IgniteCacheTcpClientDiscoveryTestSuite.java |   8 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java | 125 ++++++--
 .../testsuites/IgniteCacheTestSuite2.java       | 110 +++++++-
 .../testsuites/IgniteCacheTestSuite3.java       |  67 ++++-
 .../testsuites/IgniteCacheTestSuite4.java       | 110 +++++++-
 .../IgniteCacheTxRecoverySelfTestSuite.java     |  16 +-
 .../IgniteCacheWriteBehindTestSuite.java        |  15 +-
 .../testsuites/IgniteClientNodesTestSuite.java  |   8 +-
 .../IgniteClientReconnectTestSuite.java         |  16 +-
 .../testsuites/IgniteClientTestSuite.java       |   6 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |  62 +++-
 .../IgniteContinuousTaskSelfTestSuite.java      |   9 +-
 .../IgniteExternalizableSelfTestSuite.java      |   6 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |  43 ++-
 .../IgniteIpcSharedMemorySelfTestSuite.java     |   9 +-
 .../IgniteJobMetricsSelfTestSuite.java          |   6 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |  55 ++--
 .../testsuites/IgniteLangSelfTestSuite.java     |  34 ++-
 .../testsuites/IgniteLoggingSelfTestSuite.java  |   5 +-
 .../IgniteMarshallerSelfTestSuite.java          |  20 +-
 .../testsuites/IgniteP2PSelfTestSuite.java      |  21 +-
 .../IgnitePortableCacheFullApiTestSuite.java    |   9 +-
 .../IgnitePortableCacheTestSuite.java           |  43 ++-
 .../IgnitePortableObjectsTestSuite.java         |  36 ++-
 .../testsuites/IgniteRestHandlerTestSuite.java  |   6 +-
 .../IgniteSpiCheckpointSelfTestSuite.java       |  19 +-
 .../IgniteSpiCollisionSelfTestSuite.java        |  18 +-
 .../IgniteSpiCommunicationSelfTestSuite.java    |  18 +-
 .../IgniteSpiDeploymentSelfTestSuite.java       |   7 +-
 .../IgniteSpiDiscoverySelfTestSuite.java        |  31 +-
 .../IgniteSpiEventStorageSelfTestSuite.java     |   9 +-
 .../IgniteSpiFailoverSelfTestSuite.java         |  16 +-
 .../IgniteSpiIndexingSelfTestSuite.java         |   6 +-
 .../IgniteSpiLoadBalancingSelfTestSuite.java    |  22 +-
 .../IgniteSpiSwapSpaceSelfTestSuite.java        |   9 +-
 .../ignite/testsuites/IgniteSpiTestSuite.java   |   6 +-
 .../testsuites/IgniteStartUpTestSuite.java      |   6 +-
 .../testsuites/IgniteStreamSelfTestSuite.java   |   7 +-
 .../IgniteTaskSessionSelfTestSuite.java         |  24 +-
 .../IgniteTimeoutProcessorSelfTestSuite.java    |   7 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |  41 +--
 .../GridThreadPoolExecutorServiceSelfTest.java  |  21 +-
 .../apache/ignite/thread/GridThreadTest.java    |   9 +-
 ...dConcurrentLinkedDequeMultiThreadedTest.java |  19 +-
 .../util/GridConcurrentLinkedDequeSelfTest.java |  11 +-
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |  34 ++-
 .../apache/ignite/util/GridIndexFillTest.java   |  21 +-
 .../apache/ignite/util/GridLogThrottleTest.java |   7 +-
 .../ignite/util/GridLongListSelfTest.java       |   8 +-
 .../apache/ignite/util/GridQueueSelfTest.java   |   9 +-
 .../apache/ignite/util/GridRandomSelfTest.java  |  13 +-
 .../ignite/util/GridSnapshotLockSelfTest.java   |  20 +-
 .../util/GridSpinReadWriteLockSelfTest.java     |  14 +-
 .../util/GridStringBuilderFactorySelfTest.java  |   9 +-
 .../util/GridTopologyHeapSizeSelfTest.java      |  30 +-
 .../apache/ignite/util/GridTransientTest.java   |  12 +-
 .../ignite/util/TestTcpCommunicationSpi.java    |  17 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |  17 +-
 .../tests/p2p/CacheDeploymentTestKey.java       |   2 +-
 .../tests/p2p/CacheDeploymentTestTask1.java     |  23 +-
 .../tests/p2p/CacheDeploymentTestTask2.java     |  22 +-
 .../tests/p2p/CacheDeploymentTestTask3.java     |  23 +-
 .../tests/p2p/CacheDeploymentTestValue.java     |   4 +-
 .../tests/p2p/CacheDeploymentTestValue2.java    |   2 +-
 .../ignite/tests/p2p/ExcludeNodeFilter.java     |  11 +-
 .../p2p/GridCacheDeploymentTestValue3.java      |   7 +-
 .../tests/p2p/GridEventConsumeFilter.java       |   6 +-
 .../GridEventConsumeProjectionPredicate.java    |   6 +-
 .../tests/p2p/GridExternalAffinityFunction.java |  21 +-
 .../p2p/GridExternalAffinityKeyMapper.java      |   4 +-
 .../tests/p2p/GridP2PAwareTestUserResource.java |  11 +-
 .../p2p/GridP2PContinuousDeploymentTask1.java   |  20 +-
 .../p2p/GridP2PContinuousDeploymentTask2.java   |  16 +-
 .../p2p/GridP2PEventFilterExternalPath1.java    |  11 +-
 .../p2p/GridP2PEventFilterExternalPath2.java    |  11 +-
 .../tests/p2p/GridSingleSplitTestJobTarget.java |   2 +-
 .../tests/p2p/GridTestMessageListener.java      |  15 +-
 .../ignite/tests/p2p/GridTestMessageTopic.java  |   4 +-
 .../ignite/tests/p2p/JobStealingTask.java       |  27 +-
 .../tests/p2p/P2PTestTaskExternalPath1.java     |  31 +-
 .../tests/p2p/P2PTestTaskExternalPath2.java     |  31 +-
 .../ignite/tests/p2p/SingleSplitTestTask.java   |  14 +-
 .../ignite/tests/p2p/TestUserResource.java      |   4 +-
 .../CacheNoValueClassOnServerTestClient.java    |  17 +-
 .../apache/ignite/tests/p2p/cache/Person.java   |   4 +-
 .../p2p/startcache/CacheAllNodesFilter.java     |   6 +-
 .../CacheConfigurationP2PTestClient.java        |  20 +-
 .../tests/p2p/startcache/Organization1.java     |   9 +-
 .../tests/p2p/startcache/Organization2.java     |   9 +-
 .../deployment/uri/tasks/GarHelloWorldBean.java |  10 +-
 .../deployment/uri/tasks/GarHelloWorldTask.java |  24 +-
 .../GridUriDeploymentAbstractTestTask.java      |  10 +-
 .../uri/tasks/GridUriDeploymentDependency1.java |  10 +-
 .../uri/tasks/GridUriDeploymentDependency2.java |  10 +-
 .../tasks/GridUriDeploymentInnerTestTask.java   |  10 +-
 .../GridUriDeploymentInterfaceTestTask.java     |   4 +-
 .../GridUriDeploymentNonePublicTestTask.java    |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask0.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask1.java   |  15 +-
 .../uri/tasks/GridUriDeploymentTestTask2.java   |  15 +-
 .../uri/tasks/GridUriDeploymentTestTask3.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask4.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask5.java   |  10 +-
 .../uri/tasks/GridUriDeploymentTestTask6.java   |  10 +-
 .../GridUriDeploymentTestWithNameTask0.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask3.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask4.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask5.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask6.java     |  11 +-
 .../GridUriDeploymentTestWithNameTask7.java     |  11 +-
 .../gce/TcpDiscoveryGoogleStorageIpFinder.java  |  53 ++--
 ...pDiscoveryGoogleStorageIpFinderSelfTest.java |  11 +-
 .../ignite/testsuites/IgniteGCETestSuite.java   |   6 +-
 .../query/h2/opt/GridH2SpatialIndex.java        |  43 ++-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |  40 +--
 .../testsuites/GeoSpatialIndexingTestSuite.java |   6 +-
 .../fs/IgniteHadoopFileSystemCounterWriter.java |  31 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  65 +++--
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |  97 +++++--
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    | 102 +++++--
 .../IgniteHadoopClientProtocolProvider.java     |  40 +--
 .../mapreduce/IgniteHadoopMapReducePlanner.java |  51 ++--
 .../processors/hadoop/HadoopClassLoader.java    |  47 +++-
 .../processors/hadoop/HadoopComponent.java      |   5 +-
 .../processors/hadoop/HadoopContext.java        |  25 +-
 .../processors/hadoop/HadoopDefaultJobInfo.java |  20 +-
 .../internal/processors/hadoop/HadoopImpl.java  |  12 +-
 .../hadoop/HadoopMapReduceCounterGroup.java     |  14 +-
 .../hadoop/HadoopMapReduceCounters.java         |  30 +-
 .../processors/hadoop/HadoopProcessor.java      |  32 ++-
 .../internal/processors/hadoop/HadoopSetup.java |  37 ++-
 .../hadoop/HadoopTaskCancelledException.java    |   4 +-
 .../internal/processors/hadoop/HadoopUtils.java |  32 ++-
 .../hadoop/SecondaryFileSystemProvider.java     |  29 +-
 .../hadoop/counter/HadoopCounterAdapter.java    |  12 +-
 .../hadoop/counter/HadoopCountersImpl.java      |  23 +-
 .../hadoop/counter/HadoopLongCounter.java       |   7 +-
 .../counter/HadoopPerformanceCounter.java       |  29 +-
 .../hadoop/fs/HadoopFileSystemCacheUtils.java   |  23 +-
 .../hadoop/fs/HadoopFileSystemsUtils.java       |   8 +-
 .../hadoop/fs/HadoopLazyConcurrentMap.java      |  18 +-
 .../hadoop/fs/HadoopLocalFileSystemV1.java      |   8 +-
 .../hadoop/fs/HadoopLocalFileSystemV2.java      |  18 +-
 .../processors/hadoop/fs/HadoopParameters.java  |   2 +-
 .../hadoop/fs/HadoopRawLocalFileSystem.java     |  30 +-
 .../processors/hadoop/igfs/HadoopIgfs.java      |  20 +-
 .../igfs/HadoopIgfsCommunicationException.java  |   4 +-
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |  21 +-
 .../processors/hadoop/igfs/HadoopIgfsEx.java    |   9 +-
 .../hadoop/igfs/HadoopIgfsFuture.java           |   6 +-
 .../hadoop/igfs/HadoopIgfsInProc.java           |  38 ++-
 .../hadoop/igfs/HadoopIgfsInputStream.java      |  23 +-
 .../processors/hadoop/igfs/HadoopIgfsIo.java    |  10 +-
 .../processors/hadoop/igfs/HadoopIgfsIpcIo.java |  53 ++--
 .../hadoop/igfs/HadoopIgfsIpcIoListener.java    |   2 +-
 .../hadoop/igfs/HadoopIgfsJclLogger.java        |  13 +-
 .../hadoop/igfs/HadoopIgfsOutProc.java          |  61 ++--
 .../hadoop/igfs/HadoopIgfsOutputStream.java     |  14 +-
 .../hadoop/igfs/HadoopIgfsProperties.java       |  13 +-
 .../hadoop/igfs/HadoopIgfsProxyInputStream.java |  12 +-
 .../igfs/HadoopIgfsProxyOutputStream.java       |  10 +-
 ...fsSecondaryFileSystemPositionedReadable.java |  13 +-
 .../hadoop/igfs/HadoopIgfsStreamDelegate.java   |   4 +-
 .../igfs/HadoopIgfsStreamEventListener.java     |   4 +-
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |  21 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |  43 +--
 .../hadoop/jobtracker/HadoopJobMetadata.java    |  30 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     | 108 +++++--
 .../hadoop/message/HadoopMessage.java           |   4 +-
 .../planner/HadoopDefaultMapReducePlan.java     |  12 +-
 .../hadoop/proto/HadoopClientProtocol.java      |  59 ++--
 .../proto/HadoopProtocolJobCountersTask.java    |  12 +-
 .../proto/HadoopProtocolJobStatusTask.java      |  19 +-
 .../hadoop/proto/HadoopProtocolKillJobTask.java |  12 +-
 .../proto/HadoopProtocolNextTaskIdTask.java     |   7 +-
 .../proto/HadoopProtocolSubmitJobTask.java      |  16 +-
 .../hadoop/proto/HadoopProtocolTaskAdapter.java |  31 +-
 .../proto/HadoopProtocolTaskArguments.java      |  13 +-
 .../hadoop/shuffle/HadoopShuffle.java           |  37 ++-
 .../hadoop/shuffle/HadoopShuffleAck.java        |  15 +-
 .../hadoop/shuffle/HadoopShuffleJob.java        |  64 +++--
 .../hadoop/shuffle/HadoopShuffleMessage.java    |  25 +-
 .../HadoopConcurrentHashMultimap.java           |  29 +-
 .../shuffle/collections/HadoopHashMultimap.java |  12 +-
 .../collections/HadoopHashMultimapBase.java     |  15 +-
 .../shuffle/collections/HadoopMultimap.java     |  13 +-
 .../shuffle/collections/HadoopMultimapBase.java |  33 ++-
 .../shuffle/collections/HadoopSkipList.java     |  29 +-
 .../shuffle/streams/HadoopDataInStream.java     |  11 +-
 .../shuffle/streams/HadoopDataOutStream.java    |  13 +-
 .../shuffle/streams/HadoopOffheapBuffer.java    |   2 +-
 .../HadoopEmbeddedTaskExecutor.java             |  25 +-
 .../taskexecutor/HadoopExecutorService.java     |  27 +-
 .../hadoop/taskexecutor/HadoopRunnableTask.java |  36 ++-
 .../taskexecutor/HadoopTaskExecutorAdapter.java |  14 +-
 .../hadoop/taskexecutor/HadoopTaskState.java    |   2 +-
 .../hadoop/taskexecutor/HadoopTaskStatus.java   |  14 +-
 .../external/HadoopExternalTaskExecutor.java    |  70 +++--
 .../external/HadoopExternalTaskMetadata.java    |   9 +-
 .../external/HadoopJobInfoUpdateRequest.java    |  18 +-
 .../external/HadoopPrepareForJobRequest.java    |  18 +-
 .../external/HadoopProcessDescriptor.java       |   9 +-
 .../external/HadoopProcessStartedAck.java       |  11 +-
 .../external/HadoopTaskExecutionRequest.java    |  20 +-
 .../external/HadoopTaskFinishedMessage.java     |  16 +-
 .../child/HadoopChildProcessRunner.java         |  58 ++--
 .../child/HadoopExternalProcessStarter.java     |  31 +-
 .../HadoopAbstractCommunicationClient.java      |   8 +-
 .../HadoopCommunicationClient.java              |   8 +-
 .../HadoopExternalCommunication.java            |  74 +++--
 .../HadoopHandshakeTimeoutException.java        |   6 +-
 .../communication/HadoopIpcToNioAdapter.java    |  27 +-
 .../communication/HadoopMarshallerFilter.java   |  12 +-
 .../communication/HadoopMessageListener.java    |   6 +-
 .../HadoopTcpNioCommunicationClient.java        |  14 +-
 .../hadoop/v1/HadoopV1CleanupTask.java          |  16 +-
 .../processors/hadoop/v1/HadoopV1Counter.java   |  15 +-
 .../processors/hadoop/v1/HadoopV1MapTask.java   |  25 +-
 .../hadoop/v1/HadoopV1OutputCollector.java      |  21 +-
 .../hadoop/v1/HadoopV1Partitioner.java          |  10 +-
 .../hadoop/v1/HadoopV1ReduceTask.java           |  18 +-
 .../processors/hadoop/v1/HadoopV1Reporter.java  |  10 +-
 .../processors/hadoop/v1/HadoopV1SetupTask.java |  14 +-
 .../processors/hadoop/v1/HadoopV1Splitter.java  |  25 +-
 .../processors/hadoop/v1/HadoopV1Task.java      |  18 +-
 .../processors/hadoop/v2/HadoopDaemon.java      |   5 +-
 .../hadoop/v2/HadoopExternalSplit.java          |  10 +-
 .../hadoop/v2/HadoopNativeCodeLoader.java       |   6 +-
 .../hadoop/v2/HadoopSerializationWrapper.java   |  19 +-
 .../hadoop/v2/HadoopShutdownHookManager.java    |   8 +-
 .../hadoop/v2/HadoopSplitWrapper.java           |  11 +-
 .../hadoop/v2/HadoopV2CleanupTask.java          |  13 +-
 .../processors/hadoop/v2/HadoopV2Context.java   |  33 ++-
 .../processors/hadoop/v2/HadoopV2Counter.java   |  11 +-
 .../processors/hadoop/v2/HadoopV2Job.java       |  85 ++++--
 .../hadoop/v2/HadoopV2JobResourceManager.java   |  39 +--
 .../processors/hadoop/v2/HadoopV2MapTask.java   |  19 +-
 .../hadoop/v2/HadoopV2Partitioner.java          |  10 +-
 .../hadoop/v2/HadoopV2ReduceTask.java           |  14 +-
 .../processors/hadoop/v2/HadoopV2SetupTask.java |  13 +-
 .../processors/hadoop/v2/HadoopV2Splitter.java  |  28 +-
 .../processors/hadoop/v2/HadoopV2Task.java      |  20 +-
 .../hadoop/v2/HadoopV2TaskContext.java          |  83 ++++--
 .../hadoop/v2/HadoopWritableSerialization.java  |  17 +-
 .../HadoopClientProtocolEmbeddedSelfTest.java   |   4 +-
 .../hadoop/HadoopClientProtocolSelfTest.java    |  59 ++--
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |  25 +-
 .../igfs/Hadoop1OverIgfsDualAsyncTest.java      |   2 +-
 .../igfs/Hadoop1OverIgfsDualSyncTest.java       |   2 +-
 ...oopFileSystemUniversalFileSystemAdapter.java |  19 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |  99 ++++---
 ...Igfs20FileSystemLoopbackPrimarySelfTest.java |   8 +-
 ...oopIgfs20FileSystemShmemPrimarySelfTest.java |   8 +-
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |  62 ++--
 .../igfs/HadoopIgfsDualAsyncSelfTest.java       |   4 +-
 .../ignite/igfs/HadoopIgfsDualSyncSelfTest.java |   4 +-
 ...oopSecondaryFileSystemConfigurationTest.java |  70 +++--
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |  25 +-
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |  50 ++--
 .../IgniteHadoopFileSystemAbstractSelfTest.java | 106 ++++---
 .../IgniteHadoopFileSystemClientSelfTest.java   |  57 ++--
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |  52 ++--
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |  51 ++--
 .../IgniteHadoopFileSystemLoggerSelfTest.java   |  42 ++-
 ...niteHadoopFileSystemLoggerStateSelfTest.java |  46 +--
 ...adoopFileSystemLoopbackAbstractSelfTest.java |   6 +-
 ...SystemLoopbackEmbeddedDualAsyncSelfTest.java |   4 +-
 ...eSystemLoopbackEmbeddedDualSyncSelfTest.java |   4 +-
 ...leSystemLoopbackEmbeddedPrimarySelfTest.java |   4 +-
 ...SystemLoopbackEmbeddedSecondarySelfTest.java |   4 +-
 ...SystemLoopbackExternalDualAsyncSelfTest.java |   4 +-
 ...eSystemLoopbackExternalDualSyncSelfTest.java |   4 +-
 ...leSystemLoopbackExternalPrimarySelfTest.java |   4 +-
 ...SystemLoopbackExternalSecondarySelfTest.java |   4 +-
 ...teHadoopFileSystemSecondaryModeSelfTest.java |  47 ++--
 ...teHadoopFileSystemShmemAbstractSelfTest.java |  19 +-
 ...ileSystemShmemEmbeddedDualAsyncSelfTest.java |   4 +-
 ...FileSystemShmemEmbeddedDualSyncSelfTest.java |   4 +-
 ...pFileSystemShmemEmbeddedPrimarySelfTest.java |   4 +-
 ...ileSystemShmemEmbeddedSecondarySelfTest.java |   4 +-
 ...ileSystemShmemExternalDualAsyncSelfTest.java |   4 +-
 ...FileSystemShmemExternalDualSyncSelfTest.java |   4 +-
 ...pFileSystemShmemExternalPrimarySelfTest.java |   4 +-
 ...ileSystemShmemExternalSecondarySelfTest.java |   4 +-
 .../hadoop/HadoopAbstractSelfTest.java          |  38 +--
 .../hadoop/HadoopAbstractWordCountTest.java     |  19 +-
 .../hadoop/HadoopClassLoaderTest.java           |   6 +-
 .../hadoop/HadoopCommandLineTest.java           |  48 ++--
 .../HadoopDefaultMapReducePlannerSelfTest.java  |  62 ++--
 .../hadoop/HadoopFileSystemsTest.java           |  21 +-
 .../processors/hadoop/HadoopGroupingTest.java   |  43 ++-
 .../hadoop/HadoopJobTrackerSelfTest.java        |  44 +--
 .../hadoop/HadoopMapReduceEmbeddedSelfTest.java |  34 ++-
 .../processors/hadoop/HadoopMapReduceTest.java  |  78 +++--
 .../hadoop/HadoopPopularWordsTest.java          |  40 +--
 .../HadoopSerializationWrapperSelfTest.java     |  21 +-
 .../processors/hadoop/HadoopSharedMap.java      |   7 +-
 .../hadoop/HadoopSortingExternalTest.java       |   7 +-
 .../processors/hadoop/HadoopSortingTest.java    |  50 +++-
 .../hadoop/HadoopSplitWrapperSelfTest.java      |  22 +-
 .../processors/hadoop/HadoopStartup.java        |   6 +-
 .../hadoop/HadoopTaskExecutionSelfTest.java     |  60 ++--
 .../hadoop/HadoopTasksAllVersionsTest.java      |  22 +-
 .../processors/hadoop/HadoopTasksV1Test.java    |  15 +-
 .../processors/hadoop/HadoopTasksV2Test.java    |  26 +-
 .../hadoop/HadoopTestRoundRobinMrPlanner.java   |  19 +-
 .../hadoop/HadoopTestTaskContext.java           |  25 +-
 .../processors/hadoop/HadoopTestUtils.java      |  19 +-
 .../processors/hadoop/HadoopV2JobSelfTest.java  |  30 +-
 .../hadoop/HadoopValidationSelfTest.java        |   4 +-
 .../hadoop/examples/HadoopWordCount1.java       |  14 +-
 .../hadoop/examples/HadoopWordCount1Map.java    |  17 +-
 .../hadoop/examples/HadoopWordCount1Reduce.java |  16 +-
 .../hadoop/examples/HadoopWordCount2.java       |  18 +-
 .../hadoop/examples/HadoopWordCount2Mapper.java |  15 +-
 .../examples/HadoopWordCount2Reducer.java       |  13 +-
 .../collections/HadoopAbstractMapTest.java      |  29 +-
 .../HadoopConcurrentHashMultimapSelftest.java   |  41 ++-
 .../collections/HadoopHashMapSelfTest.java      |  25 +-
 .../collections/HadoopSkipListSelfTest.java     |  46 ++-
 .../streams/HadoopDataStreamSelfTest.java       |  11 +-
 .../taskexecutor/HadoopExecutorServiceTest.java |  15 +-
 .../HadoopExternalTaskExecutionSelfTest.java    |  46 +--
 .../HadoopExternalCommunicationSelfTest.java    |  30 +-
 .../testsuites/IgniteHadoopTestSuite.java       |  85 ++++--
 .../IgniteIgfsLinuxAndMacOSTestSuite.java       |  20 +-
 .../HibernateAbstractRegionAccessStrategy.java  |   9 +-
 .../HibernateAccessStrategyAdapter.java         |  33 ++-
 .../hibernate/HibernateCollectionRegion.java    |  14 +-
 .../cache/hibernate/HibernateEntityRegion.java  |  15 +-
 .../hibernate/HibernateGeneralDataRegion.java   |  15 +-
 .../hibernate/HibernateNaturalIdRegion.java     |  15 +-
 .../HibernateNonStrictAccessStrategy.java       |  23 +-
 .../hibernate/HibernateQueryResultsRegion.java  |  10 +-
 .../HibernateReadOnlyAccessStrategy.java        |  14 +-
 .../HibernateReadWriteAccessStrategy.java       |  26 +-
 .../ignite/cache/hibernate/HibernateRegion.java |  14 +-
 .../cache/hibernate/HibernateRegionFactory.java |  31 +-
 .../hibernate/HibernateTimestampsRegion.java    |   8 +-
 .../HibernateTransactionalAccessStrategy.java   |  14 +-
 .../HibernateTransactionalDataRegion.java       |  22 +-
 .../hibernate/CacheHibernateBlobStore.java      |  57 ++--
 .../hibernate/CacheHibernateBlobStoreEntry.java |   7 +-
 .../CacheHibernateBlobStoreFactory.java         |  24 +-
 .../CacheHibernateStoreSessionListener.java     |  32 ++-
 .../HibernateL2CacheConfigurationSelfTest.java  |  57 ++--
 .../hibernate/HibernateL2CacheSelfTest.java     |  78 +++--
 .../HibernateL2CacheTransactionalSelfTest.java  |  34 +--
 .../CacheHibernateBlobStoreNodeRestartTest.java |  12 +-
 .../CacheHibernateBlobStoreSelfTest.java        |  15 +-
 .../CacheHibernateStoreFactorySelfTest.java     |  42 ++-
 ...heHibernateStoreSessionListenerSelfTest.java |  36 ++-
 .../testsuites/IgniteHibernateTestSuite.java    |  13 +-
 .../query/h2/GridH2ResultSetIterator.java       |  16 +-
 .../processors/query/h2/IgniteH2Indexing.java   | 196 +++++++++----
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  30 +-
 .../processors/query/h2/opt/GridH2Cursor.java   |  12 +-
 .../query/h2/opt/GridH2IndexBase.java           |  24 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |  19 +-
 .../query/h2/opt/GridH2KeyValueRowOnheap.java   |   8 +-
 .../processors/query/h2/opt/GridH2Row.java      |   6 +-
 .../query/h2/opt/GridH2RowDescriptor.java       |  16 +-
 .../processors/query/h2/opt/GridH2Table.java    |  58 ++--
 .../query/h2/opt/GridH2TreeIndex.java           |  41 +--
 .../processors/query/h2/opt/GridH2Utils.java    |  10 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |  19 +-
 .../query/h2/opt/GridLuceneDirectory.java       |  21 +-
 .../processors/query/h2/opt/GridLuceneFile.java |  10 +-
 .../query/h2/opt/GridLuceneIndex.java           |  64 +++--
 .../query/h2/opt/GridLuceneInputStream.java     |  13 +-
 .../query/h2/opt/GridLuceneLockFactory.java     |  10 +-
 .../query/h2/opt/GridLuceneOutputStream.java    |   9 +-
 .../query/h2/opt/GridSearchRowPointer.java      |   6 +-
 .../query/h2/sql/GridSqlAggregateFunction.java  |  12 +-
 .../processors/query/h2/sql/GridSqlAlias.java   |   7 +-
 .../processors/query/h2/sql/GridSqlColumn.java  |   4 +-
 .../processors/query/h2/sql/GridSqlConst.java   |   7 +-
 .../processors/query/h2/sql/GridSqlElement.java |   5 +-
 .../query/h2/sql/GridSqlFunction.java           |  22 +-
 .../query/h2/sql/GridSqlFunctionType.java       |   4 +-
 .../processors/query/h2/sql/GridSqlJoin.java    |  10 +-
 .../query/h2/sql/GridSqlOperation.java          |   6 +-
 .../query/h2/sql/GridSqlOperationType.java      |   5 +-
 .../query/h2/sql/GridSqlParameter.java          |   4 +-
 .../query/h2/sql/GridSqlPlaceholder.java        |   4 +-
 .../processors/query/h2/sql/GridSqlQuery.java   |   9 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  82 ++++--
 .../query/h2/sql/GridSqlQuerySplitter.java      |  31 +-
 .../processors/query/h2/sql/GridSqlSelect.java  |   9 +-
 .../query/h2/sql/GridSqlSortColumn.java         |   2 +-
 .../query/h2/sql/GridSqlSubquery.java           |   4 +-
 .../processors/query/h2/sql/GridSqlTable.java   |   9 +-
 .../processors/query/h2/sql/GridSqlType.java    |   8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   |   9 +-
 .../processors/query/h2/sql/GridSqlValue.java   |   2 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |  97 ++++---
 .../query/h2/twostep/GridMergeIndex.java        |  44 +--
 .../h2/twostep/GridMergeIndexUnsorted.java      |  25 +-
 .../query/h2/twostep/GridMergeTable.java        |  22 +-
 .../h2/twostep/GridReduceQueryExecutor.java     | 114 +++++---
 .../query/h2/twostep/GridResultPage.java        |  27 +-
 .../query/h2/twostep/GridThreadLocalTable.java  |  33 ++-
 .../query/h2/twostep/msg/GridH2Array.java       |  26 +-
 .../query/h2/twostep/msg/GridH2Boolean.java     |  13 +-
 .../query/h2/twostep/msg/GridH2Byte.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Bytes.java       |  13 +-
 .../query/h2/twostep/msg/GridH2CacheObject.java |  19 +-
 .../query/h2/twostep/msg/GridH2Date.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Decimal.java     |  16 +-
 .../query/h2/twostep/msg/GridH2Double.java      |  13 +-
 .../query/h2/twostep/msg/GridH2Float.java       |  13 +-
 .../query/h2/twostep/msg/GridH2Geometry.java    |  15 +-
 .../query/h2/twostep/msg/GridH2Integer.java     |  13 +-
 .../query/h2/twostep/msg/GridH2JavaObject.java  |  13 +-
 .../query/h2/twostep/msg/GridH2Long.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Null.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Short.java       |  13 +-
 .../query/h2/twostep/msg/GridH2String.java      |  13 +-
 .../query/h2/twostep/msg/GridH2Time.java        |  13 +-
 .../query/h2/twostep/msg/GridH2Timestamp.java   |  13 +-
 .../query/h2/twostep/msg/GridH2Uuid.java        |  13 +-
 .../h2/twostep/msg/GridH2ValueMessage.java      |  15 +-
 .../twostep/msg/GridH2ValueMessageFactory.java  |  19 +-
 .../CacheAbstractQueryMetricsSelfTest.java      |  25 +-
 .../cache/CacheConfigurationP2PTest.java        |  36 +--
 .../cache/CacheConfigurationP2PTestServer.java  |  13 +-
 .../cache/CacheLocalQueryMetricsSelfTest.java   |   4 +-
 ...titionedQueryMetricsDistributedSelfTest.java |   4 +-
 ...chePartitionedQueryMetricsLocalSelfTest.java |   4 +-
 ...plicatedQueryMetricsDistributedSelfTest.java |   4 +-
 ...acheReplicatedQueryMetricsLocalSelfTest.java |   4 +-
 ...CacheScanPartitionQueryFallbackSelfTest.java |  66 +++--
 .../cache/GridCacheCrossCacheQuerySelfTest.java |  45 +--
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  64 +++--
 .../cache/GridCacheOffHeapSelfTest.java         |  61 ++--
 .../GridCacheOffheapIndexEntryEvictTest.java    |  42 +--
 .../cache/GridCacheOffheapIndexGetSelfTest.java |  46 +--
 .../GridCacheQueryIndexDisabledSelfTest.java    |  32 ++-
 .../GridCacheQuerySerializationSelfTest.java    |  37 +--
 .../cache/GridCacheQuerySimpleBenchmark.java    |  46 +--
 .../cache/GridCacheQueryTestValue.java          |   8 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |  34 ++-
 .../processors/cache/GridCacheSwapSelfTest.java |  63 +++--
 .../cache/GridIndexingWithNoopSwapSelfTest.java |  38 +--
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  73 +++--
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 120 +++++---
 .../IgniteCacheCollocatedQuerySelfTest.java     |  40 +--
 ...acheConfigurationPrimitiveTypesSelfTest.java |  19 +-
 .../IgniteCacheFieldsQueryNoDataSelfTest.java   |  26 +-
 .../cache/IgniteCacheLargeResultSelfTest.java   |  29 +-
 .../cache/IgniteCacheOffheapEvictQueryTest.java |  50 ++--
 ...CacheOffheapTieredMultithreadedSelfTest.java |  44 +--
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   9 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |  59 ++--
 ...teCacheQueryEvictsMultiThreadedSelfTest.java |   2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |  26 +-
 .../cache/IgniteCacheQueryLoadSelfTest.java     |  52 ++--
 ...QueryMultiThreadedOffHeapTieredSelfTest.java |   7 +-
 .../IgniteCacheQueryMultiThreadedSelfTest.java  |  66 +++--
 ...QueryOffheapEvictsMultiThreadedSelfTest.java |   2 +-
 ...eCacheQueryOffheapMultiThreadedSelfTest.java |   2 +-
 ...gniteCacheSqlQueryMultiThreadedSelfTest.java |  47 ++--
 ...ClientReconnectCacheQueriesFailoverTest.java |  37 ++-
 .../cache/IgniteClientReconnectQueriesTest.java |  44 +--
 .../IgniteCacheAtomicFieldsQuerySelfTest.java   |  16 +-
 ...cheAtomicNearEnabledFieldsQuerySelfTest.java |   4 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |   8 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |   8 +-
 ...lientQueryReplicatedNodeRestartSelfTest.java |  64 +++--
 ...artitionedFieldsQueryP2PEnabledSelfTest.java |   4 +-
 ...niteCachePartitionedFieldsQuerySelfTest.java |  13 +-
 ...achePartitionedQueryP2PDisabledSelfTest.java |   4 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |  26 +-
 .../IgniteCacheQueryNodeRestartSelfTest.java    |  53 ++--
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |  56 ++--
 ...ReplicatedFieldsQueryP2PEnabledSelfTest.java |   4 +-
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |  25 +-
 ...CacheReplicatedQueryP2PDisabledSelfTest.java |   4 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |  74 +++--
 .../IgniteCacheLocalAtomicQuerySelfTest.java    |   6 +-
 .../IgniteCacheLocalFieldsQuerySelfTest.java    |   8 +-
 .../local/IgniteCacheLocalQuerySelfTest.java    |  22 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |  54 ++--
 ...ridCacheReduceFieldsQueryAtomicSelfTest.java |   8 +-
 ...GridCacheReduceFieldsQueryLocalSelfTest.java |   6 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |  15 +-
 ...acheReduceFieldsQueryReplicatedSelfTest.java |   6 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |  62 ++--
 .../CacheTtlOffheapAtomicAbstractSelfTest.java  |   4 +-
 .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java |   4 +-
 ...acheTtlOffheapAtomicPartitionedSelfTest.java |   4 +-
 ...TtlOffheapTransactionalAbstractSelfTest.java |   4 +-
 ...cheTtlOffheapTransactionalLocalSelfTest.java |   4 +-
 .../CacheTtlOnheapAtomicAbstractSelfTest.java   |   4 +-
 .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java  |   4 +-
 ...eTtlOnheapTransactionalAbstractSelfTest.java |   4 +-
 ...acheTtlOnheapTransactionalLocalSelfTest.java |   4 +-
 ...lOnheapTransactionalPartitionedSelfTest.java |   4 +-
 .../query/IgniteSqlSplitterSelfTest.java        |  34 ++-
 .../query/h2/GridH2IndexRebuildTest.java        |  33 ++-
 .../query/h2/GridH2IndexingInMemSelfTest.java   |   2 +-
 .../query/h2/GridH2IndexingOffheapSelfTest.java |   2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  47 ++--
 .../query/h2/opt/GridH2TableSelfTest.java       |  42 ++-
 .../h2/sql/AbstractH2CompareQueryTest.java      |  46 +--
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  34 ++-
 .../query/h2/sql/GridQueryParsingTest.java      |  52 ++--
 .../query/h2/sql/H2CompareBigQueryTest.java     |  26 +-
 .../loadtests/h2indexing/GridTestEntity.java    |   7 +-
 .../loadtests/h2indexing/GridTreeBenchmark.java |  16 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |  56 ++--
 .../IgniteCacheQuerySelfTestSuite.java          |  81 +++++-
 .../IgniteCacheWithIndexingTestSuite.java       |  23 +-
 .../IgniteH2IndexingSpiTestSuite.java           |  10 +-
 .../IgnitePortableCacheQueryTestSuite.java      |  42 ++-
 .../org/apache/ignite/logger/jcl/JclLogger.java |   9 +-
 .../apache/ignite/logger/jcl/JclLoggerTest.java |  10 +-
 .../ignite/testsuites/IgniteJclTestSuite.java   |   6 +-
 .../apache/ignite/stream/jms11/JmsStreamer.java |  31 +-
 .../ignite/stream/jms11/MessageTransformer.java |   7 +-
 .../stream/jms11/IgniteJmsStreamerTest.java     |  50 ++--
 .../ignite/stream/jms11/TestTransformers.java   |  11 +-
 .../apache/ignite/cache/jta/CacheTmLookup.java  |  11 +-
 .../cache/jta/jndi/CacheJndiTmLookup.java       |  16 +-
 .../jta/reflect/CacheReflectionTmLookup.java    |  13 +-
 .../processors/cache/jta/CacheJtaManager.java   |  23 +-
 .../cache/jta/GridCacheXAResource.java          |  28 +-
 ...CacheJtaConfigurationValidationSelfTest.java |  22 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |  31 +-
 .../cache/GridCacheReplicatedJtaSelfTest.java   |   6 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |  31 +-
 .../ignite/testsuites/IgniteJtaTestSuite.java   |   9 +-
 .../ignite/stream/kafka/KafkaStreamer.java      |  27 +-
 .../kafka/IgniteKafkaStreamerSelfTestSuite.java |   4 +-
 .../stream/kafka/KafkaEmbeddedBroker.java       |  43 +--
 .../kafka/KafkaIgniteStreamerSelfTest.java      |  42 +--
 .../ignite/stream/kafka/SimplePartitioner.java  |   6 +-
 .../log4j/Log4JDailyRollingFileAppender.java    |  12 +-
 .../Log4JExternallyRolledFileAppender.java      |  11 +-
 .../ignite/logger/log4j/Log4JFileAppender.java  |  12 +-
 .../apache/ignite/logger/log4j/Log4JLogger.java |  49 ++--
 .../ignite/logger/log4j/Log4jFileAware.java     |   4 +-
 .../logger/log4j/Log4jNodeIdFilePath.java       |  15 +-
 .../logger/log4j/Log4jRollingFileAppender.java  |  12 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |  24 +-
 .../logger/log4j/GridLog4jInitializedTest.java  |  10 +-
 .../logger/log4j/GridLog4jLoggingFileTest.java  |  13 +-
 .../logger/log4j/GridLog4jLoggingPathTest.java  |   8 +-
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |  13 +-
 .../log4j/GridLog4jNotInitializedTest.java      |   8 +-
 .../ignite/testsuites/IgniteLog4jTestSuite.java |   8 +-
 .../ignite/logger/log4j2/Log4J2Logger.java      |  56 ++--
 .../ignite/logger/log4j2/package-info.java      |   2 +-
 .../log4j2/GridLog4j2CorrectFileNameTest.java   |   3 +-
 .../log4j2/GridLog4j2InitializedTest.java       |   3 +-
 .../log4j2/GridLog4j2LoggingFileTest.java       |   5 +-
 .../logger/log4j2/Log4j2LoggerSelfTest.java     |  27 +-
 .../log4j2/Log4j2LoggerVerboseModeSelfTest.java |  22 +-
 .../ignite/logger/log4j2/package-info.java      |   2 +-
 .../testsuites/IgniteLog4j2TestSuite.java       |   6 +-
 .../apache/ignite/mesos/ClusterProperties.java  |  19 +-
 .../apache/ignite/mesos/IgniteFramework.java    |  19 +-
 .../apache/ignite/mesos/IgniteScheduler.java    |  21 +-
 .../org/apache/ignite/mesos/IgniteTask.java     |   2 +-
 .../ignite/mesos/resource/IgniteProvider.java   |  16 +-
 .../ignite/mesos/resource/JettyServer.java      |   8 +-
 .../ignite/mesos/resource/ResourceHandler.java  |  22 +-
 .../ignite/mesos/resource/ResourceProvider.java |  16 +-
 .../org/apache/ignite/IgniteMesosTestSuite.java |   6 +-
 .../ignite/mesos/IgniteSchedulerSelfTest.java   |  16 +-
 .../platform/PlatformAbstractBootstrap.java     |  12 +-
 .../platform/PlatformAbstractPredicate.java     |   7 +-
 .../platform/PlatformAbstractTarget.java        |  19 +-
 .../processors/platform/PlatformBootstrap.java  |   4 +-
 .../platform/PlatformBootstrapFactory.java      |   2 +-
 .../processors/platform/PlatformException.java  |   8 +-
 .../platform/PlatformExtendedException.java     |   4 +-
 .../processors/platform/PlatformIgnition.java   |  27 +-
 .../platform/PlatformNoCallbackException.java   |   4 +-
 .../platform/cache/PlatformCache.java           |  64 +++--
 .../cache/PlatformCacheEntryFilterImpl.java     |  16 +-
 .../cache/PlatformCacheEntryProcessor.java      |  32 ++-
 .../platform/cache/PlatformCacheIterator.java   |  14 +-
 .../PlatformCachePartialUpdateException.java    |  15 +-
 .../cache/affinity/PlatformAffinity.java        |  29 +-
 .../query/PlatformAbstractQueryCursor.java      |  16 +-
 .../query/PlatformContinuousQueryImpl.java      |  33 ++-
 .../PlatformContinuousQueryRemoteFilter.java    |  31 +-
 .../cache/query/PlatformFieldsQueryCursor.java  |  11 +-
 .../cache/query/PlatformQueryCursor.java        |  11 +-
 .../cache/store/PlatformCacheStore.java         |   2 +-
 .../cache/store/PlatformCacheStoreCallback.java |   8 +-
 .../platform/cluster/PlatformClusterGroup.java  |  22 +-
 .../cluster/PlatformClusterNodeFilter.java      |  20 +-
 .../platform/compute/PlatformAbstractJob.java   |  24 +-
 .../platform/compute/PlatformAbstractTask.java  |  27 +-
 .../PlatformBalancingMultiClosureTask.java      |  23 +-
 ...tformBalancingSingleClosureAffinityTask.java |  22 +-
 .../PlatformBalancingSingleClosureTask.java     |  22 +-
 .../PlatformBroadcastingMultiClosureTask.java   |  20 +-
 .../PlatformBroadcastingSingleClosureTask.java  |  19 +-
 .../platform/compute/PlatformClosureJob.java    |  20 +-
 .../platform/compute/PlatformCompute.java       |  32 ++-
 .../platform/compute/PlatformFullJob.java       |  21 +-
 .../platform/compute/PlatformFullTask.java      |  33 ++-
 .../compute/PlatformNativeException.java        |  12 +-
 .../datastreamer/PlatformDataStreamer.java      |  34 ++-
 .../datastreamer/PlatformStreamReceiver.java    |  30 +-
 .../platform/dotnet/PlatformDotNetService.java  |   4 +-
 .../dotnet/PlatformDotNetServiceImpl.java       |   6 +-
 .../platform/events/PlatformEventFilter.java    |  19 +-
 .../platform/events/PlatformEvents.java         |  27 +-
 .../lifecycle/PlatformLifecycleBean.java        |   9 +-
 .../platform/memory/PlatformAbstractMemory.java |   2 +-
 .../PlatformBigEndianInputStreamImpl.java       |   2 +-
 .../PlatformBigEndianOutputStreamImpl.java      |   3 +-
 .../platform/memory/PlatformExternalMemory.java |   8 +-
 .../memory/PlatformInputStreamImpl.java         |  16 +-
 .../memory/PlatformMemoryManagerImpl.java       |  10 +-
 .../platform/memory/PlatformMemoryPool.java     |  11 +-
 .../platform/memory/PlatformMemoryUtils.java    |   9 +-
 .../memory/PlatformOutputStreamImpl.java        |  12 +-
 .../platform/memory/PlatformPooledMemory.java   |   5 +-
 .../platform/memory/PlatformUnpooledMemory.java |   4 +-
 .../messaging/PlatformMessageFilter.java        |  19 +-
 .../messaging/PlatformMessageLocalFilter.java   |  15 +-
 .../platform/messaging/PlatformMessaging.java   |  18 +-
 .../services/PlatformAbstractService.java       |  28 +-
 .../platform/services/PlatformServices.java     |  30 +-
 .../transactions/PlatformTransactions.java      |  30 +-
 .../platform/utils/PlatformFutureUtils.java     |  17 +-
 .../platform/utils/PlatformReaderBiClosure.java |   6 +-
 .../platform/utils/PlatformReaderClosure.java   |   4 +-
 .../platform/utils/PlatformUtils.java           |  46 ++-
 .../platform/utils/PlatformWriterBiClosure.java |   4 +-
 .../platform/utils/PlatformWriterClosure.java   |   4 +-
 .../http/jetty/GridJettyJsonConfig.java         |   9 +-
 .../http/jetty/GridJettyRestHandler.java        |  72 +++--
 .../http/jetty/GridJettyRestProtocol.java       |  59 ++--
 .../schedule/IgniteScheduleProcessor.java       |  26 +-
 .../processors/schedule/ScheduleFutureImpl.java |  56 ++--
 .../schedule/GridScheduleSelfTest.java          |  31 +-
 .../testsuites/IgniteSchedulerTestSuite.java    |   6 +-
 .../ignite/schema/generator/CodeGenerator.java  |  36 ++-
 .../ignite/schema/generator/XmlGenerator.java   |  51 ++--
 .../apache/ignite/schema/model/IndexItem.java   |   2 +-
 .../ignite/schema/model/PojoDescriptor.java     |  54 +++-
 .../apache/ignite/schema/model/PojoField.java   |  58 +++-
 .../ignite/schema/model/SchemaDescriptor.java   |   5 +-
 .../schema/parser/DatabaseMetadataParser.java   |  29 +-
 .../apache/ignite/schema/parser/DbColumn.java   |   2 +-
 .../apache/ignite/schema/parser/DbTable.java    |   6 +-
 .../parser/dialect/DB2MetadataDialect.java      |   6 +-
 .../parser/dialect/DatabaseMetadataDialect.java |  16 +-
 .../parser/dialect/JdbcMetadataDialect.java     |  19 +-
 .../parser/dialect/MySQLMetadataDialect.java    |  10 +-
 .../parser/dialect/OracleMetadataDialect.java   |  42 ++-
 .../ignite/schema/ui/ConfirmCallable.java       |  14 +-
 .../org/apache/ignite/schema/ui/Controls.java   |  63 +++--
 .../org/apache/ignite/schema/ui/GridPaneEx.java |  13 +-
 .../org/apache/ignite/schema/ui/MessageBox.java |  35 ++-
 .../apache/ignite/schema/ui/ModalDialog.java    |   4 +-
 .../ignite/schema/ui/SchemaImportApp.java       | 119 ++++++--
 .../ignite/schema/ui/TextColumnValidator.java   |   2 +-
 .../schema/test/AbstractSchemaImportTest.java   |  32 ++-
 .../test/generator/CodeGeneratorTest.java       |   7 +-
 .../schema/test/generator/XmlGeneratorTest.java |  14 +-
 .../test/parser/DbMetadataParserTest.java       |  17 +-
 .../testsuites/IgniteSchemaImportTestSuite.java |   9 +-
 .../apache/ignite/logger/slf4j/Slf4jLogger.java |   9 +-
 .../ignite/spark/JavaIgniteRDDSelfTest.java     |  36 +--
 .../java/org/apache/ignite/IgniteSpring.java    |  15 +-
 .../org/apache/ignite/IgniteSpringBean.java     |  40 +--
 .../apache/ignite/cache/spring/SpringCache.java |   8 +-
 .../ignite/cache/spring/SpringCacheManager.java |  21 +-
 .../spring/CacheSpringStoreSessionListener.java |  33 ++-
 .../GridResourceSpringBeanInjector.java         |  17 +-
 .../resource/GridSpringResourceContextImpl.java |  10 +-
 .../util/spring/IgniteSpringHelperImpl.java     |  59 ++--
 .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java |  27 +-
 .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java |  26 +-
 ...CacheSpringStoreSessionListenerSelfTest.java |  36 ++-
 .../ignite/internal/GridFactorySelfTest.java    |  92 +++---
 .../GridSpringBeanSerializationSelfTest.java    |  21 +-
 .../internal/IgniteDynamicCacheConfigTest.java  |  20 +-
 .../apache/ignite/internal/TestNodeFilter.java  |   6 +-
 .../resource/GridLoggerInjectionSelfTest.java   |  21 +-
 .../resource/GridResourceProcessorSelfTest.java |  41 ++-
 .../resource/GridResourceTestUtils.java         |   4 +-
 .../resource/GridServiceInjectionSelfTest.java  |  16 +-
 .../processors/resource/TestClosure.java        |  12 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |  50 ++--
 .../spring/GridSpringCacheManagerSelfTest.java  |  19 +-
 .../ignite/spring/GridSpringCacheTestKey.java   |   4 +-
 .../spring/GridSpringCacheTestKeyGenerator.java |   7 +-
 .../spring/GridSpringCacheTestService.java      |   9 +-
 .../GridSpringDynamicCacheTestService.java      |   9 +-
 .../IgniteExcludeInConfigurationTest.java       |  21 +-
 .../IgniteStartFromStreamConfigurationTest.java |  18 +-
 .../testsuites/IgniteResourceSelfTestSuite.java |   8 +-
 .../testsuites/IgniteSpringTestSuite.java       |  19 +-
 .../util/nodestart/IgniteSshHelperImpl.java     |   2 +-
 .../util/nodestart/StartNodeCallableImpl.java   |  39 ++-
 .../internal/IgniteNodeStartUtilsSelfTest.java  |  25 +-
 ...gniteProjectionStartStopRestartSelfTest.java |  62 ++--
 .../IgniteStartStopRestartTestSuite.java        |   3 +-
 .../ant/beautifier/GridJavadocAntTask.java      |  27 +-
 .../GridJavadocCharArrayLexReader.java          |   2 +-
 .../tools/ant/beautifier/GridJavadocToken.java  |   2 +-
 .../ant/beautifier/GridJavadocTokenType.java    |   2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |  27 +-
 .../ignite/tools/javadoc/IgniteLinkTaglet.java  |  11 +-
 .../util/antgar/IgniteDeploymentGarAntTask.java |  15 +-
 .../uri/GridUriDeploymentClassLoader.java       |  15 +-
 .../GridUriDeploymentClassLoaderFactory.java    |  16 +-
 .../uri/GridUriDeploymentDiscovery.java         |  18 +-
 .../uri/GridUriDeploymentFileProcessor.java     |  42 +--
 .../GridUriDeploymentFileProcessorResult.java   |  11 +-
 .../GridUriDeploymentFileResourceLoader.java    |   9 +-
 .../uri/GridUriDeploymentJarVerifier.java       |  26 +-
 .../uri/GridUriDeploymentSpringDocument.java    |  17 +-
 .../uri/GridUriDeploymentSpringParser.java      |  20 +-
 .../uri/GridUriDeploymentUnitDescriptor.java    |  28 +-
 .../uri/GridUriDeploymentUriParser.java         |   6 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |  66 +++--
 .../deployment/uri/UriDeploymentSpiMBean.java   |   9 +-
 .../uri/scanners/GridDeploymentFileHandler.java |   4 +-
 .../GridDeploymentFolderScannerHelper.java      |   5 +-
 .../GridUriDeploymentScannerListener.java       |   7 +-
 .../uri/scanners/UriDeploymentScanner.java      |   4 +-
 .../scanners/UriDeploymentScannerContext.java   |  12 +-
 .../scanners/UriDeploymentScannerManager.java   |  18 +-
 .../scanners/file/UriDeploymentFileScanner.java |  32 ++-
 .../scanners/http/UriDeploymentHttpScanner.java |  58 ++--
 .../GridTaskUriDeploymentDeadlockSelfTest.java  |  32 +--
 .../ignite/p2p/GridP2PDisabledSelfTest.java     |  24 +-
 .../uri/GridUriDeploymentAbstractSelfTest.java  |  10 +-
 ...loymentClassLoaderMultiThreadedSelfTest.java |  15 +-
 .../GridUriDeploymentClassLoaderSelfTest.java   |  17 +-
 ...riDeploymentClassloaderRegisterSelfTest.java |  29 +-
 .../uri/GridUriDeploymentConfigSelfTest.java    |   8 +-
 .../GridUriDeploymentFileProcessorSelfTest.java |  19 +-
 .../uri/GridUriDeploymentMd5CheckSelfTest.java  |  21 +-
 ...loymentMultiScannersErrorThrottlingTest.java |  11 +-
 .../GridUriDeploymentMultiScannersSelfTest.java |  13 +-
 .../uri/GridUriDeploymentSimpleSelfTest.java    |  27 +-
 .../file/GridFileDeploymentSelfTest.java        |  14 +-
 .../GridFileDeploymentUndeploySelfTest.java     |  19 +-
 .../http/GridHttpDeploymentSelfTest.java        |  29 +-
 .../testsuites/IgniteToolsSelfTestSuite.java    |   6 +-
 .../IgniteUriDeploymentTestSuite.java           |  20 +-
 .../apache/ignite/tools/GridToolsSelfTest.java  |  23 +-
 .../visor/plugin/VisorExtensionPoint.java       |   4 +-
 .../ignite/visor/plugin/VisorPluggableTab.java  |   5 +-
 .../apache/ignite/visor/plugin/VisorPlugin.java |   6 +-
 .../visor/plugin/VisorPluginComponent.java      |   4 +-
 .../plugin/VisorPluginComponentsFactory.java    |   6 +-
 .../visor/plugin/VisorPluginLogPanel.java       |   2 +-
 .../ignite/visor/plugin/VisorPluginModel.java   |  12 +-
 .../visor/plugin/VisorPluginNodesPanel.java     |   5 +-
 .../visor/plugin/VisorSelectionListener.java    |   4 +-
 .../visor/plugin/VisorTopologyListener.java     |   4 +-
 .../ignite/cache/websession/WebSession.java     |  30 +-
 .../cache/websession/WebSessionFilter.java      |  64 +++--
 .../cache/websession/WebSessionListener.java    |  36 ++-
 .../servlet/ServletContextListenerStartup.java  |  32 ++-
 .../ignite/startup/servlet/ServletStartup.java  |  28 +-
 .../IgniteWebSessionSelfTestSuite.java          |   8 +-
 .../internal/websession/WebSessionSelfTest.java |  46 +--
 .../websession/WebSessionServerStart.java       |  22 +-
 .../internal/websession/WebSessionTest.java     |  11 +-
 .../yardstick/IgniteAbstractBenchmark.java      |  25 +-
 .../yardstick/IgniteBenchmarkArguments.java     |  12 +-
 .../org/apache/ignite/yardstick/IgniteNode.java |  40 +--
 .../cache/IgniteCacheAbstractBenchmark.java     |   8 +-
 .../yardstick/cache/IgniteGetBenchmark.java     |   7 +-
 .../cache/IgniteGetOffHeapBenchmark.java        |   6 +-
 .../cache/IgniteGetOffHeapValuesBenchmark.java  |   6 +-
 .../cache/IgniteJdbcSqlQueryBenchmark.java      |  21 +-
 .../yardstick/cache/IgnitePutAllBenchmark.java  |  15 +-
 .../cache/IgnitePutAllTxBenchmark.java          |  15 +-
 .../yardstick/cache/IgnitePutBenchmark.java     |   9 +-
 .../yardstick/cache/IgnitePutGetBenchmark.java  |   9 +-
 .../cache/IgnitePutGetOffHeapBenchmark.java     |   6 +-
 .../IgnitePutGetOffHeapValuesBenchmark.java     |   6 +-
 .../cache/IgnitePutGetTxBenchmark.java          |  11 +-
 .../cache/IgnitePutGetTxOffHeapBenchmark.java   |   6 +-
 .../IgnitePutGetTxOffHeapValuesBenchmark.java   |   6 +-
 .../cache/IgnitePutIndexedValue1Benchmark.java  |   9 +-
 .../cache/IgnitePutIndexedValue2Benchmark.java  |   9 +-
 .../cache/IgnitePutIndexedValue8Benchmark.java  |   9 +-
 .../cache/IgnitePutOffHeapBenchmark.java        |   6 +-
 .../cache/IgnitePutOffHeapValuesBenchmark.java  |   6 +-
 .../yardstick/cache/IgnitePutTxBenchmark.java   |   9 +-
 .../cache/IgnitePutTxOffHeapBenchmark.java      |   6 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java      |   6 +-
 .../cache/IgniteSqlQueryBenchmark.java          |  23 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |  23 +-
 .../IgniteSqlQueryJoinOffHeapBenchmark.java     |   6 +-
 .../cache/IgniteSqlQueryOffHeapBenchmark.java   |   6 +-
 .../cache/IgniteSqlQueryPutBenchmark.java       |  18 +-
 .../IgniteSqlQueryPutOffHeapBenchmark.java      |   6 +-
 .../yardstick/cache/model/Organization.java     |  10 +-
 .../ignite/yardstick/cache/model/Person.java    |  10 +-
 .../ignite/yardstick/cache/model/Person1.java   |   7 +-
 .../ignite/yardstick/cache/model/Person2.java   |   7 +-
 .../ignite/yardstick/cache/model/Person8.java   |   7 +-
 .../ignite/yardstick/cache/model/SampleKey.java |   7 +-
 .../yardstick/cache/model/SampleValue.java      |   7 +-
 .../jdbc/IgniteJdbcStoreAbstractBenchmark.java  |  20 +-
 .../store/jdbc/IgniteJdbcStoreGetBenchmark.java |   9 +-
 .../jdbc/IgniteJdbcStoreGetTxBenchmark.java     |   9 +-
 .../store/jdbc/IgniteJdbcStorePutBenchmark.java |  10 +-
 .../jdbc/IgniteJdbcStorePutGetBenchmark.java    |  10 +-
 .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java  |  10 +-
 .../jdbc/IgniteJdbcStorePutTxBenchmark.java     |  10 +-
 .../compute/IgniteAffinityCallBenchmark.java    |  11 +-
 .../yardstick/compute/IgniteApplyBenchmark.java |  18 +-
 .../compute/IgniteBroadcastBenchmark.java       |   9 +-
 .../compute/IgniteExecuteBenchmark.java         |   9 +-
 .../yardstick/compute/IgniteRunBenchmark.java   |  18 +-
 .../yardstick/compute/model/NoopCallable.java   |  10 +-
 .../yardstick/compute/model/NoopTask.java       |  21 +-
 .../apache/ignite/yarn/ApplicationMaster.java   |  45 ++-
 .../apache/ignite/yarn/ClusterProperties.java   |  15 +-
 .../org/apache/ignite/yarn/IgniteContainer.java |   5 +-
 .../org/apache/ignite/yarn/IgniteProvider.java  |  24 +-
 .../apache/ignite/yarn/IgniteYarnClient.java    |  39 ++-
 .../ignite/yarn/utils/IgniteYarnUtils.java      |  15 +-
 .../org/apache/ignite/IgniteYarnTestSuite.java  |   6 +-
 .../yarn/IgniteApplicationMasterSelfTest.java   |  52 ++--
 .../zk/TcpDiscoveryZookeeperIpFinder.java       |  48 ++--
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |  31 +-
 4526 files changed, 56301 insertions(+), 37300 deletions(-)
----------------------------------------------------------------------



[72/82] [abbrv] ignite git commit: IGNITE-1337: Moved "common" CPP project to Ignite.

Posted by sb...@apache.org.
IGNITE-1337: Moved "common" CPP project to Ignite.


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

Branch: refs/heads/ignite-1093-2
Commit: 39da8534d6d99803e4b5ad60bea76655e4cbf388
Parents: 7ca8cbc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 10:40:43 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 10:40:43 2015 +0300

----------------------------------------------------------------------
 parent/pom.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/39da8534/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a2b41c..3556671 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -743,6 +743,7 @@
                                         <exclude>**/*.vcsproj</exclude>
                                         <exclude>**/*.vcsproj.filters</exclude>
                                         <exclude>**/module.def</exclude>
+                                        <exclude>**/ignite-common.pc.in</exclude>
                                     </excludes>
                                 </configuration>
                             </execution>


[45/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
index 2c035f4..ad62f95 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
@@ -17,20 +17,24 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collections;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -161,4 +165,4 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
             super.spiStart(gridName);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
index 46719ba..ad62e6d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.swing.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Rest processor test.
@@ -342,4 +348,4 @@ public class RestProcessorTest extends GridCommonAbstractTest {
             return S.toString(ComplexBean.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
index bba6368..dc424fe 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
@@ -17,27 +17,42 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.handlers.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.client.GridClientProtocol.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientDataConfiguration;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedHashMap;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.client.GridClientProtocol.TCP;
 
 /**
  * Test for {@code GridTaskCommandHandler}
@@ -207,4 +222,4 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest {
             return sum;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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..d71883b 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
@@ -17,25 +17,49 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.logger.java.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage;
+import org.apache.ignite.internal.util.GridClientByteUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.java.JavaLogger;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.GET;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.GET_ALL;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.METRICS;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PREPEND;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PUT_ALL;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.REPLACE;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV_ALL;
 
 /**
  * Test client.
@@ -634,4 +658,4 @@ final class TestBinaryClient {
             return error;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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..4a66743 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
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.logger.java.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.java.JavaLogger;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test client.
@@ -895,4 +901,4 @@ final class TestMemcacheClient {
             return extrasLength;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask1.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask1.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask1.java
index 1374d65..5141b34 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask1.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask1.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -47,4 +51,4 @@ class TestTask1 extends ComputeTaskSplitAdapter<String, String> {
     @Override public String reduce(List<ComputeJobResult> results) {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask2.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask2.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask2.java
index c5ceb55..a75e355 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask2.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestTask2.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -50,4 +54,4 @@ class TestTask2 extends ComputeTaskSplitAdapter<String, String> {
     @Override public String reduce(List<ComputeJobResult> results) {
         return RES;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
index 1e46a94..c82c73e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.nio.GridNioFinishedFuture;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioRecoveryDescriptor;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Mock nio session with disabled functionality for testing parser.
@@ -138,4 +139,4 @@ public class MockNioSession extends GridMetadataAwareAdapter implements GridNioS
     @Nullable @Override public GridNioRecoveryDescriptor recoveryDescriptor() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
index 76c929e..fecd2b9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
@@ -17,24 +17,29 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*;
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_HANDSHAKE_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_REQ_FLAG;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER;
 
 /**
  * This class tests that parser confirms memcache extended specification.
@@ -448,4 +453,4 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index a9bc246..ec41a38 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -17,22 +17,25 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.sql.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.io.Serializable;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests for complex queries (joins, etc.).
@@ -312,4 +315,4 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
             this.name = name;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
index 2601b5b..b414f67 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.concurrent.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.concurrent.Callable;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Connection test.
@@ -215,4 +218,4 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
             "Connection is closed."
         );
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
index 3869ddd..11a57db 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.sql.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests for empty cache.
@@ -135,4 +138,4 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
 
         assert cnt == 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
index 5771e56..0ab2bf7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
@@ -17,19 +17,22 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.sql.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteJdbcDriver.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteJdbcDriver.PROP_NODE_ID;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Test JDBC with several local caches.
@@ -151,4 +154,4 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
                 conn.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index e1318d6..0deb45d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -17,23 +17,32 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
-import static java.sql.Types.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.sql.Types.INTEGER;
+import static java.sql.Types.OTHER;
+import static java.sql.Types.VARCHAR;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Metadata tests.
@@ -334,4 +343,4 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
             this.name = name;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index 3ef7d04..0c701ef 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -17,23 +17,42 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.math.*;
-import java.net.*;
-import java.sql.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Date;
-
-import static java.sql.Types.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.sql.Types.BIGINT;
+import static java.sql.Types.BINARY;
+import static java.sql.Types.BOOLEAN;
+import static java.sql.Types.DATALINK;
+import static java.sql.Types.DATE;
+import static java.sql.Types.DOUBLE;
+import static java.sql.Types.FLOAT;
+import static java.sql.Types.INTEGER;
+import static java.sql.Types.OTHER;
+import static java.sql.Types.SMALLINT;
+import static java.sql.Types.TIME;
+import static java.sql.Types.TIMESTAMP;
+import static java.sql.Types.TINYINT;
+import static java.sql.Types.VARCHAR;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Prepared statement test.
@@ -726,4 +745,4 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
             this.id = id;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index 4ba6fcd..013fd09 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@ -17,26 +17,33 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.math.*;
-import java.net.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.sql.Date;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Result set test.
@@ -715,4 +722,4 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
             return S.toString(TestObjectField.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index d0cb20e..352b819 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -17,20 +17,24 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.sql.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Statement test.
@@ -286,4 +290,4 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
             this.age = age;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
index ee56d02..b0c0c58 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
@@ -17,8 +17,15 @@
 
 package org.apache.ignite.jdbc.suite;
 
-import junit.framework.*;
-import org.apache.ignite.jdbc.*;
+import junit.framework.TestSuite;
+import org.apache.ignite.jdbc.JdbcComplexQuerySelfTest;
+import org.apache.ignite.jdbc.JdbcConnectionSelfTest;
+import org.apache.ignite.jdbc.JdbcEmptyCacheSelfTest;
+import org.apache.ignite.jdbc.JdbcLocalCachesSelfTest;
+import org.apache.ignite.jdbc.JdbcMetadataSelfTest;
+import org.apache.ignite.jdbc.JdbcPreparedStatementSelfTest;
+import org.apache.ignite.jdbc.JdbcResultSetSelfTest;
+import org.apache.ignite.jdbc.JdbcStatementSelfTest;
 
 /**
  * JDBC driver test suite.
@@ -42,4 +49,4 @@ public class IgniteJdbcDriverTestSuite extends TestSuite {
 
         return suite;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
----------------------------------------------------------------------
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 e1945d6..662af2b 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
@@ -17,14 +17,24 @@
 
 package org.apache.ignite.loadtests.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Random;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientData;
+import org.apache.ignite.internal.client.GridClientDataConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientPartitionAffinity;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridFileLock;
+import org.apache.ignite.testframework.GridLoadTestUtils;
 
 /**
  * Use {@code modules/core/src/test/config/benchmark/spring-cache-client-benchmark-*.xml}
@@ -256,4 +266,4 @@ public class ClientCacheBenchmark {
             fileLock.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
index ba9db0b..570678f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.loadtests.client;
 
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.jdk.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS;
 
 /**
  * Tests basic performance of marshallers.
@@ -153,4 +154,4 @@ public class ClientMarshallerBenchmarkTest extends GridCommonAbstractTest {
 
         return (T)res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
index cf922f6..669c110 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.loadtests.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.client.ClientTcpSslMultiThreadedSelfTest;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Makes a long run to ensure stability and absence of memory leaks.
@@ -83,4 +83,4 @@ public class ClientTcpSslLoadTest extends ClientTcpSslMultiThreadedSelfTest {
                 log.error("Cache clear failed.", e);
             }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
----------------------------------------------------------------------
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 7555b16..1f43d54 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
@@ -17,27 +17,40 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.cloud;
 
-import com.google.common.base.*;
-import com.google.common.io.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.jclouds.*;
-import org.jclouds.compute.*;
-import org.jclouds.compute.domain.*;
-import org.jclouds.domain.*;
-import org.jclouds.googlecloud.*;
-import org.jclouds.location.reference.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import com.google.common.base.Charsets;
+import com.google.common.base.Predicate;
+import com.google.common.base.Supplier;
+import com.google.common.io.Files;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
+import org.jclouds.Constants;
+import org.jclouds.ContextBuilder;
+import org.jclouds.compute.ComputeService;
+import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.domain.ComputeMetadata;
+import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.domain.Credentials;
+import org.jclouds.domain.Location;
+import org.jclouds.googlecloud.GoogleCredentialsFromJson;
+import org.jclouds.location.reference.LocationConstants;
 
 /**
  * IP finder for automatic lookup of nodes running in a cloud.
@@ -439,4 +452,4 @@ public class TcpDiscoveryCloudIpFinder extends TcpDiscoveryIpFinderAdapter {
 
         return builder.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
index d1d945f..f5e77e5 100644
--- a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
+++ b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.cloud;
 
-import com.google.common.collect.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.testsuites.*;
-
-import java.net.*;
-import java.util.*;
+import com.google.common.collect.ImmutableList;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
+import org.apache.ignite.testsuites.IgniteCloudTestSuite;
 
 /**
  * TcpDiscoveryCloudIpFinder test.
@@ -118,4 +117,4 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
 
         assert addresses.size() == ipFinder.getRegisteredAddresses().size();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java b/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java
index 28d4436..12a67e7 100644
--- a/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java
+++ b/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.cloud.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import junit.framework.TestSuite;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.cloud.TcpDiscoveryCloudIpFinderSelfTest;
 
 /**
  * Ignite Cloud integration test.
@@ -109,4 +110,4 @@ public class IgniteCloudTestSuite extends TestSuite {
 
         return list;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index cdbbd9e..8d9a3f5 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -17,18 +17,41 @@
 
 package org.apache.ignite.codegen;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import static java.lang.reflect.Modifier.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.reflect.Modifier.isStatic;
+import static java.lang.reflect.Modifier.isTransient;
 
 /**
 * Direct marshallable code generator.
@@ -875,4 +898,4 @@ public class MessageCodeGenerator {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 d70a3a1..62fd020 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.plugin.IgnitePlugin;
+import org.apache.ignite.plugin.PluginNotFoundException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Main entry-point for all Ignite APIs.
@@ -480,4 +484,4 @@ public interface Ignite extends AutoCloseable {
      * @return Affinity.
      */
     public <K> Affinity<K> affinity(String cacheName);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java
index b749ef5..83e2525 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite;
 
-import java.io.*;
+import java.io.Closeable;
 
 /**
  * This interface provides a rich API for working with distributedly cached atomic long value.
@@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable {
      * @throws IgniteException If operation failed.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java
index bc8a987..a33cf35 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite;
 
-import java.io.*;
+import java.io.Closeable;
 
 /**
  * This interface provides a rich API for working with distributed atomic reference.
@@ -96,4 +96,4 @@ public interface IgniteAtomicReference<T> extends Closeable {
      * @throws IgniteException If operation failed.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java
index afb6c42..313aba5 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite;
 
-import java.io.*;
+import java.io.Closeable;
 
 /**
  * This interface provides a rich API for working with distributed atomic sequence.
@@ -133,4 +133,4 @@ public interface IgniteAtomicSequence extends Closeable {
      * @throws IgniteException If operation failed.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteAtomicStamped.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicStamped.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicStamped.java
index a5e989a..c05fdae 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicStamped.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicStamped.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Closeable;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * This interface provides a rich API for working with distributed atomic stamped value.
@@ -125,4 +124,4 @@ public interface IgniteAtomicStamped<T, S> extends Closeable {
      * @throws IgniteException If operation failed.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteAuthenticationException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAuthenticationException.java b/modules/core/src/main/java/org/apache/ignite/IgniteAuthenticationException.java
index e3ebd60..d86eba2 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteAuthenticationException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteAuthenticationException.java
@@ -32,4 +32,4 @@ public class IgniteAuthenticationException extends IgniteCheckedException {
     public IgniteAuthenticationException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
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 c9ff955..e0f9f55 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -17,30 +17,47 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.mxbean.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.event.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.configuration.Configuration;
+import javax.cache.event.CacheEntryRemovedListener;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheWriter;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.query.Query;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cache.query.SpiQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.TextQuery;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.mxbean.CacheMetricsMXBean;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link Ignite#cache(String)}
@@ -644,4 +661,4 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
      * @return MxBean.
      */
     public CacheMetricsMXBean mxBean();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java
----------------------------------------------------------------------
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 2f0696c..480e272 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * General grid exception. This exception is used to indicate any error condition
@@ -90,4 +90,4 @@ public class IgniteCheckedException extends Exception {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteClientDisconnectedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteClientDisconnectedException.java b/modules/core/src/main/java/org/apache/ignite/IgniteClientDisconnectedException.java
index 2089db0..fa018d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteClientDisconnectedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteClientDisconnectedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown from Ignite API when client node disconnected from cluster.
@@ -58,4 +58,4 @@ public class IgniteClientDisconnectedException extends IgniteException {
     public IgniteFuture<?> reconnectFuture() {
         return reconnectFut;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
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 969d320..97701dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.File;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterStartNodeResult;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents whole cluster (all available nodes) and also provides a handle on {@link #nodeLocalMap()} which
@@ -338,4 +343,4 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
 
     /** {@inheritDoc} */
     @Override public IgniteCluster withAsync();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
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 52ee6ff..9aa4b87 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -17,15 +17,28 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskSpis;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.SpringApplicationContextResource;
+import org.apache.ignite.resources.SpringResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.failover.FailoverSpi;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines compute grid functionality for executing tasks and closures over nodes
@@ -406,4 +419,4 @@ public interface IgniteCompute extends IgniteAsyncSupport {
 
     /** {@inheritDoc} */
     @Override public IgniteCompute withAsync();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteCountDownLatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCountDownLatch.java b/modules/core/src/main/java/org/apache/ignite/IgniteCountDownLatch.java
index 1761766..98767fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCountDownLatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCountDownLatch.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.Closeable;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This interface provides a rich API for working with distributed count down latch.
@@ -227,4 +227,4 @@ public interface IgniteCountDownLatch extends Closeable {
      * @throws IgniteException If operation failed.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index aad4574..79bd163 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.lang.*;
-import org.apache.ignite.stream.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import javax.cache.CacheException;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.stream.StreamReceiver;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Data streamer is responsible for streaming external data into cache. It achieves it by
@@ -387,4 +388,4 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable {
      */
     @Override public void close() throws CacheException, IgniteInterruptedException;
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteDeploymentException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDeploymentException.java b/modules/core/src/main/java/org/apache/ignite/IgniteDeploymentException.java
index d0b010a..9b4cb9d 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDeploymentException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDeploymentException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Deployment or re-deployment failed.
@@ -54,4 +54,4 @@ public class IgniteDeploymentException extends IgniteException {
     public IgniteDeploymentException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
----------------------------------------------------------------------
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 1f36c00..c0e4d3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides functionality for local and remote event notifications on nodes defined by {@link #clusterGroup()}.
@@ -266,4 +270,4 @@ public interface IgniteEvents extends IgniteAsyncSupport {
 
     /** {@inheritDoc} */
     @Override public IgniteEvents withAsync();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteException.java
----------------------------------------------------------------------
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 a8ec279..9d02f8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * General grid exception. This exception is used to indicate any error condition
@@ -90,4 +90,4 @@ public class IgniteException extends RuntimeException {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
index 90068c4..b02d0f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
@@ -17,13 +17,22 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.IgfsMetrics;
+import org.apache.ignite.igfs.IgfsOutputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathSummary;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.igfs.mapreduce.IgfsTask;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * <b>IG</b>nite <b>F</b>ile <b>S</b>ystem API. It provides a typical file system "view" on a particular cache:
@@ -454,4 +463,4 @@ public interface IgniteFileSystem extends IgniteAsyncSupport {
 
     /** {@inheritDoc} */
     @Override public IgniteFileSystem withAsync();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java
----------------------------------------------------------------------
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 6eab051..639703e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This exception indicates the ignite access in invalid state.
@@ -81,4 +81,4 @@ public class IgniteIllegalStateException extends IllegalStateException {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteInterruptedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteInterruptedException.java b/modules/core/src/main/java/org/apache/ignite/IgniteInterruptedException.java
index 9d6f1ff..dc06f8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteInterruptedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteInterruptedException.java
@@ -52,4 +52,4 @@ public class IgniteInterruptedException extends IgniteException {
     public IgniteInterruptedException(String msg, InterruptedException cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
index 17ec221..6ba362e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
@@ -18,12 +18,16 @@
 package org.apache.ignite;
 
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.internal.jdbc.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+import java.util.logging.Logger;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.internal.jdbc.JdbcConnection;
 
 /**
  * JDBC driver implementation for In-Memory Data Grid.
@@ -469,4 +473,4 @@ public class IgniteJdbcDriver implements Driver {
             this.required = required;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
index f99927c..f3afa99 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface defines basic logging functionality used throughout the system. We had to
@@ -158,4 +158,4 @@ public interface IgniteLogger {
      * @return Name of the file being logged to if one is configured or {@code null} otherwise.
      */
     public String fileName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
index 03eb621..ab554af 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides functionality for topic-based message exchange among nodes defined by {@link #clusterGroup()}.
@@ -159,4 +162,4 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
 
     /** {@inheritDoc} */
     @Override IgniteMessaging withAsync();
-}
+}
\ No newline at end of file


[23/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
index 120745c..d1f5e4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * IGFS write blocks message.
@@ -170,4 +171,4 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
index db48064..943165e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Closeable;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentMap;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * IGFS client session. Effectively used to manage lifecycle of opened resources and close them on
@@ -72,4 +71,4 @@ public class IgfsClientSession {
     public Iterator<Closeable> registeredResources() {
         return rsrcMap.values().iterator();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
index c2c24ca..412c45b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for all IGFS communication messages sent between nodes.
@@ -76,4 +77,4 @@ public abstract class IgfsCommunicationMessage implements Message {
     @Override public byte fieldsCount() {
         return 0;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
index 24b56d3..2b08f28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS;
 
 /**
  * IGFS context holding all required components for IGFS instance.
@@ -201,4 +202,4 @@ public class IgfsContext {
 
         return mgr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index 602924d..c571f41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -17,44 +17,83 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.DataInput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.igfs.IgfsException;
+import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
+import org.apache.ignite.igfs.IgfsOutOfSpaceException;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerCacheUpdaters;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridPlainCallable;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.thread.IgniteThreadPoolExecutor;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache based file's data container.
@@ -1883,4 +1922,4 @@ public class IgfsDataManager extends IgfsManager {
                 onDone(true);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
index 8656745..ef3dd43 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that entry scheduled for delete was actually deleted.
@@ -184,4 +184,4 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage {
     @Override public String toString() {
         return S.toString(IgfsDeleteMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
index 1b2d3fe..98672e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
@@ -17,25 +17,31 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.IgfsEvent;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.managers.communication.GridIoPolicy;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_PURGED;
+import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID;
 
 /**
  * IGFS worker for removal from the trash directory.
@@ -346,4 +352,4 @@ public class IgfsDeleteWorker extends IgfsThread {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
index 361f75f..8ff7247 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
+import java.net.URI;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Internal API extension for {@link org.apache.ignite.IgniteFileSystem}.
@@ -175,4 +176,4 @@ public interface IgfsEx extends IgniteFileSystem {
      * @return Secondary file system wrapper.
      */
     public IgfsSecondaryFileSystem asSecondary();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
index d18ea82..5f083b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
@@ -17,15 +17,22 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity range.
@@ -364,4 +371,4 @@ public class IgfsFileAffinityRange implements Message, Externalizable {
     @Override public String toString() {
         return S.toString(IgfsFileAffinityRange.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
index fddfa20..5d7389b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
@@ -17,13 +17,19 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * File or directory information.
@@ -249,4 +255,4 @@ public final class IgfsFileImpl implements IgfsFile, Externalizable {
     @Override public String toString() {
         return S.toString(IgfsFileImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index de7d077..116d585 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Unmodifiable file information.
@@ -567,4 +572,4 @@ public final class IgfsFileInfo implements Externalizable {
             return info;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java
index 8f16ff2..2c0358b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_MOVED;
 
 /**
  * Auxiliary class that is responsible for managing file affinity keys allocation by ranges.
@@ -358,4 +362,4 @@ public class IgfsFileMap implements Externalizable {
     @Override public String toString() {
         return S.toString(IgfsFileMap.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java
index 1a2f3cb..6bea187 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Work batch is an abstraction of the logically grouped tasks.
@@ -193,4 +195,4 @@ public abstract class IgfsFileWorkerBatch implements Runnable {
      * Callback invoked when execution finishes.
      */
     protected abstract void onDone();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
index 61949d7..773d758 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
@@ -17,30 +17,51 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_INITIAL;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_MOVED;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_MOVING;
 
 /**
  * IGFS fragmentizer manager.
@@ -828,4 +849,4 @@ public class IgfsFragmentizerManager extends IgfsManager {
             return this == o;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
index cf657e3..75d77bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Fragmentizer request. Sent from coordinator to other IGFS nodes when colocated part of file
@@ -151,4 +152,4 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage {
     @Override public byte fieldsCount() {
         return 2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
index 6dd7534..b0f8a6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Fragmentizer response.
@@ -113,4 +113,4 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage {
     @Override public byte fieldsCount() {
         return 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
index 61efe32..1ba98ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Handshake message.
@@ -119,4 +121,4 @@ public class IgfsHandshakeResponse implements Externalizable {
         if (in.readBoolean())
             sampling = in.readBoolean();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
index 4795478..094c241 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
 
 /**
  * IGFS utility processor adapter.
@@ -46,4 +46,4 @@ public interface IgfsHelper {
      * @return {@code True} if IGFS block key.
      */
     public abstract boolean isIgfsBlockKey(Object key);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
index f15e0df..29e75a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.eviction.igfs.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.eviction.EvictionFilter;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.cache.eviction.igfs.IgfsEvictionFilter;
+import org.apache.ignite.cache.eviction.igfs.IgfsPerBlockLruEvictionPolicy;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * IGFS utils processor.
@@ -52,4 +54,4 @@ public class IgfsHelperImpl implements IgfsHelper {
     @Override public boolean isIgfsBlockKey(Object key) {
         return key instanceof IgfsBlockKey;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index c3495e9..695db38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -17,42 +17,104 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.eviction.igfs.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.cache.eviction.igfs.IgfsPerBlockLruEvictionPolicy;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.IgfsEvent;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsInvalidPathException;
+import org.apache.ignite.igfs.IgfsMetrics;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.IgfsOutputStream;
+import org.apache.ignite.igfs.IgfsParentNotDirectoryException;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathAlreadyExistsException;
+import org.apache.ignite.igfs.IgfsPathIsDirectoryException;
+import org.apache.ignite.igfs.IgfsPathNotFoundException;
+import org.apache.ignite.igfs.IgfsPathSummary;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.igfs.mapreduce.IgfsTask;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.igfs.IgfsMode.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.thread.IgniteThreadPoolExecutor;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CLOSED_READ;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CLOSED_WRITE;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_READ;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_WRITE;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_RENAMED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_META_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
+import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
+import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
+import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.ROOT_ID;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID;
 
 /**
  * Cache-based IGFS implementation.
@@ -2140,4 +2202,4 @@ public final class IgfsImpl implements IgfsEx {
             return t;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
index fc333b5..afcece7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-
-import java.io.*;
+import java.io.IOException;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
 
 /**
  * Implementation adapter providing necessary methods.
@@ -48,4 +47,4 @@ public abstract class IgfsInputStreamAdapter extends IgfsInputStream
      * @throws IOException If read failed.
      */
     public abstract byte[][] readChunks(long pos, int len) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
index 7a98fb9..ac42d44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
 /**
  * IGFS input stream descriptor - includes stream id and length.
@@ -75,4 +78,4 @@ public class IgfsInputStreamDescriptor implements Externalizable {
         streamId = in.readLong();
         len = in.readLong();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
index 6c35032..62f8034 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
@@ -17,19 +17,30 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.igfs.IgfsCorruptedFileException;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathNotFoundException;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Input stream to read data from grid cache with separate blocks.
@@ -531,4 +542,4 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
     @Override public String toString() {
         return S.toString(IgfsInputStreamImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java
index 8126487..cd93278 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Internal exception thrown when attempted to update range that is no longer present
@@ -40,4 +40,4 @@ public class IgfsInvalidRangeException extends IgniteCheckedException {
     public IgfsInvalidRangeException(Throwable cause) {
         super(cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
index cfe6ed4..0ed7c0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
@@ -17,21 +17,34 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.igfs.common.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Closeable;
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.igfs.IgfsOutOfSpaceException;
+import org.apache.ignite.igfs.IgfsOutputStream;
+import org.apache.ignite.igfs.IgfsUserContext;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.igfs.common.IgfsControlResponse;
+import org.apache.ignite.internal.igfs.common.IgfsHandshakeRequest;
+import org.apache.ignite.internal.igfs.common.IgfsIpcCommand;
+import org.apache.ignite.internal.igfs.common.IgfsMessage;
+import org.apache.ignite.internal.igfs.common.IgfsPathControlRequest;
+import org.apache.ignite.internal.igfs.common.IgfsStreamControlRequest;
+import org.apache.ignite.internal.processors.closure.GridClosurePolicy;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridPlainCallable;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * IGFS IPC handler.
@@ -569,4 +582,4 @@ class IgfsIpcHandler implements IgfsServerHandler {
     @Nullable private Closeable resource(IgfsClientSession ses, Long rsrcId) {
         return ses.resource(rsrcId);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
index fa90e21..d9d68ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
@@ -17,14 +17,20 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.io.*;
+import java.io.IOException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.mapreduce.IgfsFileRange;
+import org.apache.ignite.igfs.mapreduce.IgfsJob;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.internal.GridInternalWrapper;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * IGFS job implementation.
@@ -114,4 +120,4 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
     @Override public IgfsJob userObject() {
         return job;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
index 508b52a..1cdc8a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Directory listing entry.
@@ -194,4 +197,4 @@ public class IgfsListingEntry implements Externalizable {
     @Override public String toString() {
         return S.toString(IgfsListingEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
index d715e9a..8245bbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jsr166.*;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jsr166.LongAdder8;
 
 /**
  * Value object holding all local IGFS metrics which cannot be determined using file system traversal.
@@ -209,4 +209,4 @@ public class IgfsLocalMetrics {
         bytesRead = F.t(new LongAdder8(), new LongAdder8());
         bytesWritten = F.t(new LongAdder8(), new LongAdder8());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
index b33ee15..1217d0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
 
 /**
  * Abstract class for IGFS managers.
@@ -152,4 +152,4 @@ public abstract class IgfsManager {
     protected String kernalStopInfo() {
         return "Cache manager received onKernalStop() callback: " + getClass().getSimpleName();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index aabe503..5611f33 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -17,34 +17,75 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.events.IgfsEvent;
+import org.apache.ignite.igfs.IgfsConcurrentModificationException;
+import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException;
+import org.apache.ignite.igfs.IgfsException;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathAlreadyExistsException;
+import org.apache.ignite.igfs.IgfsPathIsDirectoryException;
+import org.apache.ignite.igfs.IgfsPathIsNotDirectoryException;
+import org.apache.ignite.igfs.IgfsPathNotFoundException;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_PURGED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_RENAMED;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.ROOT_ID;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID;
+import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.builder;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache based structure (meta data) manager.
@@ -3026,4 +3067,4 @@ public class IgfsMetaManager extends IgfsManager {
             return S.toString(UpdatePath.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
index 41e296e..c8ad049 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.igfs.IgfsMetrics;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * IGFS metrics adapter.
@@ -236,4 +238,4 @@ public class IgfsMetricsAdapter implements IgfsMetrics, Externalizable {
     @Override public String toString() {
         return S.toString(IgfsMetricsAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
index fd0c485..70da103 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -174,4 +180,4 @@ public class IgfsModeResolver {
         // Path and prefix components had same length and all of them matched.
         return true;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
index ca83145..492927b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
 
 /**
  * No-op utils processor adapter.
@@ -38,4 +38,4 @@ public class IgfsNoopHelper implements IgfsHelper {
     @Override public boolean isIgfsBlockKey(Object key) {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
index 41dcc31..08eef8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.mapreduce.IgfsJob;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.typedef.X;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Nop Ignite file system processor implementation.
@@ -68,4 +69,4 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter {
         long start, long length, IgfsRecordResolver recRslv) {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java
index 6edc209..43de61e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.DataInput;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.igfs.IgfsOutputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Output stream to store data into grid cache with separate blocks.
@@ -260,4 +262,4 @@ abstract class IgfsOutputStreamAdapter extends IgfsOutputStream {
     @Override public String toString() {
         return S.toString(IgfsOutputStreamAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index 01359b5..c297eed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -17,20 +17,30 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.igfs.IgfsMode.*;
+import java.io.DataInput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.igfs.IgfsException;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsPathNotFoundException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
+import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
 
 /**
  * Output stream to store data into grid cache with separate blocks.
@@ -502,4 +512,4 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
             return S.toString(ReserveSpaceClosure.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
index d1dd576..fbf89ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
@@ -17,13 +17,18 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Description of path modes.
@@ -121,4 +126,4 @@ public class IgfsPaths implements Externalizable {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
index f3522a8..5b8cf86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -17,31 +17,48 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.mapreduce.IgfsJob;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.IgniteSystemProperties.getBoolean;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.igfs.IgfsMode.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS;
 
 /**
  * Fully operational Ignite file system processor.
@@ -424,4 +441,4 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 ", loc" + propName + "=" + locVal +
                 ", ggfName=" + igfsName + ']');
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
index ee38ab3..6648c7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.mapreduce.IgfsJob;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ignite file system processor adapter.
@@ -77,4 +77,4 @@ public abstract class IgfsProcessorAdapter extends GridProcessorAdapter {
      */
     @Nullable public abstract ComputeJob createJob(IgfsJob job, @Nullable String igfsName, IgfsPath path,
         long start, long length, IgfsRecordResolver recRslv);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
index 439c8ce..52c9e0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Internal key used to track if sampling enabled or disabled for particular IGFS instance.
@@ -80,4 +83,4 @@ class IgfsSamplingKey implements GridCacheInternal, Externalizable {
     @Override public String toString() {
         return S.toString(IgfsSamplingKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
index 44ee90f..23d6322 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.OutputStream;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Secondary file system over native IGFS.
@@ -123,4 +126,4 @@ class IgfsSecondaryFileSystemImpl implements IgfsSecondaryFileSystem {
     @Override public void close() throws IgniteException {
         // No-op.
     }
-}
+}
\ No newline at end of file


[18/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableList.java
index 91301be..78eece8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableList.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.AbstractList;
 
 /**
  * Makes {@link AbstractList} as {@link Serializable} and is
@@ -30,4 +30,4 @@ public abstract class GridSerializableList<E> extends AbstractList<E> implements
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableMap.java
index e3a61f9..7c5c629 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableMap.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.AbstractMap;
 
 /**
  * Makes {@link AbstractMap} as {@link Serializable} and is
@@ -34,4 +34,4 @@ public abstract class GridSerializableMap<K, V> extends AbstractMap<K, V> implem
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableSet.java
index dc5e35d..1fb7b38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableSet.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
 
 /**
  * Makes {@link AbstractSet} as {@link Serializable} and is
@@ -34,4 +35,4 @@ public abstract class GridSerializableSet<E> extends AbstractSet<E> implements S
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSetWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSetWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSetWrapper.java
index 80577f8..5104097 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSetWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSetWrapper.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Set implementation that delegates to map.
@@ -133,4 +135,4 @@ public class GridSetWrapper<E> extends GridSerializableSet<E> {
     @Override public String toString() {
         return S.toString(GridSetWrapper.class, this, "elements", map.keySet());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSnapshotLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSnapshotLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSnapshotLock.java
index e8acfc0..ad56f59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSnapshotLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSnapshotLock.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.locks.*;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Synchronization primitive allowing concurrent updates and taking consistent snapshots.
@@ -216,4 +215,4 @@ public abstract class GridSnapshotLock<X> {
             return true;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java
index b2b2dac..5c76cbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
 
 /**
  * Wrapper used to covert {@link org.apache.ignite.spi.IgniteSpiCloseableIterator} to {@link GridCloseableIterator}.
@@ -54,4 +54,4 @@ public class GridSpiCloseableIteratorWrapper<T> extends GridCloseableIteratorAda
     @Override protected void onClose() throws IgniteCheckedException {
         iter.close();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinBusyLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinBusyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinBusyLock.java
index 267d739..2aae6ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinBusyLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinBusyLock.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 
 /**
  * Synchronization aid to track "busy" state of a subsystem that owns it.
@@ -81,4 +81,4 @@ public class GridSpinBusyLock {
     public void unblock() {
         lock.writeUnlock();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
index 4baa346..a1fa892 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import sun.misc.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import sun.misc.Unsafe;
 
 /**
  *
@@ -410,4 +410,4 @@ public class GridSpinReadWriteLock {
     @Override public String toString() {
         return S.toString(GridSpinReadWriteLock.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
index 4b61ad7..bc979f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * Optimized string builder with better API.
@@ -444,4 +447,4 @@ public class GridStringBuilder implements Serializable {
     public String toString() {
         return impl.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilderFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilderFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilderFactory.java
index e3fe885..0f3403a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilderFactory.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.SB;
 
 /**
  * Per-thread cache of {@link StringBuilder} instances.
@@ -95,4 +95,4 @@ public final class GridStringBuilderFactory {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedLock.java
index a007815..f7033aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedLock.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.locks.*;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This is an utility class for 'splitting' locking of some
@@ -140,4 +141,4 @@ public class GridStripedLock {
     @Override public String toString() {
         return S.toString(GridStripedLock.class, this, "concurrency", locks.length);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedReadWriteLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedReadWriteLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedReadWriteLock.java
index c6cb628..77419a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedReadWriteLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedReadWriteLock.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.locks.*;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This is an utility class for 'splitting' locking of some
@@ -97,4 +99,4 @@ public class GridStripedReadWriteLock {
     @Override public String toString() {
         return S.toString(GridStripedReadWriteLock.class, this, "concurrency", locks.length);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java
index 345f7bc..e83aafd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.util;
 
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Map;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Synchronized map for cache values that is safe to update in-place. Main reason for this map
@@ -97,4 +99,4 @@ public class GridSynchronizedMap<K, V> extends ConcurrentHashMap8<K, V> implemen
 
         assert mapSize == size : "Invalid map size after reading [size=" + size + ", mapSize=" + size + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimer.java
index 05e52f1..5f1bd3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimer.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.text.*;
-import java.util.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Timer to use mostly for debugging purposes.
@@ -151,4 +151,4 @@ public class GridTimer {
     @Override public String toString() {
         return S.toString(GridTimer.class, this, "duration", duration());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimerTask.java
index 71eecb6..dd86b38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridTimerTask.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
+import java.util.TimerTask;
 
 /**
  * Utility extension for {@link TimerTask}.
@@ -37,4 +37,4 @@ public abstract class GridTimerTask extends TimerTask {
             Thread.currentThread().interrupt();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
index d1eeb9c..2867b0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import sun.misc.*;
-
-import java.lang.reflect.*;
-import java.security.*;
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import sun.misc.Unsafe;
 
 /**
  * Provides handle on Unsafe class from SUN which cannot be instantiated directly.
@@ -58,4 +59,4 @@ public class GridUnsafe {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridWeakIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridWeakIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridWeakIterator.java
index 17a7e83..e1d84d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridWeakIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridWeakIterator.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-
-import java.lang.ref.*;
-import java.util.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
 
 /**
  * Weak iterator.

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java
index ab113d7..1c3a5b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_EXCEPTION_REGISTRY_MAX_SIZE;
 
 /**
  * Utility to collect suppressed errors within internal code.
@@ -240,4 +245,4 @@ public class IgniteExceptionRegistry {
             return S.toString(ExceptionInfo.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 c9be652..ba918f6 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
@@ -17,68 +17,230 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.events.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.mxbean.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-import sun.misc.*;
-
-import javax.management.*;
-import javax.naming.*;
-import javax.net.ssl.*;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.lang.annotation.Annotation;
-import java.lang.management.*;
+import java.lang.management.CompilationMXBean;
+import java.lang.management.LockInfo;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MonitorInfo;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
 import java.lang.reflect.Array;
-import java.lang.reflect.*;
-import java.math.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.security.cert.*;
-import java.sql.*;
-import java.text.*;
-import java.util.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileLock;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.charset.Charset;
+import java.security.AccessController;
+import java.security.KeyManagementException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
+import java.security.cert.X509Certificate;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-import java.util.jar.*;
-import java.util.logging.*;
-import java.util.regex.*;
-import java.util.zip.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Condition;
+import java.util.jar.JarFile;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import javax.management.DynamicMBean;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteDeploymentException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskCancelledException;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskTimeoutException;
+import org.apache.ignite.configuration.AddressResolver;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.mxbean.IgniteStandardMXBean;
+import org.apache.ignite.internal.processors.cache.GridCacheAttributes;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.io.GridFilenameUtils;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryNativeLoader;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFutureCancelledException;
+import org.apache.ignite.lang.IgniteFutureTimeoutException;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport;
+import org.apache.ignite.transactions.TransactionHeuristicException;
+import org.apache.ignite.transactions.TransactionOptimisticException;
+import org.apache.ignite.transactions.TransactionRollbackException;
+import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import sun.misc.SharedSecrets;
+import sun.misc.URLClassPath;
+import sun.misc.Unsafe;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_HOSTNAME_VERIFIER;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_HOST;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MBEAN_APPEND_CLASS_LOADER_ID;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MBEAN_APPEND_JVM_ID;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_DISCO_ORDER;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SSH_HOST;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SSH_USER_NAME;
+import static org.apache.ignite.IgniteSystemProperties.getBoolean;
+import static org.apache.ignite.events.EventType.EVTS_ALL;
+import static org.apache.ignite.events.EventType.EVTS_ALL_MINUS_METRIC_UPDATE;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_DATE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CACHE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_PID;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
 
 /**
  * Collection of utility methods used throughout the system.
@@ -9124,4 +9286,4 @@ public abstract class IgniteUtils {
 
         return hasShmem;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUuidCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUuidCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUuidCache.java
index 045589c..4ca00d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUuidCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUuidCache.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  *
@@ -56,4 +56,4 @@ public final class IgniteUuidCache {
     private IgniteUuidCache() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index d56ed7c..0a6d9aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicMarkableReference;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
 
 /**
  * Future composed of multiple inner futures.
@@ -357,4 +363,4 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
             return "Compound future listener: " + GridCompoundFuture.this;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java
index cf14948..bb5abf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future composed of multiple inner futures.
@@ -48,4 +48,4 @@ public class GridCompoundIdentityFuture<T> extends GridCompoundFuture<T, T> {
     @Override public String toString() {
         return S.toString(GridCompoundIdentityFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
index 11b28b5..4a802cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteIllegalStateException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteOutClosure;
 
 /**
  * Future which waits for embedded future to complete and then asynchronously executes
@@ -343,4 +347,4 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
          */
         protected abstract void applyx(IgniteInternalFuture<A> f) throws Exception;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
index 2adee90..6baedbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Future that is completed at creation time.
@@ -154,4 +155,4 @@ public class GridFinishedFuture<T> implements IgniteInternalFuture<T> {
     @Override public String toString() {
         return S.toString(GridFinishedFuture.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index 91ce549..0f65d33 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future adapter.
@@ -489,4 +494,4 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
             return "ChainFuture [orig=" + fut + ", doneCb=" + doneCb + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
index 43ffa61..947b2ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Future listener to fill chained future with converted result of the source future.
@@ -61,4 +62,4 @@ public class GridFutureChainListener<T, R> implements IgniteInClosure<IgniteInte
             throw e;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
index 7c57978..6da7c02 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -48,4 +48,4 @@ public class IgniteFinishedFutureImpl<V> extends IgniteFutureImpl<V> {
     @Override public String toString() {
         return S.toString(IgniteFinishedFutureImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
index 13d564d..7d74154 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Implementation of public API future.
@@ -202,4 +205,4 @@ public class IgniteFutureImpl<V> implements IgniteFuture<V> {
             return lsnr.toString();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyArgumentBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyArgumentBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyArgumentBuilder.java
index 1a0edb2..2c44746 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyArgumentBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyArgumentBuilder.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.internal.util.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-
-import java.lang.annotation.*;
-import java.util.*;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.compute.gridify.GridifyInput;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter;
 
 /**
  * Argument builder used for creating arguments for tasks and jobs in gridified methods.
@@ -183,4 +189,4 @@ public final class GridifyArgumentBuilder {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyJobAdapter.java
index 93b9eae..32824b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyJobAdapter.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.util.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.gridify.GridifyArgument;
 
 /**
  * Convenience adapter for custom {@code gridify} jobs. In addition to
@@ -103,4 +104,4 @@ public class GridifyJobAdapter extends ComputeJobAdapter {
             throw new IgniteException("Failed to find method for execution.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyRangeArgument.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyRangeArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyRangeArgument.java
index c01536c..66c8ed7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyRangeArgument.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyRangeArgument.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.gridify;
 
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Convenience adapter for {@link org.apache.ignite.compute.gridify.GridifyArgument} interface.
@@ -101,4 +100,4 @@ public class GridifyRangeArgument extends GridifyArgumentAdapter {
     @Override public String toString() {
         return S.toString(GridifyRangeArgument.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyUtils.java
index bc1b68e..b0640c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/gridify/GridifyUtils.java
@@ -17,14 +17,31 @@
 
 package org.apache.ignite.internal.util.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+import org.apache.ignite.compute.gridify.GridifyInput;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility class with common methods used in gridify annotations.
@@ -519,4 +536,4 @@ public final class GridifyUtils {
             out.defaultWriteObject();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayInputStream.java
index 9085a3e..2626bf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayInputStream.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.io;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This class defines input stream backed by byte array.
@@ -206,4 +207,4 @@ public class GridByteArrayInputStream extends InputStream {
     @Override public String toString() {
         return S.toString(GridByteArrayInputStream.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
index 52d81e1..c0c11ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.util.io;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This class defines output stream backed by byte array.
@@ -164,4 +167,4 @@ public class GridByteArrayOutputStream extends OutputStream {
     @Override public String toString() {
         return S.toString(GridByteArrayOutputStream.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataInput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataInput.java
index a0c556e..83514ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataInput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataInput.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.internal.util.io;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Extended data input.
@@ -129,4 +131,4 @@ public interface GridDataInput extends DataInput {
      * @throws IOException In case of error.
      */
     public char[] readCharArray() throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataOutput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataOutput.java
index 579c61b..01772b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataOutput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridDataOutput.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.internal.util.io;
 
-import java.io.*;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * Extended data output.
@@ -116,4 +118,4 @@ public interface GridDataOutput extends DataOutput {
      * @throws IOException In case of error.
      */
     public void writeCharArray(char[] arr) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
index d2d5b2a..7f4bcb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.internal.util.io;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Stack;
 
 /**
  * General filename and filepath manipulation utilities.
@@ -1556,4 +1560,4 @@ public class GridFilenameUtils {
         }
 
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
----------------------------------------------------------------------
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 44fab00..0473b5a 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
@@ -17,8 +17,14 @@
 
 package org.apache.ignite.internal.util.io;
 
-import java.io.*;
-import java.nio.charset.*;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.UnsupportedCharsetException;
 
 /**
  * Reads lines in a file reversely (similar to a BufferedReader, but starting at
@@ -330,4 +336,4 @@ public class GridReversedLinesFileReader implements Closeable {
             return 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
index fb498d6..00fa2c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.util.io;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import sun.misc.*;
-
-import java.io.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UTFDataFormatException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import sun.misc.Unsafe;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RECHECK;
 
 /**
  * Data input based on {@code Unsafe} operations.
@@ -600,4 +604,4 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
     @Override public String toString() {
         return S.toString(GridUnsafeDataInput.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
index e299f9e..b7c82a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.util.io;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import sun.misc.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import sun.misc.Unsafe;
 
-import java.io.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RECHECK;
 
 /**
  * Data output based on {@code Unsafe} operations.
@@ -497,4 +498,4 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
     @Override public String toString() {
         return S.toString(GridUnsafeDataOutput.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java
index 94696a0..7fc237e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.ipc;
 
-import org.apache.ignite.*;
-
-import java.io.*;
+import java.io.Closeable;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * IGFS IPC endpoint used for point-to-point communication.
@@ -46,4 +47,4 @@ public interface IpcEndpoint extends Closeable {
      * once it is not needed.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointBindException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointBindException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointBindException.java
index ab1e3cf..59970f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointBindException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointBindException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.ipc;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Represents exception occurred during IPC endpoint binding.
@@ -44,4 +44,4 @@ public class IpcEndpointBindException extends IgniteCheckedException {
     public IpcEndpointBindException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
index 06710fb..78f81cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.util.ipc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.loopback.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.ipc.loopback.IpcClientTcpEndpoint;
+import org.apache.ignite.internal.util.ipc.loopback.IpcServerTcpEndpoint;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryClientEndpoint;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint;
+import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * Igfs endpoint factory for inter-process communication.
@@ -81,4 +84,4 @@ public class IpcEndpointFactory {
     private static IpcEndpoint connectSharedMemoryEndpoint(int port, IgniteLogger log) throws IgniteCheckedException {
         return new IpcSharedMemoryClientEndpoint(port, log);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointType.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointType.java
index 6636d94..62acdd3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointType.java
@@ -26,4 +26,4 @@ public enum IpcEndpointType {
 
     /** Shared memory region. Supported on POSIX-compliant OSes. */
     SHARED_MEMORY
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcServerEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcServerEndpoint.java
index ec13308..b0fe796 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcServerEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcServerEndpoint.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.ipc;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Closeable;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * IPC server endpoint that is capable for client connections accepting.
@@ -70,4 +69,4 @@ public interface IpcServerEndpoint extends Closeable {
      * @return {@code true} if it's a management endpoint.
      */
     public boolean isManagement();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
index 0a5d4fa..e732a79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
@@ -17,15 +17,26 @@
 
 package org.apache.ignite.internal.util.ipc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilterAdapter;
+import org.apache.ignite.internal.util.nio.GridNioFilterChain;
+import org.apache.ignite.internal.util.nio.GridNioFinishedFuture;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioMetricsListener;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.GridNioSessionImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
 
 /**
  * Allows to re-use existing {@link GridNioFilter}s on IPC (specifically shared memory IPC)
@@ -244,4 +255,4 @@ public class IpcToNioAdapter<T> {
             proceedSessionWriteTimeout(ses);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcClientTcpEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcClientTcpEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcClientTcpEndpoint.java
index ab787b6..7f3cd46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcClientTcpEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcClientTcpEndpoint.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.util.ipc.loopback;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Loopback IPC endpoint based on socket.
@@ -84,4 +86,4 @@ public class IpcClientTcpEndpoint implements IpcEndpoint {
     @Override public void close() {
         U.closeQuiet(clientSock);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
index 7a4cc69..81bdd1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.internal.util.ipc.loopback;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.ipc.IpcEndpointBindException;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * Server loopback IPC endpoint.
@@ -176,4 +181,4 @@ public class IpcServerTcpEndpoint implements IpcServerEndpoint {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException.java
index 10aea80..7bef711 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Thrown when IPC runs out of system resources (for example, no more free shared memory is
@@ -56,4 +56,4 @@ public class IpcOutOfSystemResourcesException extends IgniteCheckedException {
     public IpcOutOfSystemResourcesException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
index a4f7804..9d1fc6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
@@ -17,12 +17,19 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * IPC endpoint based on shared memory space.
@@ -334,4 +341,4 @@ public class IpcSharedMemoryClientEndpoint implements IpcEndpoint {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
index c187dbc..19f0b35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
 /**
  *
@@ -64,4 +67,4 @@ public class IpcSharedMemoryInitRequest implements Externalizable {
     @Override public String toString() {
         return "IpcSharedMemoryInitRequest [pid=" + pid + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
index 9f2ed24..0d0a749 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -168,4 +170,4 @@ public class IpcSharedMemoryInitResponse implements Externalizable {
             ", pid=" + pid +
             ", size=" + size + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInputStream.java
index 0909da0..883e9a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInputStream.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -96,4 +96,4 @@ public class IpcSharedMemoryInputStream extends InputStream {
     @Override public String toString() {
         return S.toString(IpcSharedMemoryInputStream.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index d4ae147..2771d28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.channels.*;
-import java.security.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.net.URL;
+import java.nio.channels.FileLock;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
 
 /**
  * Shared memory native loader.
@@ -406,4 +413,4 @@ public class IpcSharedMemoryNativeLoader {
             srcIS.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException.java
index f0c3f53..2b9d506 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Thrown when IPC operation (such as {@link IpcSharedMemorySpace#wait(long)})
@@ -56,4 +56,4 @@ public class IpcSharedMemoryOperationTimedoutException extends IgniteCheckedExce
     public IpcSharedMemoryOperationTimedoutException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOutputStream.java
index eb85fc1..8812126 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOutputStream.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -77,4 +77,4 @@ public class IpcSharedMemoryOutputStream extends OutputStream {
     @Override public String toString() {
         return S.toString(IpcSharedMemoryOutputStream.class, this);
     }
-}
+}
\ No newline at end of file


[10/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------
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 8a397ce..4115a6d 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
@@ -17,27 +17,48 @@
 
 package org.apache.ignite.spi.collision.jobstealing;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 
 /**
  * Collision SPI that supports job stealing from over-utilized nodes to
@@ -1022,4 +1043,4 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi
         }
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
index 518fd38..9c49f70 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.spi.collision.jobstealing;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Map;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management MBean for job stealing based collision SPI.
@@ -190,4 +189,4 @@ public interface JobStealingCollisionSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Node attributes to enable job stealing for.")
     public Map<String, ? extends Serializable> getStealingAttributes();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
index 77d650b..9aad93d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi.collision.jobstealing;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation disables job stealing if corresponding feature is configured.
@@ -40,4 +44,4 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE})
 public @interface JobStealingDisabled {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
index 8b95149..637c12b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.spi.collision.jobstealing;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Job stealing request.
@@ -112,4 +113,4 @@ public class JobStealingRequest implements Message {
     @Override public String toString() {
         return S.toString(JobStealingRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
index 76ca6d1..2586d6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
@@ -17,10 +17,15 @@
 
 package org.apache.ignite.spi.collision.noop;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation of {@link org.apache.ignite.spi.collision.CollisionSpi}. This is default implementation
@@ -57,4 +62,4 @@ public class NoopCollisionSpi extends IgniteSpiAdapter implements CollisionSpi {
     @Override public String toString() {
         return S.toString(NoopCollisionSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
----------------------------------------------------------------------
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 24da2f9..feaaec6 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
@@ -17,16 +17,31 @@
 
 package org.apache.ignite.spi.collision.priorityqueue;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
 
 /**
  * This class provides implementation for Collision SPI based on priority queue. Jobs are first ordered
@@ -615,4 +630,4 @@ public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements Colli
             return originalIdx;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
index 85f3322..b7f8ba1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.collision.priorityqueue;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides access to the priority queue collision SPI configuration.
@@ -159,4 +159,4 @@ public interface PriorityQueueCollisionSpiMBean extends IgniteSpiManagementMBean
      */
     @MXBeanDescription("Flag indicating whether job starvation prevention is enabled.")
     public void setStarvationPreventionEnabled(boolean preventStarvation);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
index 3a76ad5..9b9ee79 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.communication;
 
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Listener SPI notifies IO manager with.
@@ -45,4 +44,4 @@ public interface CommunicationListener<T extends Serializable> {
      * @param nodeId Node ID.
      */
     public void onDisconnected(UUID nodeId);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
index ce9c5b0..06293de 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.spi.communication;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Communication SPI is responsible for data exchange between nodes.
@@ -109,4 +109,4 @@ public interface CommunicationSpi<T extends Serializable> extends IgniteSpi {
      * @param lsnr Listener to set or {@code null} to unset the listener.
      */
     public void setListener(@Nullable CommunicationListener<T> lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
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 4022cf6..2cbd0f6 100644
--- 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
@@ -17,42 +17,117 @@
 
 package org.apache.ignite.spi.communication.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.nio.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.spi.AbstractInterruptibleChannel;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.AddressResolver;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.GridConcurrentFactory;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.ipc.IpcToNioAdapter;
+import org.apache.ignite.internal.util.ipc.shmem.IpcOutOfSystemResourcesException;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint;
+import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
+import org.apache.ignite.internal.util.nio.GridCommunicationClient;
+import org.apache.ignite.internal.util.nio.GridConnectionBytesVerifyFilter;
+import org.apache.ignite.internal.util.nio.GridDirectParser;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioMessageTracker;
+import org.apache.ignite.internal.util.nio.GridNioMetricsListener;
+import org.apache.ignite.internal.util.nio.GridNioRecoveryDescriptor;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey;
+import org.apache.ignite.internal.util.nio.GridShmemCommunicationClient;
+import org.apache.ignite.internal.util.nio.GridTcpNioCommunicationClient;
+import org.apache.ignite.internal.util.nio.ssl.BlockingSslHandler;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgnitePortProtocol;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiOperationTimeoutException;
+import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.IgniteSpiTimeoutObject;
+import org.apache.ignite.spi.communication.CommunicationListener;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 
 /**
  * <tt>TcpCommunicationSpi</tt> is default communication SPI which uses
@@ -3567,4 +3642,4 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
             lock.readUnlock();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
index 067ca41..a785482 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.communication.tcp;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * MBean provide access to TCP-based communication SPI.
@@ -287,4 +287,4 @@ public interface TcpCommunicationSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Slow client queue limit.")
     public int getSlowClientQueueLimit();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
index e86f086..3ae24b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
@@ -28,4 +28,4 @@ public interface DeploymentListener {
      * @param ldr Registered class loader.
      */
     public void onUnregistered(ClassLoader ldr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResource.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResource.java
index f11a227..63c4685 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResource.java
@@ -42,4 +42,4 @@ public interface DeploymentResource {
      * @return Resource class loader.
      */
     public ClassLoader getClassLoader();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
index 02db6c8..85e5cb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.deployment;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Simple adapter for {@link DeploymentResource} interface.
@@ -92,4 +92,4 @@ public class DeploymentResourceAdapter implements DeploymentResource {
     @Override public String toString() {
         return S.toString(DeploymentResourceAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
index c7b2107..7a1f709 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.spi.deployment;
 
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid deployment SPI is in charge of deploying tasks and classes from different
@@ -103,4 +104,4 @@ public interface DeploymentSpi extends IgniteSpi {
      * @param lsnr Listener for deployment events. {@code null} to unset the listener.
      */
     public void setListener(@Nullable DeploymentListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/IgnoreIfPeerClassLoadingDisabled.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/IgnoreIfPeerClassLoadingDisabled.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/IgnoreIfPeerClassLoadingDisabled.java
index 6a161aa..d52c13b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/IgnoreIfPeerClassLoadingDisabled.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/IgnoreIfPeerClassLoadingDisabled.java
@@ -17,7 +17,12 @@
 
 package org.apache.ignite.spi.deployment;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation is for all implementations of {@link DeploymentSpi} that may be
@@ -30,4 +35,4 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE})
 public @interface IgnoreIfPeerClassLoadingDisabled {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
index 11a7824..68ef178 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
@@ -17,21 +17,33 @@
 
 package org.apache.ignite.spi.deployment.local;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.deployment.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.internal.util.GridAnnotationsCache;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.deployment.DeploymentListener;
+import org.apache.ignite.spi.deployment.DeploymentResource;
+import org.apache.ignite.spi.deployment.DeploymentResourceAdapter;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.spi.deployment.IgnoreIfPeerClassLoadingDisabled;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedHashMap;
 
 /**
  * Local deployment SPI that implements only within VM deployment on local
@@ -386,4 +398,4 @@ public class LocalDeploymentSpi extends IgniteSpiAdapter implements DeploymentSp
     @Override public String toString() {
         return S.toString(LocalDeploymentSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
index c5ae661..38149d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.deployment.local;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management MBean for {@link LocalDeploymentSpi} SPI.
@@ -26,4 +26,4 @@ import org.apache.ignite.spi.*;
 @MXBeanDescription("MBean that provides access to local deployment SPI configuration.")
 public interface LocalDeploymentSpiMBean extends IgniteSpiManagementMBean {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
index c2bdc53..54741fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.spi.discovery;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 
 /**
  * Provides metrics to discovery SPI. It is responsibility of discovery SPI
@@ -46,4 +45,4 @@ public interface DiscoveryMetricsProvider {
      * @return metrics data about all caches on local node.
      */
     public Map<Integer, CacheMetrics> cacheMetrics();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index 11a18b9..612c1f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.spi.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid discovery SPI allows to discover remote nodes in grid.
@@ -162,4 +164,4 @@ public interface DiscoverySpi extends IgniteSpi {
      * @throws IllegalStateException If discovery SPI has not started.
      */
     public boolean isClientMode() throws IllegalStateException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
index 15e943b..373c121 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.discovery;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message to send across ring.
@@ -37,4 +36,4 @@ public interface DiscoverySpiCustomMessage extends Serializable {
      * @return {@code true} if message can be modified during listener notification. Changes will be send to next nodes.
      */
     public boolean isMutable();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
----------------------------------------------------------------------
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 038ea59..e591470 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
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.spi.discovery;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Handler for initial data exchange between Ignite nodes. Data exchange
@@ -44,4 +45,4 @@ public interface DiscoverySpiDataExchange {
      * @param data Collection of discovery data objects from different components.
      */
     public void onExchange(UUID joiningNodeId, UUID nodeId, Map<Integer, Serializable> data);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiHistorySupport.java
----------------------------------------------------------------------
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 c76d994..8d24646 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
@@ -17,7 +17,12 @@
 
 package org.apache.ignite.spi.discovery;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation is for all implementations of {@link DiscoverySpi} that support
@@ -33,4 +38,4 @@ public @interface DiscoverySpiHistorySupport {
      */
     @SuppressWarnings({"JavaDoc"})
     public boolean value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java
index f46869d..3768cdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.spi.discovery;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Listener for grid node discovery events. See
@@ -47,4 +47,4 @@ public interface DiscoverySpiListener {
         Collection<ClusterNode> topSnapshot,
         @Nullable Map<Long, Collection<ClusterNode>> topHist,
         @Nullable DiscoverySpiCustomMessage data);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
index 70dc572..254c4a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi.discovery;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.security.SecurityContext;
+import org.apache.ignite.plugin.security.SecurityCredentials;
 
 /**
  * Node authenticator.
@@ -44,4 +44,4 @@ public interface DiscoverySpiNodeAuthenticator {
      *      coordinator should do the authentication.
      */
     public boolean isGlobalNodeAuthentication();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java
----------------------------------------------------------------------
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 c35b525..c03bd2b 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
@@ -17,7 +17,12 @@
 
 package org.apache.ignite.spi.discovery;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation is for all implementations of {@link DiscoverySpi} that support
@@ -44,4 +49,4 @@ public @interface DiscoverySpiOrderSupport {
      */
     @SuppressWarnings({"JavaDoc"})
     public boolean value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 5e81a3e..e4c29db 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -17,33 +17,100 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.events.DiscoveryCustomEvent.*;
-import static org.apache.ignite.spi.discovery.tcp.ClientImpl.State.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Queue;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.apache.ignite.spi.discovery.DiscoverySpiListener;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_NODE_SEGMENTED;
+import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
+import static org.apache.ignite.spi.discovery.tcp.ClientImpl.State.CONNECTED;
+import static org.apache.ignite.spi.discovery.tcp.ClientImpl.State.DISCONNECTED;
+import static org.apache.ignite.spi.discovery.tcp.ClientImpl.State.SEGMENTED;
+import static org.apache.ignite.spi.discovery.tcp.ClientImpl.State.STARTING;
+import static org.apache.ignite.spi.discovery.tcp.ClientImpl.State.STOPPED;
 
 /**
  *
@@ -2010,4 +2077,4 @@ class ClientImpl extends TcpDiscoveryImpl {
         /** */
         STOPPED
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 6c70eb1..3e50b94 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -17,40 +17,130 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.events.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.spi.IgnitePortProtocol.*;
-import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*;
-import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.processors.security.SecurityContext;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.security.SecurityCredentials;
+import org.apache.ignite.plugin.security.SecurityPermissionSet;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.apache.ignite.spi.discovery.DiscoverySpiListener;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRedirectToClient;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_NODE_SEGMENTED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER;
+import static org.apache.ignite.spi.IgnitePortProtocol.TCP;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.AUTH_FAILED;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.CHECK_FAILED;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.CONNECTED;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.CONNECTING;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.DISCONNECTED;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.DISCONNECTING;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.DUPLICATE_ID;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.LEFT;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.LOOPBACK_PROBLEM;
+import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.STOPPING;
+import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage.STATUS_OK;
+import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage.STATUS_RECON;
 
 /**
  *
@@ -5203,4 +5293,4 @@ class ServerImpl extends TcpDiscoveryImpl {
             this.sock = sock;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 14d037d..e5be530 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -17,19 +17,27 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.net.InetSocketAddress;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -305,4 +313,4 @@ abstract class TcpDiscoveryImpl {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
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 e683dad..06ddd0c 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
@@ -17,35 +17,85 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocketFactory;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAuthenticationException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.AddressResolver;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiOperationTimeoutException;
+import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
+import org.apache.ignite.spi.IgniteSpiTimeoutObject;
+import org.apache.ignite.spi.IgniteSpiVersionCheckException;
+import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange;
+import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport;
+import org.apache.ignite.spi.discovery.DiscoverySpiListener;
+import org.apache.ignite.spi.discovery.DiscoverySpiNodeAuthenticator;
+import org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryStatistics;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryEnsureDelivery;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Discovery SPI implementation that uses TCP/IP for node discovery.
@@ -1988,4 +2038,4 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
             return S.toString(SocketTimeoutObject.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
index f338fab..1427929 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Management bean for {@link TcpDiscoverySpi}.
@@ -281,4 +281,4 @@ public interface TcpDiscoverySpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Client mode.")
     public boolean isClientMode() throws IllegalStateException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index 135dc59..362fa2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -17,23 +17,37 @@
 
 package org.apache.ignite.spi.discovery.tcp.internal;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.processors.cache.CacheMetricsSnapshot;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTENT_ID;
 
 /**
  * Node for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}.
@@ -592,4 +606,4 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
     @Override public String toString() {
         return S.toString(TcpDiscoveryNode.class, this, "isClient", isClient());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
index 2422e14..2b17696 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
@@ -17,15 +17,28 @@
 
 package org.apache.ignite.spi.discovery.tcp.internal;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.PN;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenient way to represent topology for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}
@@ -668,4 +681,4 @@ public class TcpDiscoveryNodesRing {
             rwLock.readLock().unlock();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoverySpiState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoverySpiState.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoverySpiState.java
index 161c6cf..6329aee 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoverySpiState.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoverySpiState.java
@@ -50,4 +50,4 @@ public enum TcpDiscoverySpiState {
 
     /** */
     LOOPBACK_PROBLEM
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
index 377d8a8..f6232ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.spi.discovery.tcp.internal;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.util.GridBoundedLinkedHashMap;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage;
 
 /**
  * Statistics for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}.
@@ -650,4 +654,4 @@ public class TcpDiscoveryStatistics {
     @Override public synchronized String toString() {
         return S.toString(TcpDiscoveryStatistics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
index 95758e5..1e112c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder;
 
-import org.apache.ignite.spi.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
 
 /**
  * IP finder interface for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}.
@@ -95,4 +95,4 @@ public interface TcpDiscoveryIpFinder {
      * Closes this IP finder and releases any system resources associated with it.
      */
     public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
index 4d62ff2..0e0aed5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 
 /**
  * IP finder interface implementation adapter.
@@ -114,4 +115,4 @@ public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinde
     protected IgniteSpiContext spiContext() {
         return spiCtx;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
----------------------------------------------------------------------
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 ddc3c4b..69fa3f8 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
@@ -17,23 +17,29 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-
-import javax.sql.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.sql.Connection.*;
+import java.net.InetSocketAddress;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
+
+import static java.sql.Connection.TRANSACTION_READ_COMMITTED;
 
 /**
  * JDBC-based IP finder.
@@ -366,4 +372,4 @@ public class TcpDiscoveryJdbcIpFinder extends TcpDiscoveryIpFinderAdapter {
     @Override public String toString() {
         return S.toString(TcpDiscoveryJdbcIpFinder.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index 2a07879..d19d08b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -17,25 +17,41 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.multicast;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.spi.IgnitePortProtocol.*;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.MulticastSocket;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
+import static org.apache.ignite.spi.IgnitePortProtocol.UDP;
 
 /**
  * Multicast-based IP finder.
@@ -848,4 +864,4 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
             }
         }
     }
-}
+}
\ No newline at end of file


[29/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 1a90de9..414a152 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -17,36 +17,69 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.events.DiscoveryCustomEvent.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cache.affinity.AffinityCentralizedFunction;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.DynamicCacheChangeRequest;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridClientPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAssignmentFetchFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
 
 /**
  * Future for exchanging partition maps.
@@ -1538,4 +1571,4 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
             "remaining", remaining(),
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index c285215..b91a2de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -17,19 +17,21 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Information about partitions of all nodes in topology.
@@ -198,4 +200,4 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa
         return S.toString(GridDhtPartitionsFullMessage.class, this, "partCnt", parts != null ? parts.size() : 0,
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index d9633d2..9b6dcf7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Information about partitions of a single node.
@@ -187,4 +188,4 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes
     @Override public String toString() {
         return S.toString(GridDhtPartitionsSingleMessage.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index 0b443f8..a4106af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Request for single partition info.
@@ -88,4 +88,4 @@ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMes
     @Override public String toString() {
         return S.toString(GridDhtPartitionsSingleRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index a43ebe2..501d624 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -17,32 +17,50 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.util.GridConcurrentFactory.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCachePreloaderAdapter;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAssignmentFetchFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.util.GridAtomicLong;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_PART_UNLOADED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.AFFINITY_POOL;
+import static org.apache.ignite.internal.util.GridConcurrentFactory.newMap;
 
 /**
  * DHT cache preloader.
@@ -587,4 +605,4 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
          */
         protected abstract void onMessage(ClusterNode node, M msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
index 2f6ef6f..3583967 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Partition to node assignments.
@@ -70,4 +69,3 @@ public class GridDhtPreloaderAssignments extends ConcurrentHashMap<ClusterNode,
             "super", super.toString());
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
index 745ca17..1559a91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Cache object and version.
@@ -166,4 +169,4 @@ public class CacheVersionedValue implements Message {
     @Override public String toString() {
         return S.toString(CacheVersionedValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 2bf5365..82054d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -17,30 +17,55 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheUpdateAtomicResult;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridCircularBuffer;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
 
 /**
  * Near cache for atomic cache.
@@ -659,4 +684,4 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
             Thread.currentThread().interrupt();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 845be38..01c3e2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -17,25 +17,57 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.UUID;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheClearAllRunnable;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheEntrySet;
+import org.apache.ignite.internal.processors.cache.GridCacheKeySet;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
+import org.apache.ignite.internal.processors.cache.GridCachePreloader;
+import org.apache.ignite.internal.processors.cache.GridCacheValueCollection;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Common logic for near caches.
@@ -630,4 +662,4 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
     @Override public String toString() {
         return S.toString(GridNearCacheAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
index 450508d..675ea8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheClearAllRunnable;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Runnable for {@link GridCacheAdapter#clearLocally()} routine for near cache.
@@ -60,4 +61,4 @@ public class GridNearCacheClearAllRunnable<K, V> extends GridCacheClearAllRunnab
     @Override public String toString() {
         return S.toString(GridNearCacheClearAllRunnable.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
index 6f4f15e..2ae03d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
@@ -17,22 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
 
 /**
  * Near cache entry.
@@ -671,4 +677,4 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry {
     @Override public synchronized String toString() {
         return S.toString(GridNearCacheEntry.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 951fddf..4de8294 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -17,29 +17,58 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridFutureRemapTimeoutObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NEAR_GET_MAX_REMAPS;
+import static org.apache.ignite.IgniteSystemProperties.getInteger;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
 
 /**
  *
@@ -883,4 +912,4 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
             return S.toString(MiniFuture.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
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 4b52e69..9bd2a68 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
@@ -17,21 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionable;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Get request.
@@ -479,4 +490,4 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
     @Override public String toString() {
         return S.toString(GridNearGetRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
index 25a6969..3276377 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -17,21 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionable;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Get response.
@@ -348,4 +356,4 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe
     @Override public String toString() {
         return S.toString(GridNearGetResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 2815194..629dbb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -17,30 +17,58 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheLockTimeoutException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
 
 /**
  * Cache lock future.
@@ -1528,4 +1556,4 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
             return S.toString(MiniFuture.class, this, "node", node.id(), "super", super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockMapping.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockMapping.java
index 51000ef..b4f689c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockMapping.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Key-to node mapping.
@@ -114,4 +115,4 @@ public class GridNearLockMapping {
     public String toString() {
         return S.toString(GridNearLockMapping.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 4440e89..23a8b1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -17,21 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Near cache lock request.
@@ -595,4 +603,4 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
         return S.toString(GridNearLockRequest.class, this, "filter", Arrays.toString(filter),
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index 110501b..581061c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -17,21 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Near cache lock response.
@@ -324,4 +325,4 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
     @Override public String toString() {
         return S.toString(GridNearLockResponse.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffHeapCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffHeapCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffHeapCacheEntry.java
index 25eb869..c3f3e02 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffHeapCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffHeapCacheEntry.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 
 /**
  * Near cache entry for off-heap tiered or off-heap values modes.
@@ -57,4 +60,4 @@ public class GridNearOffHeapCacheEntry extends GridNearCacheEntry {
     @Override protected void offHeapPointer(long valPtr) {
         this.valPtr = valPtr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 2d6b2a4..e825e70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -17,32 +17,52 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionOptimisticException;
+import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
 
 /**
  *
@@ -832,4 +852,4 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd
             return S.toString(MiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 9ce5bd5..63f1f79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -17,26 +17,38 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
 
 /**
  *
@@ -354,4 +366,4 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
             return S.toString(MiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index a1f1383..e70c864 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -17,27 +17,47 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCache;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
 
 /**
  * Near cache for transactional cache.
@@ -720,4 +740,4 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
     @Override public String toString() {
         return S.toString(GridNearTransactionalCache.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 6e1195f..f29bd28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -17,29 +17,39 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
 
 /**
  *
@@ -501,4 +511,4 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
             return S.toString(MiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 5730357..5e5a222 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -17,17 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Near transaction finish request.
@@ -288,4 +290,4 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
     @Override public String toString() {
         return GridToStringBuilder.toString(GridNearTxFinishRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index 84f4f46..cec7d73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -17,18 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Reply for synchronous phase 2.
@@ -205,4 +205,4 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
     @Override public String toString() {
         return S.toString(GridNearTxFinishResponse.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file


[25/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
index 941a1fa..1557806 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.clock;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Version for time delta snapshot.
@@ -182,4 +186,4 @@ public class GridClockDeltaVersion implements Message, Comparable<GridClockDelta
     @Override public String toString() {
         return S.toString(GridClockDeltaVersion.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
index 90b8000..99dc817 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.clock;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Time server message.
@@ -168,4 +168,4 @@ public class GridClockMessage {
     @Override public String toString() {
         return S.toString(GridClockMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
index a835da8..b357e65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.processors.clock;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.thread.*;
-
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.thread.IgniteThread;
 
 /**
  * Time server that enables time synchronization between nodes.
@@ -214,4 +218,4 @@ public class GridClockServer {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
index 65f746a..ef7dc06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
@@ -27,4 +27,4 @@ public interface GridClockSource {
      * @return Current time in milliseconds.
      */
     public long currentTimeMillis();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
index 69b07b3..21d3fb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
@@ -17,26 +17,36 @@
 
 package org.apache.ignite.internal.processors.clock;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.thread.*;
-
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.thread.IgniteThread;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_TIME_SYNC;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_HOST;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_PORT;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
 
 /**
  * Time synchronization processor.
@@ -450,4 +460,4 @@ public class GridClockSyncProcessor extends GridProcessorAdapter {
                 curr.onNodeLeft(nodeId);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
index e10d816..77bc3eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
@@ -25,4 +25,4 @@ public class GridJvmClockSource implements GridClockSource {
     @Override public long currentTimeMillis() {
         return System.currentTimeMillis();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/AffinityTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/AffinityTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/AffinityTask.java
index 1b32444..da00f01 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/AffinityTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/AffinityTask.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.closure;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity mapped task.
@@ -32,4 +32,4 @@ public interface AffinityTask {
      * @return Affinity cache name.
      */
     @Nullable public String affinityCacheName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosurePolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosurePolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosurePolicy.java
index 69b2ac9..c17cedd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosurePolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosurePolicy.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.closure;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This enumeration defines different types of closure
@@ -48,4 +48,4 @@ public enum GridClosurePolicy {
     @Nullable public static GridClosurePolicy fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
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 21bfc11..b4d79d9 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
@@ -17,30 +17,60 @@
 
 package org.apache.ignite.internal.processors.closure;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobMasterLeaveAware;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.internal.ComputeTaskInternalFuture;
+import org.apache.ignite.internal.GridClosureCallMode;
+import org.apache.ignite.internal.GridInternalWrapper;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.resource.GridNoImplicitInjection;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.lang.GridPlainCallable;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.internal.util.worker.GridWorkerFuture;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.resources.LoadBalancerResource;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.REDUCE;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID;
 
 /**
  *
@@ -1908,4 +1938,4 @@ public class GridClosureProcessor extends GridProcessorAdapter {
             return S.toString(C4MLA.class, this, super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridPeerDeployAwareTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridPeerDeployAwareTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridPeerDeployAwareTaskAdapter.java
index 79768a7..30fff66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridPeerDeployAwareTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridPeerDeployAwareTaskAdapter.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.closure;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Peer deployment aware task adapter.
@@ -57,4 +57,4 @@ public abstract class GridPeerDeployAwareTaskAdapter<T, R> extends ComputeTaskAd
 
         return pda.classLoader();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
index 1f5589f..a72615c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cluster;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.cluster.IgniteClusterImpl;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  *
@@ -54,4 +54,4 @@ public class ClusterProcessor extends GridProcessorAdapter {
 
         return fut != null ? fut : new IgniteFinishedFutureImpl<>();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
index 91768a6..d6e25f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  *
@@ -60,4 +59,4 @@ public abstract class AbstractContinuousMessage implements DiscoveryCustomMessag
     @Override public boolean isMutable() {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
index 79020da..30e596a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Continuous routine handler.
@@ -129,4 +129,4 @@ public interface GridContinuousHandler extends Externalizable, Cloneable {
      * @return Cache name if this is a continuous query handler.
      */
     public String cacheName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
index e521a0c..0ffcd3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.MSG_EVT_ACK;
 
 /**
  * Continuous processor message.
@@ -265,4 +269,4 @@ public class GridContinuousMessage implements Message {
     @Override public String toString() {
         return S.toString(GridContinuousMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessageType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessageType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessageType.java
index 1b79430..6190533 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessageType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessageType.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Continuous processor message types.
@@ -41,4 +41,4 @@ enum GridContinuousMessageType {
     @Nullable public static GridContinuousMessageType fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index a360e35..3dcfff8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -17,39 +17,67 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.managers.discovery.CustomEventListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_SEGMENTED;
+import static org.apache.ignite.internal.GridTopic.TOPIC_CONTINUOUS;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.MSG_EVT_ACK;
+import static org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.MSG_EVT_NOTIFICATION;
 
 /**
  * Processor for continuous routines.
@@ -1596,4 +1624,4 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
             return S.toString(SyncMessageAckFuture.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRequestData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRequestData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRequestData.java
index c721d44..cdfe0e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRequestData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRequestData.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Start request data.
@@ -264,4 +267,4 @@ class StartRequestData implements Externalizable {
     @Override public String toString() {
         return S.toString(StartRequestData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
index 5743dd4..bd4aae3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -60,4 +61,4 @@ public class StartRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
     @Override public String toString() {
         return S.toString(StartRoutineAckDiscoveryMessage.class, this, "routineId", routineId());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
index cff6239..892adac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -82,4 +83,4 @@ public class StartRoutineDiscoveryMessage extends AbstractContinuousMessage {
     @Override public String toString() {
         return S.toString(StartRoutineDiscoveryMessage.class, this, "routineId", routineId());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
index 256791a..e6305c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -46,4 +45,4 @@ public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
     @Override public String toString() {
         return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
index 9dc2227..30d12d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.continuous;
 
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -46,4 +45,4 @@ public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage {
     @Override public String toString() {
         return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index 4f75e0c..5150d83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -17,27 +17,31 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.stream.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.DelayQueue;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.stream.StreamReceiver;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.GridTopic.TOPIC_DATASTREAM;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
 
 /**
  *
@@ -344,4 +348,4 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter {
         X.println(">>> Data streamer processor memory stats [grid=" + ctx.gridName() + ']');
         X.println(">>>   ldrsSize: " + ldrs.size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index dc9d025..0cd99c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.stream.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.stream.StreamReceiver;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Bundled factory for cache updaters.
@@ -203,4 +209,4 @@ public class DataStreamerCacheUpdaters {
     public static interface InternalUpdater {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
index 7eadb04..982b691 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -167,4 +170,4 @@ public class DataStreamerEntry implements Map.Entry<KeyCacheObject, CacheObject>
     @Override public String toString() {
         return S.toString(DataStreamerEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
index 05e3ea4..ebd5247 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data streamer future.
@@ -57,4 +57,4 @@ class DataStreamerFuture extends GridFutureAdapter<Object> {
     @Override public String toString() {
         return S.toString(DataStreamerFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 5fae676..b5d9a7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -17,43 +17,92 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.stream.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.DelayQueue;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.CacheException;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
+import org.apache.ignite.internal.processors.cache.IgniteCacheFutureImpl;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.stream.StreamReceiver;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_DATASTREAM;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
 
 /**
  * Data streamer implementation.
@@ -1558,4 +1607,4 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
index fa08b7b..c1a1528 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -478,4 +484,4 @@ public class DataStreamerRequest implements Message {
     @Override public byte fieldsCount() {
         return 14;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
index e753e32..4429e56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -163,4 +164,4 @@ public class DataStreamerResponse implements Message {
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
index 9e0703a..42084a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.processors.datastreamer;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.stream.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.util.lang.GridPlainCallable;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.stream.StreamReceiver;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job to put entries to cache on affinity node.
@@ -157,4 +160,4 @@ class DataStreamerUpdateJob implements GridPlainCallable<Object> {
 
         ctx.security().authorize(cacheName, perm, null);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresCacheKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresCacheKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresCacheKey.java
index 26e1ac7..c7676a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresCacheKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresCacheKey.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
 
 /**
  * Internal key for data structures processor.
@@ -59,4 +61,4 @@ public class CacheDataStructuresCacheKey implements GridCacheInternal, Externali
     @Override public String toString() {
         return "CacheDataStructuresCacheKey []";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresConfigurationKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresConfigurationKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresConfigurationKey.java
index 6a5f25c..f331811 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresConfigurationKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresConfigurationKey.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
 
 /**
  * Key used to store in utility cache information about all created data structures.
@@ -59,4 +61,4 @@ public class CacheDataStructuresConfigurationKey implements GridCacheInternal, E
     @Override public String toString() {
         return "CacheDataStructuresConfigurationKey []";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 57b16f0..0025f6bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -17,33 +17,80 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.event.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryListenerException;
+import javax.cache.event.CacheEntryUpdatedListener;
+import javax.cache.event.EventType;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteAtomicReference;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCountDownLatch;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.configuration.AtomicConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheType;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.lang.IgniteClosureX;
+import org.apache.ignite.internal.util.lang.IgniteInClosureX;
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.GPR;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.ATOMIC_LONG;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.ATOMIC_REF;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.ATOMIC_SEQ;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.ATOMIC_STAMPED;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.COUNT_DOWN_LATCH;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.QUEUE;
+import static org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.SET;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Manager of data structures.
@@ -2013,4 +2060,4 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
             return S.toString(RemoveDataStructureProcessor.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
index 3072b7d..28f8631 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link org.apache.ignite.IgniteQueue} implementation using atomic cache.
@@ -252,4 +256,4 @@ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T> {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
index 7da8aa7..c43a72a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridBoundedLinkedHashMap;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Utility class for getting annotated values from classes.
@@ -237,4 +240,4 @@ public class GridCacheAnnotationHelper<A extends Annotation> {
             return mtds;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongEx.java
index 5809d44..7f02ec9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongEx.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteAtomicLong;
 
 /**
  * Atomic managed by cache ({@code 'Ex'} stands for external).
@@ -29,4 +29,4 @@ public interface GridCacheAtomicLongEx extends GridCacheRemovable, IgniteAtomicL
      * @return Atomic long key.
      */
     public GridCacheInternalKey key();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
index 1d6e735..3572409 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -17,21 +17,28 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
-import static org.apache.ignite.internal.util.typedef.internal.CU.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache atomic long implementation.
@@ -577,4 +584,4 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
     @Override public String toString() {
         return S.toString(GridCacheAtomicLongImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongValue.java
index 43c7856..42e43b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongValue.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Atomic long value.
@@ -81,4 +83,4 @@ public final class GridCacheAtomicLongValue implements GridCacheInternal, Extern
     @Override public String toString() {
         return S.toString(GridCacheAtomicLongValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceEx.java
index 5759217..994e2d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceEx.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteAtomicReference;
 
 /**
  * Atomic reference managed by cache ({@code 'Ex'} stands for external).
@@ -29,4 +29,4 @@ public interface GridCacheAtomicReferenceEx<T> extends GridCacheRemovable, Ignit
      * @return Atomic reference key.
      */
     public GridCacheInternalKey key();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index f740c4e..b8794ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -17,19 +17,29 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Cache atomic reference implementation.
@@ -361,4 +371,4 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
     @Override public String toString() {
         return S.toString(GridCacheAtomicReferenceImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
index 596534f..8495df7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Atomic reference value.
@@ -90,4 +92,4 @@ public final class GridCacheAtomicReferenceValue<T> implements GridCacheInternal
     @Override public String toString() {
         return S.toString(GridCacheAtomicReferenceValue.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceEx.java
index 732031e..1edcb81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceEx.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.datastructures;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteAtomicSequence;
 
 /**
  * Sequence managed by cache ({@code 'Ex'} stands for external.
@@ -29,4 +29,4 @@ public interface GridCacheAtomicSequenceEx extends GridCacheRemovable, IgniteAto
      * @return Sequence key.
      */
     public GridCacheInternalKey key();
-}
+}
\ No newline at end of file


[32/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index 78bd0eb..1ff4575 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -17,29 +17,59 @@
 
 package org.apache.ignite.internal.processors.cache.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.event.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.internal.GridClosureCallMode.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager;
+import org.apache.ignite.internal.processors.cache.GridCacheGateway;
+import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
+import org.apache.ignite.internal.processors.datastructures.GridAtomicCacheQueueImpl;
+import org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeader;
+import org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeaderKey;
+import org.apache.ignite.internal.processors.datastructures.GridCacheQueueProxy;
+import org.apache.ignite.internal.processors.datastructures.GridCacheSetHeader;
+import org.apache.ignite.internal.processors.datastructures.GridCacheSetHeaderKey;
+import org.apache.ignite.internal.processors.datastructures.GridCacheSetImpl;
+import org.apache.ignite.internal.processors.datastructures.GridCacheSetItemKey;
+import org.apache.ignite.internal.processors.datastructures.GridCacheSetProxy;
+import org.apache.ignite.internal.processors.datastructures.GridTransactionalCacheQueueImpl;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
 
 /**
  *
@@ -740,4 +770,4 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter {
             return "RemoveSetCallable [setId=" + setId + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
index 573495c..46d113b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
@@ -17,13 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Committed transaction information. Contains recovery writes that will be used to set commit values
@@ -107,4 +113,4 @@ public class GridCacheCommittedTxInfo implements Externalizable {
     @Override public String toString() {
         return S.toString(GridCacheCommittedTxInfo.class, this, "recoveryWrites", recoveryWrites);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMappedVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMappedVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMappedVersion.java
index 31002bd..bf236d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMappedVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMappedVersion.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface mostly for Near to DHT version mapping.
@@ -30,4 +30,4 @@ public interface GridCacheMappedVersion {
      * @return Mapped version.
      */
     @Nullable public GridCacheVersion mappedVersion();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
index 4c98c73..c911b5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -321,4 +327,4 @@ public class GridCacheTtlUpdateRequest extends GridCacheMessage {
     @Override public String toString() {
         return S.toString(GridCacheTtlUpdateRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
index 0b351b7..1e323d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
@@ -17,17 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Synchronization structure for asynchronous waiting for near tx finish responses based on per-node per-thread
@@ -335,4 +338,4 @@ public class GridCacheTxFinishSync<K, V> {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
index 663ed90..eaaff67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
@@ -17,22 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future verifying that all remote transactions related to transaction were prepared or committed.
@@ -503,4 +509,4 @@ public class GridCacheTxRecoveryFuture extends GridCompoundIdentityFuture<Boolea
             return S.toString(MiniFuture.class, this, "done", isDone(), "err", error());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
index 07aecee..bd6cd88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Message sent to check that transactions related to transaction were prepared on remote node.
@@ -258,4 +258,4 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage {
     @Override public String toString() {
         return S.toString(GridCacheTxRecoveryRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
index 6218da6..8b9550f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Transactions recovery check response.
@@ -179,4 +179,4 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage {
     @Override public String toString() {
         return S.toString(GridCacheTxRecoveryResponse.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
index 3292583..689cc62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionable;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Base for all messages in replicated cache.
@@ -282,4 +290,4 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem
     @Override public String toString() {
         return S.toString(GridDistributedBaseMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index c5ef22f..637e51b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -17,31 +17,51 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheSwapEntry;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerCacheUpdaters;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID;
 
 /**
  * Distributed cache implementation.
@@ -406,4 +426,4 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
             return true;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index 59d75be..3fada86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -17,17 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED;
 
 /**
  * Entry for distributed (replicated/partitioned) cache.
@@ -861,4 +872,4 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry {
     @Override public synchronized String toString() {
         return S.toString(GridDistributedCacheEntry.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 8bcf813..1963894 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -17,21 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.SKIP_STORE_FLAG_MASK;
 
 /**
  * Lock request message.
@@ -543,4 +551,4 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
         return S.toString(GridDistributedLockRequest.class, this, "keysCnt", retVals.length,
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index de5eb63..cdb878d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -17,20 +17,26 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lock response message.
@@ -321,4 +327,4 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage {
         return S.toString(GridDistributedLockResponse.class, this,
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 63f7f16..fdd59be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction completion message.
@@ -426,4 +426,4 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage {
         return GridToStringBuilder.toString(GridDistributedTxFinishRequest.class, this,
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 88b8c71..2cfafc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Transaction finish response.
@@ -151,4 +151,4 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
     @Override public String toString() {
         return GridToStringBuilder.toString(GridDistributedTxFinishResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
index bd1dedf..1e78ba2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction node mapping.
@@ -322,4 +330,4 @@ public class GridDistributedTxMapping implements Externalizable {
     @Override public String toString() {
         return S.toString(GridDistributedTxMapping.class, this, "node", node.id());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 25f267d..5ba7128 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -17,20 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction prepare request for optimistic and eventually consistent
@@ -593,4 +605,4 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
         return GridToStringBuilder.toString(GridDistributedTxPrepareRequest.class, this,
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 0f74780..4264830 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Response to prepare request.
@@ -169,4 +170,4 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
         return GridToStringBuilder.toString(GridDistributedTxPrepareResponse.class, this, "err",
             err == null ? "null" : err.toString(), "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index ef5d3d9..41f9872 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -17,30 +17,65 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxRemoteEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.RELOAD;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_BACKUP;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK;
+import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
 
 /**
  * Transaction created by system implicitly on remote nodes.
@@ -767,4 +802,4 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
     @Override public String toString() {
         return GridToStringBuilder.toString(GridDistributedTxRemoteAdapter.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index a88ca6b..70c83f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Lock request message.
@@ -155,4 +159,4 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
     @Override public String toString() {
         return S.toString(GridDistributedUnlockRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridFutureRemapTimeoutObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridFutureRemapTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridFutureRemapTimeoutObject.java
index 8f3cfe5..72fdd4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridFutureRemapTimeoutObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridFutureRemapTimeoutObject.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
 
 /**
  * Future remap timeout object.
@@ -70,4 +69,4 @@ public class GridFutureRemapTimeoutObject extends GridTimeoutObjectAdapter {
     public boolean finish() {
         return finished.compareAndSet(false, true);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 000eabc..ea29b14 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
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.concurrent.TimeUnit;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Externalizable wrapper for {@link ExpiryPolicy}.
@@ -165,4 +169,4 @@ public class IgniteExternalizableExpiryPolicy implements ExpiryPolicy, Externali
     @Override public String toString() {
         return S.toString(IgniteExternalizableExpiryPolicy.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 531678e..21a7b3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -17,21 +17,37 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridAtomicLong;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.EVICTED;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
 
 /**
  * Partition topology for node which does not have any local partitions.
@@ -880,4 +896,4 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index c3025e3..6381073 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Affinity assignment request.
@@ -132,4 +132,4 @@ public class GridDhtAffinityAssignmentRequest extends GridCacheMessage {
     @Override public String toString() {
         return S.toString(GridDhtAffinityAssignmentRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 67919b3..139100f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -17,19 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Affinity assignment response.
@@ -206,4 +207,4 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage {
     @Override public String toString() {
         return S.toString(GridDhtAffinityAssignmentResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
index 7bae7f0..bb9f4ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
@@ -17,21 +17,26 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridNodeOrderComparator;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.AFFINITY_POOL;
 
 /**
  * Future that fetches affinity assignment from remote cache nodes.
@@ -195,4 +200,4 @@ public class GridDhtAssignmentFetchFuture extends GridFutureAdapter<List<List<Cl
         if (complete)
             onDone((List<List<ClusterNode>>)null);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCache.java
index 800e5c9..bc3e2a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCache.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.tostring.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheMetricsImpl;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 
 /**
  * DHT cache.
@@ -96,4 +97,4 @@ public class GridDhtCache<K, V> extends GridDhtTransactionalCacheAdapter<K, V> {
     public void near(GridNearTransactionalCache<K, V> near) {
         this.near = near;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 49fbc5b..ecacb29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -17,31 +17,70 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.io.Externalizable;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.CachePeekModes;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheClearAllRunnable;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
+import org.apache.ignite.internal.processors.cache.GridCachePreloader;
+import org.apache.ignite.internal.processors.cache.GridLoadCacheCloseablePredicate;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtDetachedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridIteratorAdapter;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.CI3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_LOAD;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
 
 /**
  * DHT cache adapter.
@@ -1135,4 +1174,4 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
             return topVer;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index 3b411b5..be2f3d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -17,22 +17,37 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMultiTxFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Replicated cache entry.
@@ -789,4 +804,4 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry {
             return S.toString(ReaderId.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
index 232bfe4..0d10a93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiClosure;
 
 /**
  * Embedded DHT future.
@@ -71,4 +71,4 @@ public class GridDhtEmbeddedFuture<A, B> extends GridEmbeddedFuture<A, B> implem
     @Override public String toString() {
         return S.toString(GridDhtEmbeddedFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
index 659c924..b5bb942 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFinishedFuture.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Finished DHT future.
@@ -49,4 +49,4 @@ public class GridDhtFinishedFuture<T> extends GridFinishedFuture<T> implements G
     @Override public String toString() {
         return S.toString(GridDhtFinishedFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFuture.java
index 9044bfb..ba0ef2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtFuture.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.internal.IgniteInternalFuture;
 
 /**
  * Keys to retry.
@@ -33,4 +32,4 @@ public interface GridDhtFuture<T> extends IgniteInternalFuture<T> {
      * @return Keys to retry because this node is no longer a primary or backup.
      */
     public Collection<Integer> invalidPartitions();
-}
+}
\ No newline at end of file


[67/82] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/master'

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-1093-2
Commit: 10e51d1665e7682f12079defa452ff5aee9f0d37
Parents: 16db330 1eded25
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 10:30:25 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 10:30:25 2015 +0300

----------------------------------------------------------------------
 idea/ignite_codeStyle.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



[42/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
----------------------------------------------------------------------
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 0fa069b..96f17b2 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
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.compute.gridify;
 
-import java.io.*;
-import java.lang.annotation.*;
+import java.io.Serializable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * {@code GridifySetToValue} annotation is the way to grid-enable existing code with specific semantics.
@@ -194,4 +198,4 @@ public @interface GridifySetToValue {
      * Refer to {@link org.apache.ignite.Ignition} for information about named grids.
      */
     String gridName() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
index 7103462..cf62936 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.compute.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeTaskAdapter;
 
 /**
  * Convenience adapter for tasks that work with {@link Gridify} annotation
@@ -36,4 +35,4 @@ public abstract class GridifyTaskAdapter<R> extends ComputeTaskAdapter<GridifyAr
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
index 47622b9..3937127 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.compute.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
 /**
  * Convenience adapter for tasks that work with {@link Gridify} annotation
@@ -36,4 +35,4 @@ public abstract class GridifyTaskSplitAdapter<R> extends ComputeTaskSplitAdapter
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
index 27f785f..a9de23d 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Convenience adapter for {@link org.apache.ignite.compute.gridify.GridifyArgument} interface. This adapter
@@ -193,4 +194,4 @@ public class GridifyArgumentAdapter implements GridifyArgument {
     @Override public String toString() {
         return S.toString(GridifyArgumentAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
index a645246..0a3ce3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
@@ -17,18 +17,38 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyJobAdapter;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoadBalancerResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.resources.TaskSessionResource;
+
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Default gridify task which simply executes a method on remote node.
@@ -229,4 +249,4 @@ public class GridifyDefaultRangeTask extends ComputeTaskAdapter<GridifyRangeArgu
 
         return inputPerNode;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
index d78de74..d04f133 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.internal.util.gridify.GridifyJobAdapter;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoadBalancerResource;
 
 /**
  * Default gridify task which simply executes a method on remote node.
@@ -109,4 +114,4 @@ public class GridifyDefaultTask extends ComputeTaskAdapter<GridifyArgument, Obje
 
         return res.getData();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
index 5d46fcf..ea03982 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.compute.gridify.GridifyInput;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.gridify.GridifyUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Convenience adapter with common methods for different aspect implementations
@@ -165,4 +170,4 @@ public class GridifySetToSetAbstractAspect {
 
         return GridifyUtils.collectionToParameter(cls, res);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
index 4241fce..9207fc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
@@ -17,16 +17,23 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.compute.gridify.GridifyInput;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.gridify.GridifyUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Convenience adapter with common methods for different aspect implementations
@@ -194,4 +201,4 @@ public class GridifySetToValueAbstractAspect {
 
         return res.iterator().next();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java b/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
index 7170dac..3ecc494 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Provides resolution between external and internal addresses. In some cases
@@ -40,4 +39,4 @@ public interface AddressResolver {
      * @throws IgniteCheckedException Thrown if any exception occurs.
      */
     public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress addr) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
index 6a7051e..6649b5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Configuration for atomic data structures.
@@ -102,4 +102,4 @@ public class AtomicConfiguration {
     @Override public String toString() {
         return S.toString(AtomicConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
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 af2bbe8..792bb28 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
@@ -17,23 +17,38 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import javax.cache.Cache;
+import javax.cache.configuration.CompleteConfiguration;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.CacheInterceptor;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cache.eviction.EvictionFilter;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines grid cache configuration. This configuration is passed to
@@ -1843,4 +1858,4 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
             return obj.getClass().equals(this.getClass());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
index 5a1ae0a..5ea5074 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Configuration for Ignite collections.
@@ -160,4 +161,4 @@ public class CollectionConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(CollectionConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
index 98753e2..88d015c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
@@ -17,15 +17,13 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.ssl.*;
-
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import javax.net.ssl.*;
-import java.net.*;
+import java.net.Socket;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.ssl.SslContextFactory;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * REST access configuration.
@@ -547,4 +545,4 @@ public class ConnectorConfiguration {
     public void setMessageInterceptor(ConnectorMessageInterceptor interceptor) {
         msgInterceptor = interceptor;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
index e11f6fa..d832374 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.configuration;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface for user-defined object interceptors.
@@ -42,4 +42,4 @@ public interface ConnectorMessageInterceptor {
      * @return Object which should be send to remote client instead of original.
      */
     @Nullable public Object onSend(Object obj);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java b/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
index 9d49a2e..7bed39c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.configuration;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid deployment mode. Deployment mode is specified at grid startup via
@@ -178,4 +178,4 @@ public enum DeploymentMode {
     @Nullable public static DeploymentMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
index d589cf7..888f927 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} configuration. More than one file system can be configured within grid.
@@ -791,4 +792,4 @@ public class FileSystemConfiguration {
     @Override public String toString() {
         return S.toString(FileSystemConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
index 3a7f877..51aa291 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlanner;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Ignite Hadoop Accelerator configuration.
@@ -173,4 +173,4 @@ public class HadoopConfiguration {
     @Override public String toString() {
         return S.toString(HadoopConfiguration.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
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 1fa1de4..3d38ed9 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
@@ -17,55 +17,63 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.util.Map;
+import java.util.UUID;
+import javax.cache.configuration.Factory;
+import javax.cache.event.CacheEntryListener;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheLoader;
+import javax.cache.processor.EntryProcessor;
+import javax.management.MBeanServer;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.services.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.spi.checkpoint.noop.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.spi.collision.noop.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.deployment.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.apache.ignite.spi.eventstorage.memory.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.spi.indexing.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.ssl.*;
-
-import javax.cache.configuration.*;
-import javax.cache.event.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import javax.cache.processor.*;
-import javax.management.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.lang.management.*;
-import java.util.*;
-
-import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.*;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.plugin.PluginConfiguration;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
+import org.apache.ignite.plugin.segmentation.SegmentationResolver;
+import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.apache.ignite.spi.collision.noop.NoopCollisionSpi;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.eventstorage.EventStorageSpi;
+import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi;
+import org.apache.ignite.spi.failover.FailoverSpi;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.spi.indexing.IndexingSpi;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
+import org.apache.ignite.ssl.SslContextFactory;
+
+import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.STOP;
 
 /**
  * This class defines grid runtime configuration. This configuration is passed to
@@ -2397,4 +2405,4 @@ public class IgniteConfiguration {
     @Override public String toString() {
         return S.toString(IgniteConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
index af73737..e7fd6b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import javax.cache.CacheException;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Factory implementation that use reflection to create instance of given class.
@@ -284,4 +284,4 @@ public class IgniteReflectionFactory<T> implements Factory<T> {
 
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
index 580010a..bbaa030 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import javax.cache.configuration.MutableConfiguration;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import javax.cache.configuration.*;
-
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_NEAR_START_SIZE;
 
 /**
  * Client cache configuration.
@@ -98,4 +97,4 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
     @Override public String toString() {
         return S.toString(NearCacheConfiguration.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
index 14d5e1d..20eb124 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
@@ -22,4 +22,4 @@ package org.apache.ignite.configuration;
  */
 public class PlatformConfiguration {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
index 995d7a5..ef9284d 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.cluster.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Topology validator.
@@ -32,4 +31,4 @@ public interface TopologyValidator extends Serializable {
      * @return is topology valid or not.
      */
     boolean validate(Collection<ClusterNode> nodes);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index 5fed59f..7d3cebb 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.transactions.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
 
 /**
  * Transactions configuration.
@@ -225,4 +226,4 @@ public class TransactionConfiguration implements Serializable {
     public void setTxManagerLookupClassName(String tmLookupClsName) {
         this.tmLookupClsName = tmLookupClsName;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
----------------------------------------------------------------------
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 eb02e8e..29aeb3d 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
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.events;
 
+import java.util.UUID;
 import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * In-memory database (cache) event.
@@ -337,4 +339,4 @@ public class CacheEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
----------------------------------------------------------------------
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 0cc47f1..ed33ccc 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
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache query execution event.
@@ -235,4 +235,4 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
----------------------------------------------------------------------
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 e1a1f4d..40c5dae 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
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache query read event.
@@ -297,4 +297,4 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
index febc6ab..5ff424b 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
@@ -18,9 +18,11 @@
 package org.apache.ignite.events;
 
 import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgnitePredicate;
 
 /**
@@ -181,4 +183,4 @@ public class CacheRebalancingEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
index fe1496d..142388b 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Grid checkpoint event.
@@ -119,4 +120,4 @@ public class CheckpointEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java b/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
index c7e9ce6..584c49f 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Grid deployment event.
@@ -115,4 +116,4 @@ public class DeploymentEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java b/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
index dfe0f43..49c4f6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Grid discovery event.
@@ -162,4 +162,4 @@ public class DiscoveryEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/Event.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/Event.java b/modules/core/src/main/java/org/apache/ignite/events/Event.java
index 3951677..9ba24ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/Event.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/Event.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid events are used for notification about what happens within the grid. Note that by
@@ -151,4 +150,4 @@ public interface Event extends Comparable<Event>, Serializable {
      * @return Shortened version of {@code toString()} result.
      */
     public String shortDisplay();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
----------------------------------------------------------------------
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 3b8fa86..6f8e82a 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
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base adapter for the events. All events (including user-defined ones) should
@@ -165,4 +167,4 @@ public class EventAdapter implements Event {
     @Override public String toString() {
         return S.toString(EventAdapter.class, this, "name", name());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java b/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
index 8efe8a7..0b45c05 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.events;
 
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Generator for local atomically incremented IDs for grid events.
@@ -41,4 +41,4 @@ final class EventLocalOrder {
     public static long nextOrder() {
         return gen.getAndIncrement();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/EventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index b8c11f9..103dbd4 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.events;
 
+import java.util.List;
 import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgnitePredicate;
 
-import java.util.*;
-
 /**
  * Contains event type constants. The decision to use class and not enumeration
  * dictated by allowing users to create their own events and/or event types which
@@ -1082,4 +1081,4 @@ public interface EventType {
      * All Ignite events (<b>excluding</b> metric update event).
      */
     public static final int[] EVTS_ALL_MINUS_METRIC_UPDATE = U.gridEvents(EVT_NODE_METRICS_UPDATED);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
index 1c7b1fe..698c6e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED;
 
 /**
  * IGFS event.
@@ -194,4 +195,4 @@ public class IgfsEvent extends EventAdapter {
     @Override public String toString() {
         return S.toString(IgfsEvent.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java b/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
index 9938266..13a53a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Grid job event.
@@ -233,4 +233,4 @@ public class JobEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java b/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
index 00e022e..8e7d9e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid swap space event.
@@ -101,4 +102,4 @@ public class SwapSpaceEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
----------------------------------------------------------------------
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 8307e3a..b5eca63 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
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid task event.
@@ -165,4 +165,4 @@ public class TaskEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
index afd0314..0b7b812 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
 
 /**
  * {@code IGFS} file's data block location in the grid. It is used to determine
@@ -60,4 +61,4 @@ public interface IgfsBlockLocation {
      * @return Collection of host names.
      */
     public Collection<String> hosts();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
index 63ff70e..a02fd62 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception indicating that file system structure was modified concurrently. This error
@@ -54,4 +54,4 @@ public class IgfsConcurrentModificationException extends IgfsException {
     public IgfsConcurrentModificationException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
index c2a6fd8..1732277 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when target file's block is not found in data cache.
@@ -53,4 +53,4 @@ public class IgfsCorruptedFileException extends IgfsException {
     public IgfsCorruptedFileException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
index 2df6faa..745559a 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that directory can not be deleted because it is not empty.
@@ -53,4 +53,4 @@ public class IgfsDirectoryNotEmptyException extends IgfsException {
     public IgfsDirectoryNotEmptyException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
index 630be38..9cae1ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception thrown by file system components.
@@ -54,4 +54,4 @@ public class IgfsException extends IgniteException {
     public IgfsException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
index 550679a..1108038 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} file or directory descriptor. For example, to get information about
@@ -117,4 +116,4 @@ public interface IgfsFile {
      * @return Properties of the file.
      */
     public Map<String, String> properties();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
index 1c49232..317c645 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.processors.igfs.IgfsBlockKey;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * {@code IGFS} class providing ability to group file's data blocks together on one node.
@@ -98,4 +99,4 @@ public class IgfsGroupDataBlocksKeyMapper extends GridCacheDefaultAffinityKeyMap
     @Override public String toString() {
         return S.toString(IgfsGroupDataBlocksKeyMapper.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
index 6572298..250b749 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * {@code IGFS} input stream to read data from the file system.
@@ -77,4 +78,4 @@ public abstract class IgfsInputStream extends InputStream {
      * @throws IOException In case of IO exception.
      */
     public abstract int read(long pos, byte[] buf, int off, int len) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
index 4b4a72e..48d43ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when Ignite detects that remote HDFS version differs from version of HDFS libraries
@@ -54,4 +54,4 @@ public class IgfsInvalidHdfsVersionException extends IgfsException {
     public IgfsInvalidHdfsVersionException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
index 8049afe..e3a23ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception indicating that operation target is invalid
@@ -54,4 +54,4 @@ public class IgfsInvalidPathException extends IgfsException {
     public IgfsInvalidPathException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
index 7315007..23993a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
-import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
+import static org.apache.ignite.igfs.IgfsIpcEndpointType.SHMEM;
+import static org.apache.ignite.igfs.IgfsIpcEndpointType.TCP;
 
 /**
  * IGFS IPC endpoint configuration.
@@ -238,4 +240,4 @@ public class IgfsIpcEndpointConfiguration {
     @Override public String toString() {
         return S.toString(IgfsIpcEndpointConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
index a7ecaa2..cc322b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
@@ -26,4 +26,4 @@ public enum IgfsIpcEndpointType {
 
     /** TCP endpoint. */
     TCP
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
index 50b5435..3283eaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
@@ -156,4 +156,4 @@ public interface IgfsMetrics {
      * @return Total bytes write time.
      */
     public long bytesWriteTime();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 2c9fcdd..7662c25 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} mode defining interactions with underlying secondary Hadoop file system.
@@ -77,4 +77,4 @@ public enum IgfsMode {
     @Nullable public static IgfsMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
index 029afff..e78a228 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception that is thrown when it detected out-of-space condition.
@@ -55,4 +55,4 @@ public class IgfsOutOfSpaceException extends IgfsException {
     public IgfsOutOfSpaceException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
index eaaddb8..98e051b 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.igfs;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * {@code IGFS} output stream to write data into the file system.
@@ -32,4 +34,4 @@ public abstract class IgfsOutputStream extends OutputStream {
      * @throws IOException If write failed, read from input failed or there is no enough data in data input.
      */
     public abstract void transferFrom(DataInput in, int len) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
index f0959bb..a99c1ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.internal.util.io.GridFilenameUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} path to file in the file system. For example, to get information about
@@ -259,4 +264,4 @@ public final class IgfsPath implements Comparable<IgfsPath>, Externalizable {
     @Override public String toString() {
         return path;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
index 939f6ba..c4ca587 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
@@ -17,8 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.processors.igfs.*;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when target path supposed to be created already exists.
@@ -54,4 +53,4 @@ public class IgfsPathAlreadyExistsException extends IgfsException {
     public IgfsPathAlreadyExistsException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
index 4892ee8..053098c 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that path is directory, while it is expected to be a file.
@@ -53,4 +53,4 @@ public class IgfsPathIsDirectoryException extends IgfsException {
     public IgfsPathIsDirectoryException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
index d4b5ff9..740fc26 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that path is not directory.
@@ -53,4 +53,4 @@ public class IgfsPathIsNotDirectoryException extends IgfsException {
     public IgfsPathIsNotDirectoryException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
index 4172be7..6670601 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception indicating that target resource is not found.
@@ -53,4 +53,4 @@ public class IgfsPathNotFoundException extends IgfsException {
     public IgfsPathNotFoundException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
index 5837f0a..e84e128 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Path summary: total files count, total directories count, total length.
@@ -135,4 +137,4 @@ public class IgfsPathSummary implements Externalizable {
     @Override public String toString() {
         return S.toString(IgfsPathSummary.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
index 5a65bdb..8db4e23 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides ability to execute IGFS code in a context of a specific user.
@@ -116,4 +115,4 @@ public abstract class IgfsUserContext {
     @Nullable public static String currentUser() {
         return userStackThreadLocal.get();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
index 1465340..a8a8bf9 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Entity representing part of IGFS file identified by file path, start position, and length.
@@ -77,4 +77,4 @@ public class IgfsFileRange {
     @Override public String toString() {
         return S.toString(IgfsFileRange.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
index d7fd866..c6dbec1 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.*;
-
-import java.io.*;
+import java.io.IOException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.internal.util.GridFixedSizeInputStream;
 
 /**
  * Convenient {@link IgfsJob} adapter. It limits data returned from {@link IgfsInputStream} to bytes within
@@ -49,4 +49,4 @@ public abstract class IgfsInputStreamJobAdapter extends IgfsJobAdapter {
      * @throws IOException If IO exception encountered while working with stream.
      */
     public abstract Object execute(IgniteFileSystem igfs, IgfsRangeInputStream in) throws IgniteException, IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
index 0fdc0f2..eeaa988 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-
-import java.io.*;
+import java.io.IOException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
 
 /**
  * Defines executable unit for {@link IgfsTask}. Before this job is executed, it is assigned one of the
@@ -66,4 +66,4 @@ public interface IgfsJob {
      * instance to gracefully finish execution and exit.
      */
     public void cancel();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
index 35873fe..353b263 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
@@ -25,4 +25,4 @@ public abstract class IgfsJobAdapter implements IgfsJob {
     @Override public void cancel() {
         // No-op.
     }
-}
+}
\ No newline at end of file


[68/82] [abbrv] ignite git commit: IGNITE-1337: Moved "common" CPP project to Ignite.

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a9ebf84..7a2b41c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -738,6 +738,11 @@
                                         <exclude>src/main/dotnet/Apache.Ignite.sln</exclude>
                                         <exclude>src/main/dotnet/Apache.Ignite.sln.DotSettings</exclude>
                                         <exclude>src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj</exclude>
+                                        <exclude>**/Makefile.am</exclude>
+                                        <exclude>**/configure.ac</exclude>
+                                        <exclude>**/*.vcsproj</exclude>
+                                        <exclude>**/*.vcsproj.filters</exclude>
+                                        <exclude>**/module.def</exclude>
                                     </excludes>
                                 </configuration>
                             </execution>


[60/82] [abbrv] ignite git commit: ignite-1294: added race related comment

Posted by sb...@apache.org.
ignite-1294: added race related comment


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

Branch: refs/heads/ignite-1093-2
Commit: 9e426004f7c38c72f82460f85f11208ea544f25c
Parents: 0dab4df
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Aug 31 18:00:21 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Aug 31 18:00:21 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9e426004/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
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 0be65a7..2594213 100644
--- 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
@@ -507,6 +507,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                         ses.send(new RecoveryLastReceivedMessage(-1));
                     }
                     else {
+                        // The code below causes a race condition between shmem and TCP (see IGNITE-1294)
                         boolean reserved = recoveryDesc.tryReserve(msg0.connectCount(),
                                 new ConnectClosure(ses, recoveryDesc, rmtNode, msg0, !hasShmemClient, fut));
 


[19/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index f241bcc..8fb7e5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -17,37 +17,86 @@
 
 package org.apache.ignite.internal.processors.task;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAfterSend;
+import org.apache.ignite.compute.ComputeJobBeforeFailover;
+import org.apache.ignite.compute.ComputeJobFailoverException;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskNoResultCache;
+import org.apache.ignite.compute.ComputeTaskSpis;
+import org.apache.ignite.compute.ComputeUserUndeclaredException;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.igfs.IgfsOutOfSpaceException;
+import org.apache.ignite.internal.ComputeTaskInternalFuture;
+import org.apache.ignite.internal.GridInternalException;
+import org.apache.ignite.internal.GridJobCancelRequest;
+import org.apache.ignite.internal.GridJobExecuteRequest;
+import org.apache.ignite.internal.GridJobExecuteResponse;
+import org.apache.ignite.internal.GridJobResultImpl;
+import org.apache.ignite.internal.GridJobSiblingImpl;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.closure.AffinityTask;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.typedef.CO;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED_OVER;
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_JOB_RESULTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_TASK_REDUCED;
+import static org.apache.ignite.events.EventType.EVT_TASK_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_CANCEL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MANAGEMENT_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
 
 /**
  * Grid task worker. Handles full task life cycle.
@@ -1418,4 +1467,4 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
             return S.toString(GridTaskWorker.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java
index a0fd9b4..1f9fc5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.timeout;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.IgniteSpiTimeoutObject;
 
 /**
  * Wrapper for {@link IgniteSpiTimeoutObject}.
@@ -70,4 +70,4 @@ public class GridSpiTimeoutObject implements GridTimeoutObject {
     @Override public final String toString() {
         return S.toString(GridSpiTimeoutObject.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java
index 1faaea8..a481cd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.timeout;
 
-import org.apache.ignite.lang.*;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * All objects that can timeout should implement this interface.
@@ -37,4 +37,4 @@ public interface GridTimeoutObject {
      * Timeout callback.
      */
     public void onTimeout();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java
index 29e7d08..01e0642 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.timeout;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Default implementation for {@link GridTimeoutObject}.
@@ -58,4 +58,4 @@ public abstract class GridTimeoutObjectAdapter implements GridTimeoutObject {
     @Override public long endTime() {
         return endTime;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
index e4f370c..0bbf9c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
@@ -17,19 +17,20 @@
 
 package org.apache.ignite.internal.processors.timeout;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Closeable;
+import java.util.Comparator;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.GridConcurrentSkipListSet;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.thread.IgniteThread;
 
 /**
  * Detects timeout events and processes them.
@@ -272,4 +273,4 @@ public class GridTimeoutProcessor extends GridProcessorAdapter {
             return S.toString(CancelableTask.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java
index 1e9aa43..29ab240 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java
@@ -17,9 +17,15 @@
 
 package org.apache.ignite.internal.tck;
 
-import com.sun.jmx.mbeanserver.*;
-
-import javax.management.*;
+import com.sun.jmx.mbeanserver.JmxMBeanServer;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerBuilder;
+import javax.management.MBeanServerDelegate;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
 
 /**
  * This class is needed for JCache TCK tests.
@@ -115,4 +121,4 @@ public class TCKMBeanServerBuilder extends MBeanServerBuilder {
             return System.getProperty("org.jsr107.tck.management.agentId");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java
index d624381..978ad17 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Exception thrown whenever grid transaction enters an unknown state.
@@ -48,4 +48,4 @@ public class IgniteTxHeuristicCheckedException extends IgniteCheckedException {
     public IgniteTxHeuristicCheckedException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java
index 34b9eb3..b2b0e2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Exception thrown whenever grid transactions fail optimistically.
@@ -44,4 +44,4 @@ public class IgniteTxOptimisticCheckedException extends IgniteCheckedException {
     public IgniteTxOptimisticCheckedException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java
index f8ee265..ac4eece 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Exception thrown whenever grid transactions has been automatically rolled back.
@@ -53,4 +53,4 @@ public class IgniteTxRollbackCheckedException extends IgniteCheckedException {
     public IgniteTxRollbackCheckedException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java
index 451fb9e..9f64fa7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.transactions;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Exception thrown whenever grid transactions time out.
@@ -44,4 +44,4 @@ public class IgniteTxTimeoutCheckedException extends IgniteCheckedException {
     public IgniteTxTimeoutCheckedException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
index 14509e8..7e9e448 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
@@ -17,15 +17,24 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter;
+import org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridNodePredicate;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Internal utility class that contains not peer-deployable
@@ -512,4 +521,4 @@ public class F0 {
 
         return F.asMap(key, val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java
index a50df1d..3cab510 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.lang.annotation.*;
-import java.util.concurrent.*;
+import java.lang.annotation.Annotation;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Caches class loaders for classes.
@@ -81,4 +80,4 @@ public final class GridAnnotationsCache {
     private GridAnnotationsCache() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
index 8289f90..8be3610 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class encapsulates argument check (null and range) for public facing APIs. Unlike asserts
@@ -162,4 +161,4 @@ public class GridArgumentCheck {
             throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name + NOT_NULL_OR_EMPTY_SUFFIX);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java
index 3c42009..e25dc88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Executes initialization operation once.
@@ -110,4 +110,4 @@ public class GridAtomicInitializer<T> {
     @Override public String toString() {
         return S.toString(GridAtomicInitializer.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java
index 6f5d12d..d732767 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Extended version of {@link AtomicInteger}.
@@ -246,4 +245,4 @@ public class GridAtomicInteger extends AtomicInteger {
                 return false;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java
index a502927..3b1a175 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Extended version of {@link AtomicLong}.
@@ -246,4 +245,4 @@ public class GridAtomicLong extends AtomicLong {
                 return false;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java
index 178b04a..04d1a85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jsr166.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jsr166.ConcurrentLinkedHashMap;
 
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q;
 
 /**
  * Concurrent map with an upper bound. Once map reaches its maximum capacity,
@@ -121,4 +121,4 @@ public class GridBoundedConcurrentLinkedHashMap<K, V> extends ConcurrentLinkedHa
             S.toString(GridBoundedConcurrentLinkedHashMap.class, this) :
             S.toString(GridBoundedConcurrentLinkedHashMap.class, this, "entrySet", keySet());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java
index a610e89..a06f2ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedHashMap;
 
-import java.util.concurrent.*;
-
-import static org.jsr166.ConcurrentLinkedHashMap.*;
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import static org.jsr166.ConcurrentLinkedHashMap.DFLT_CONCUR_LVL;
+import static org.jsr166.ConcurrentLinkedHashMap.DFLT_INIT_CAP;
+import static org.jsr166.ConcurrentLinkedHashMap.DFLT_LOAD_FACTOR;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q;
 
 /**
  * Concurrent set with an upper bound. Once set reaches its maximum capacity,
@@ -159,4 +161,4 @@ public class GridBoundedConcurrentLinkedHashSet<E> extends GridSetWrapper<E> {
             S.toString(GridBoundedConcurrentLinkedHashSet.class, this) :
             S.toString(GridBoundedConcurrentLinkedHashSet.class, this, "elements", map().keySet());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java
index 5d92fa4..b091652 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Concurrent ordered map that automatically manages its maximum size.
@@ -249,4 +251,4 @@ public class GridBoundedConcurrentOrderedMap<K, V> extends ConcurrentSkipListMap
 
         return rmvd;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java
index 1578040..a1ebd58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.NoSuchElementException;
+import java.util.SortedSet;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Concurrent ordered set that automatically manages its maximum size.
@@ -176,4 +179,4 @@ public class GridBoundedConcurrentOrderedSet<E> extends GridConcurrentSkipListSe
 
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java
index a3552c4..ee6e9f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Generic map with an upper bound. Once map reaches its maximum capacity,
@@ -126,4 +127,4 @@ public class GridBoundedLinkedHashMap<K, V> extends LinkedHashMap<K, V> {
 
         return m;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
index 79d763f..25bc2f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Iterator;
 
 /**
  * Hash table and linked list implementation of the {@code Set} interface,
@@ -204,4 +207,4 @@ public class GridBoundedLinkedHashSet<E> extends GridSerializableSet<E> implemen
 
         return newSet;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
index a1de3d5..c23e1de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-
-import java.util.concurrent.locks.*;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 
 /**
  * Synchronization aid to track "busy" state of a subsystem that owns it.
@@ -80,4 +79,4 @@ public class GridBusyLock {
     public void unblock() {
         lock.writeLock().unlock();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
index 83939c0..5c236d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
@@ -17,14 +17,22 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.apache.ignite.internal.util.io.GridUnsafeDataInput;
+import org.apache.ignite.internal.util.io.GridUnsafeDataOutput;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Re-sizable array implementation of the byte list (eliminating auto-boxing of primitive byte type).
@@ -478,4 +486,4 @@ public class GridByteArrayList implements Message, Externalizable {
     @Override public String toString() {
         return S.toString(GridByteArrayList.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java
index 46c56cd..26c87ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.IgniteInClosureX;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class implements a circular buffer for efficient data exchange.
@@ -227,4 +228,4 @@ public class GridCircularBuffer<T> {
             return S.toString(Item.class, this, "hash=" + System.identityHashCode(this));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java
index 162c3f9..34bf69b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Caches class loaders for classes.
@@ -128,4 +127,4 @@ public final class GridClassLoaderCache {
     private GridClassLoaderCache() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java
index 1c7cbd9..09f6c6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util;
 
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.UUID;
 
 /**
  * Primitive to byte array and backward conversions.
@@ -234,4 +235,4 @@ public abstract class GridClientByteUtils {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java
index c51238b..4563015 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-
-import java.util.*;
+import java.util.NoSuchElementException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridIteratorAdapter;
 
 /**
  * Convenient adapter for closeable iterator.
@@ -107,4 +107,4 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte
         if (closed)
             throw new NoSuchElementException("Iterator has been closed.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java
index 0a73519..3e67fe8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridIteratorAdapter;
 
 /**
  * Adapter for closeable iterator that can be safely closed concurrently.
@@ -124,4 +124,4 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
     @Override public boolean isClosed() {
         return closed.get();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java
index 85423b2..d3c47a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java
@@ -17,9 +17,15 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Provides locked wrappers around given maps and collections. Since {@link ReentrantLock}
@@ -641,4 +647,4 @@ public final class GridCollections {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
index b71846a..6e0e876 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.jsr166.*;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteSystemProperties;
+import org.jsr166.ConcurrentHashMap8;
 
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MAP_CONCURRENCY_LEVEL;
 
 /**
  * Concurrent map factory.
@@ -47,4 +46,4 @@ public class GridConcurrentFactory {
         return new ConcurrentHashMap8<>(16 * CONCURRENCY_LEVEL, 0.75f, CONCURRENCY_LEVEL);
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java
index 532b06e..955b7b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Concurrent set implementation.
@@ -116,4 +115,4 @@ public class GridConcurrentHashSet<E> extends GridSetWrapper<E> {
     @Override public String toString() {
         return S.toString(GridConcurrentHashSet.class, this, "elements", map().keySet());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java
index 671dc08..5a53b4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedHashMap;
 
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q;
 
 /**
  * Concurrent linked set implementation.
@@ -128,4 +128,4 @@ public class GridConcurrentLinkedHashSet<E> extends GridSetWrapper<E> {
             S.toString(GridConcurrentLinkedHashSet.class, this) :
             S.toString(GridConcurrentLinkedHashSet.class, this, "elements", map().keySet());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
index 804a2e5..ab8bb03 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
@@ -17,14 +17,21 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.ref.*;
-import java.util.*;
+import java.lang.ref.PhantomReference;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Concurrent phantom hash set implementation.
@@ -400,4 +407,4 @@ public class GridConcurrentPhantomHashSet<E> implements Set<E> {
     @Override public String toString() {
         return S.toString(GridConcurrentPhantomHashSet.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java
index 51b5acd..a7a0ddc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java
@@ -17,12 +17,20 @@
 
 package org.apache.ignite.internal.util;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.lang.Boolean.*;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.Boolean.TRUE;
 
 /**
  * This class provided the same logic as {@link ConcurrentSkipListSet}. It adds
@@ -299,4 +307,4 @@ public class GridConcurrentSkipListSet<E> extends GridSerializableSet<E> impleme
     @Override public NavigableSet<E> descendingSet() {
         return new GridConcurrentSkipListSet<>(m.descendingMap());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
index cb0109d..bba392c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
@@ -17,14 +17,21 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.ref.*;
-import java.util.*;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Concurrent weak hash set implementation.
@@ -400,4 +407,4 @@ public class GridConcurrentWeakHashSet<E> implements Set<E> {
     @Override public String toString() {
         return S.toString(GridConcurrentWeakHashSet.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
index 37d8756..94acea3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Finds configuration files located in {@code IGNITE_HOME} folder
@@ -151,4 +156,4 @@ public final class GridConfigurationFinder {
 
         return paths;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java
index 33ecacc..02f27c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java
@@ -17,14 +17,28 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Random;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Controls key to node affinity using consistent hash algorithm. This class is thread-safe
@@ -669,4 +683,4 @@ public class GridConsistentHash<N> {
     @Override public String toString() {
         return S.toString(GridConsistentHash.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
index 98c8664..ec3323e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
@@ -17,18 +17,25 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.management.*;
-import java.nio.charset.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility class for debugging.
@@ -330,4 +337,4 @@ public class GridDebug {
             return formatEntry(ts, threadName, threadId, data);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java
index e8df22e..a0e5f82 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
 
 /**
  * Empty closeable iterator.
@@ -39,4 +39,4 @@ public class GridEmptyCloseableIterator<T> extends GridEmptyIterator<T> implemen
     @Override public boolean isClosed() {
         return closed;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java
index f8c1c95..f49c8a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.lang.GridIteratorAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Empty iterator.
@@ -48,4 +47,4 @@ public class GridEmptyIterator<T> extends GridIteratorAdapter<T> {
     @Override public String toString() {
         return S.toString(GridEmptyIterator.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java
index 31b3eaa..f84c1e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.jsr166.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentMap;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Cache for enum constants.
@@ -54,4 +53,4 @@ public class GridEnumCache {
     public static void clear() {
         ENUM_CACHE.clear();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
index 665ac93..a23fe28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Accumulates execution statistics for named pieces of code.
@@ -102,4 +103,4 @@ public class GridExecutionStatistics {
                 ", average duration=" + avgDuration + ", total duration=" + totalDuration + "]");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java
index e8e8ea7..13982c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Input stream wrapper which allows to read exactly expected number of bytes.
@@ -82,4 +83,4 @@ public class GridFixedSizeInputStream extends InputStream {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
index 05a089c..319a633 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import sun.misc.*;
-
-import java.util.*;
+import java.util.Arrays;
+import sun.misc.Unsafe;
 
 /**
  * Lightweight identity hash table which maps objects to integer handles,
@@ -195,4 +194,4 @@ public class GridHandleTable {
     private int hash(Object obj) {
         return System.identityHashCode(obj) & 0x7FFFFFFF;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index 4946eb2..92c20fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -17,14 +17,21 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper class around the {@link Process} suited to run any Java class as separate java process.
@@ -300,4 +307,4 @@ public final class GridJavaProcess {
             U.closeQuiet(proc.getOutputStream());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java
index f851766..09a7db4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * This is an utility class for 'splitting' locking of some resources.
@@ -151,4 +150,4 @@ public class GridKeyLock {
             notifyAll();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java
index a4e18c8..fb6ba67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
+import java.util.AbstractSet;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  *
@@ -114,4 +117,4 @@ public class GridLeanIdentitySet<T> extends AbstractSet<T> {
     @Override public int size() {
         return size;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java
----------------------------------------------------------------------
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 74631a4..c0f7c5b 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
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lean map implementation that keeps up to five entries in its fields.
@@ -1263,4 +1268,4 @@ public class GridLeanMap<K, V> extends GridSerializableMap<K, V> implements Clon
             return false;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
index 20c92ce..e2283e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Lean set implementation. Internally this set is based on {@link GridLeanMap}.
@@ -80,4 +80,4 @@ public class GridLeanSet<E> extends GridSetWrapper<E> implements Cloneable {
     @Override public String toString() {
         return S.toString(GridLeanSet.class, this, "elements", map.keySet());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java
index 9744ef1..6226bd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java
@@ -17,11 +17,18 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implementation of {@link Set} based on internal list rather than hash table.
@@ -526,4 +533,4 @@ public class GridListSet<V> extends GridSerializableSet<V> implements Cloneable
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
----------------------------------------------------------------------
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 607b17b..745619a 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
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Grid log throttle.
@@ -253,4 +252,4 @@ public class GridLogThrottle {
          */
         public abstract void doLog(IgniteLogger log, String longMsg, String shortMsg, Throwable e, boolean quiet);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
index 1711f03..9ef6abb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
@@ -17,14 +17,22 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Minimal list API to work with primitive longs. This list exists
@@ -571,4 +579,4 @@ public class GridLongList implements Message, Externalizable {
     @Override public byte fieldsCount() {
         return 2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java
index e964d60..800f83c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Serializable mutex.
@@ -53,4 +55,4 @@ public class GridMutex implements Externalizable, Cloneable {
     @Override public String toString() {
         return S.toString(GridMutex.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java
index 2a16ac3..665e7b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.AbstractCollection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Queue which supports addition at tail and removing at head. This
@@ -345,4 +349,4 @@ public class GridQueue<E> extends AbstractCollection<E> implements Queue<E> {
                     ", actual=" + modCnt + ']');
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java
index fde7f85..9622853 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Random to be used from a single thread. Compatible with {@link Random} but faster.
@@ -54,4 +54,4 @@ public class GridRandom extends Random {
         rnd = (rnd * 0x5DEECE66DL + 0xBL) & ((1L << 48) - 1);
         return (int)(rnd >>> (48 - bits));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
index c5ded18..cd069f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
@@ -17,16 +17,23 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_REFLECTION_CACHE_SIZE;
 
 /**
  * Reflection field and method cache for classes.
@@ -247,4 +254,4 @@ public class GridReflectionCache implements Externalizable {
         fp = (IgnitePredicate<Field>)in.readObject();
         mp = (IgnitePredicate<Method>)in.readObject();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java
index 2577605..2b8315f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.AbstractCollection;
 
 /**
  * Makes {@link AbstractCollection} as {@link Serializable} and is
@@ -30,4 +30,4 @@ public abstract class GridSerializableCollection<E> extends AbstractCollection<E
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java
index 5b32293..2a1135a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Makes {@link Iterable} as {@link Serializable} and is
@@ -25,4 +25,4 @@ import java.io.*;
  */
 public interface GridSerializableIterable<E> extends Iterable<E>, Serializable {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java
index f2d07ac..79d0c04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Iterator;
 
 /**
  * Makes {@link Iterator} as {@link Serializable} and is
@@ -26,4 +26,4 @@ import java.util.*;
  */
 public interface GridSerializableIterator<E> extends Iterator<E>, Serializable {
     // No-op.
-}
+}
\ No newline at end of file


[28/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
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 5ff7345..fd64fdf 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
@@ -17,34 +17,66 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK;
+import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
 
 /**
  * Replicated user transaction.
@@ -1221,4 +1253,4 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
     @Override public String toString() {
         return S.toString(GridNearTxLocal.class, this, "mappings", mappings.keySet(), "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index b7a2fee..fac7a12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -17,24 +17,33 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.expiry.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtDetachedCacheEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteUuid;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
 
 /**
  * Common code for tx prepare in optimistic and pessimistic modes.
@@ -228,4 +237,4 @@ public abstract class GridNearTxPrepareFutureAdapter extends GridCompoundIdentit
                 tx.readyNearLocks(m, res.pending(), res.committedVersions(), res.rolledbackVersions());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index f018d18..2b3ddff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -17,21 +17,26 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Near transaction prepare request.
@@ -487,4 +492,4 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
     @Override public String toString() {
         return S.toString(GridNearTxPrepareRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 6f8e334..6558f97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -17,22 +17,33 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Near cache prepare response.
@@ -532,4 +543,4 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
         return S.toString(GridNearTxPrepareResponse.class, this, "super", super.toString());
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
index 4ac81f8..fff6dde 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
@@ -17,19 +17,30 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxRemoteAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction created by system implicitly on remote nodes.
@@ -370,4 +381,4 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter {
     @Override public String toString() {
         return GridToStringBuilder.toString(GridNearTxRemote.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
index 14f468f..821d504 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Near cache unlock request.
@@ -90,4 +90,4 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
     @Override public String toString() {
         return S.toString(GridNearUnlockRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
index 097e8c7..7293950 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrExpirationInfo.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.dr;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Cache DR info used as argument in PUT cache internal interfaces with expiration info added.
@@ -70,4 +70,4 @@ public class GridCacheDrExpirationInfo extends GridCacheDrInfo {
     @Override public String toString() {
         return S.toString(GridCacheDrExpirationInfo.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java
index 08a7849..8635fe2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.dr;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Cache DR info used as argument in PUT cache internal interfaces.
@@ -99,4 +102,4 @@ public class GridCacheDrInfo implements Externalizable {
     @Override public String toString() {
         return S.toString(GridCacheDrInfo.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
index 189ee33..67174ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.dr;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheManager;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Replication manager class which processes all replication events.
@@ -97,4 +99,4 @@ public interface GridCacheDrManager extends GridCacheManager {
      * Resets metrics for current cache.
      */
     public void resetMetrics();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
index 7f0a568..5ef2c9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache.dr;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation for {@link GridCacheDrManager}.
@@ -108,4 +110,4 @@ public class GridOsCacheDrManager implements GridCacheDrManager {
     @Override public void onDisconnected(IgniteFuture reconnectFut) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
index 75ff973..d74d82d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where attributes are set.
@@ -56,4 +56,4 @@ public class GridCacheAttributesEntryExtras extends GridCacheEntryExtrasAdapter
     @Override public String toString() {
         return S.toString(GridCacheAttributesEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
index 0899c97..cdec283 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extras where attributes and MVCC are set.
@@ -76,4 +76,4 @@ public class GridCacheAttributesMvccEntryExtras extends GridCacheEntryExtrasAdap
     @Override public String toString() {
         return S.toString(GridCacheAttributesMvccEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
index 80e0b0a..6825dc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extras where attributes, MVCC and obsolete version are set.
@@ -94,4 +94,4 @@ public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryEx
     @Override public String toString() {
         return S.toString(GridCacheAttributesMvccObsoleteEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
index bc55fb1..2365d3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extras where attributes, MVCC, obsolete version and TTL are set.
@@ -121,4 +121,4 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntr
     @Override public String toString() {
         return S.toString(GridCacheAttributesMvccObsoleteTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
index a49bd63..8c4fe86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extras where attributes, MVCC and TTL are set.
@@ -105,4 +105,4 @@ public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasA
     @Override public String toString() {
         return S.toString(GridCacheAttributesMvccTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
index a8e7b31..e3aa60a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where attributes and obsolete version are set.
@@ -75,4 +75,4 @@ public class GridCacheAttributesObsoleteEntryExtras extends GridCacheEntryExtras
     @Override public String toString() {
         return S.toString(GridCacheAttributesObsoleteEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
index 7feb455..297a608 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where attributes, obsolete version and TTL are set.
@@ -104,4 +104,4 @@ public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExt
     @Override public String toString() {
         return S.toString(GridCacheAttributesObsoleteTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
index eebf986..7d010f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where attributes and TTL are set.
@@ -86,4 +86,4 @@ public class GridCacheAttributesTtlEntryExtras extends GridCacheEntryExtrasAdapt
     @Override public String toString() {
         return S.toString(GridCacheAttributesTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java
index 568555d..e7b73d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache extras.
@@ -68,4 +68,4 @@ public interface GridCacheEntryExtras {
      * @return Extras size.
      */
     public int size();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java
index 058353e..9c99758 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 
 /**
  * Cache extras adapter.
@@ -43,4 +43,4 @@ public abstract class GridCacheEntryExtrasAdapter implements GridCacheEntryExtra
     @Override public long expireTime() {
         return 0;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java
index e1d5bc4..0e038b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where MVCC is set.
@@ -74,4 +74,4 @@ public class GridCacheMvccEntryExtras extends GridCacheEntryExtrasAdapter {
     @Override public String toString() {
         return S.toString(GridCacheMvccEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
index 29b7b4f..2141e4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where MVCC and obsolete version are set.
@@ -91,4 +91,4 @@ public class GridCacheMvccObsoleteEntryExtras extends GridCacheEntryExtrasAdapte
     @Override public String toString() {
         return S.toString(GridCacheMvccObsoleteEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
index 9b56ebd..194bf22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteTtlEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where MVCC, obsolete version and TTL are set.
@@ -120,4 +120,4 @@ public class GridCacheMvccObsoleteTtlEntryExtras extends GridCacheEntryExtrasAda
     @Override public String toString() {
         return S.toString(GridCacheMvccObsoleteTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
index d41c05c..40fc73f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccTtlEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where MVCC and TTL are set.
@@ -104,4 +104,3 @@ public class GridCacheMvccTtlEntryExtras extends GridCacheEntryExtrasAdapter {
         return S.toString(GridCacheMvccTtlEntryExtras.class, this);
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java
index fd1da38..f67bd64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where obsolete version is set.
@@ -74,4 +74,4 @@ public class GridCacheObsoleteEntryExtras extends GridCacheEntryExtrasAdapter {
     @Override public String toString() {
         return S.toString(GridCacheObsoleteEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
index f4bb0b6..7e5d2c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where obsolete version and TTL are set.
@@ -102,4 +102,4 @@ public class GridCacheObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter
     @Override public String toString() {
         return S.toString(GridCacheObsoleteTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
index d334ede..5e8756d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.extras;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Extras where TTL and expire time are set.
@@ -85,4 +85,4 @@ public class GridCacheTtlEntryExtras extends GridCacheEntryExtrasAdapter {
     @Override public String toString() {
         return S.toString(GridCacheTtlEntryExtras.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
index 85fa4b0..7b45e73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManagerAdapter.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.jta;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedManagerAdapter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides possibility to integrate cache transactions with JTA.
@@ -46,4 +47,4 @@ public abstract class CacheJtaManagerAdapter extends GridCacheSharedManagerAdapt
      * @return Transaction manager finder.
      */
     @Nullable public abstract Object tmLookup();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
index 60e4102..3f2a7eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheNoopJtaManager.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.jta;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation of {@link CacheJtaManagerAdapter}.
@@ -39,4 +39,4 @@ public class CacheNoopJtaManager extends CacheJtaManagerAdapter {
     @Nullable @Override public Object tmLookup() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
index 4adcff5..87da9a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
@@ -17,21 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache.local;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCachePreloader;
+import org.apache.ignite.internal.processors.cache.GridCachePreloaderAdapter;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Local cache implementation.
@@ -226,4 +237,4 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
                 log().debug("Explicitly removed future from map of futures: " + fut);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
index 6c04761..a4f6c92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
@@ -17,12 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.local;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.jetbrains.annotations.*;
-
-import static org.apache.ignite.events.EventType.*;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMvcc;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED;
 
 /**
  * Cache entry for local caches.
@@ -404,4 +411,4 @@ public class GridLocalCacheEntry extends GridCacheMapEntry {
     @Override protected void offHeapPointer(long valPtr) {
         this.valPtr = valPtr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockCallback.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockCallback.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockCallback.java
index 72e4f73..c9e1fcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockCallback.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockCallback.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.local;
 
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
 
 /**
  * @param <K> Key type.
@@ -36,4 +36,4 @@ interface GridLocalLockCallback {
     public void onOwnerChanged(GridLocalCacheEntry entry,
         GridCacheMvccCandidate prev,
         GridCacheMvccCandidate owner);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index 340eb07..7018c4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -17,20 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache.local;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache lock future.
@@ -440,4 +452,4 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean>
             return S.toString(LockTimeoutObject.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 3dc5946..0bf6ea2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -17,30 +17,71 @@
 
 package org.apache.ignite.internal.processors.cache.local.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.local.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
+import java.io.Externalizable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
+import org.apache.ignite.internal.processors.cache.CacheInvokeResult;
+import org.apache.ignite.internal.processors.cache.CacheLazyEntry;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheStorePartialUpdateException;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCachePreloader;
+import org.apache.ignite.internal.processors.cache.GridCachePreloaderAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.local.GridLocalCacheEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
 
 /**
  * Non-transactional local cache.
@@ -1561,4 +1602,4 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
     @Override public void onDeferredDelete(GridCacheEntryEx entry, GridCacheVersion ver) {
         assert false : "Should not be called";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheDefaultPortableAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheDefaultPortableAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheDefaultPortableAffinityKeyMapper.java
index f8be30c..23edd9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheDefaultPortableAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheDefaultPortableAffinityKeyMapper.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableObject;
 
 /**
  *
@@ -48,4 +48,4 @@ public class CacheDefaultPortableAffinityKeyMapper extends GridCacheDefaultAffin
         else
             return super.affinityKey(key);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java
index d4de1ec..2e0d37d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache.portable;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.portable.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.portable.PortableUtils;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.portable.PortableObject;
 
 /**
  *
@@ -184,4 +184,3 @@ public class CacheObjectPortableContext extends CacheObjectContext {
         return o;
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessor.java
index fb047d1..fcd73d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessor.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extended cache object processor interface with additional methods for portables.
@@ -98,4 +100,4 @@ public interface CacheObjectPortableProcessor extends IgniteCacheObjectProcessor
      * @throws IgniteException If failed.
      */
     public Object marshalToPortable(Object obj) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
index e70feb9..b33c643 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
@@ -17,41 +17,109 @@
 
 package org.apache.ignite.internal.processors.cache.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.portable.*;
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-import sun.misc.*;
-
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
 import javax.cache.Cache;
-import javax.cache.*;
-import javax.cache.event.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.portable.GridPortableMarshaller.*;
+import javax.cache.CacheException;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryListenerException;
+import javax.cache.event.CacheEntryUpdatedListener;
+import javax.cache.event.EventType;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.portable.GridPortableMarshaller;
+import org.apache.ignite.internal.portable.PortableBuilderImpl;
+import org.apache.ignite.internal.portable.PortableContext;
+import org.apache.ignite.internal.portable.PortableMetaDataHandler;
+import org.apache.ignite.internal.portable.PortableMetaDataImpl;
+import org.apache.ignite.internal.portable.PortableObjectImpl;
+import org.apache.ignite.internal.portable.PortableObjectOffheapImpl;
+import org.apache.ignite.internal.portable.PortableUtils;
+import org.apache.ignite.internal.portable.streams.PortableInputStream;
+import org.apache.ignite.internal.portable.streams.PortableOffheapInputStream;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import sun.misc.Unsafe;
+
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.COL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.PORTABLE_OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID_ARR;
 
 /**
  * Portable processor implementation.
@@ -954,4 +1022,4 @@ public class CacheObjectPortableProcessorImpl extends IgniteCacheObjectProcessor
             return S.toString(MetaDataPredicate.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgnitePortablesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgnitePortablesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgnitePortablesImpl.java
index d819a56..5ed6505 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgnitePortablesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgnitePortablesImpl.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link IgnitePortables} implementation.
@@ -173,4 +174,4 @@ public class IgnitePortablesImpl implements IgnitePortables {
     private void unguard() {
         ctx.gateway().readUnlock();
     }
-}
+}
\ No newline at end of file


[15/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
index 51c839d..ead3bf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridClosure3;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridClosure3} by extending it. Since Java doesn't provide type aliases
@@ -32,4 +33,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridClosure3
  *
  */
-public interface C3<E1, E2, E3, R> extends GridClosure3<E1, E2, E3, R> { /* No-op. */ }
+public interface C3<E1, E2, E3, R> extends GridClosure3<E1, E2, E3, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
index 720427a..2e455b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsClosure} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ public abstract class CA extends GridAbsClosure {
     /** */
     private static final long serialVersionUID = 0L;
  /* No-op. */
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
index 6668ea6..d4d53f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsClosureX;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsClosureX} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CAX extends GridAbsClosureX {
     /** */
     private static final long serialVersionUID = 0L;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
index a5396c7..32d2b0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteInClosure} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteInClosure
  */
-public interface CI1<T> extends IgniteInClosure<T> { /* No-op. */ }
+public interface CI1<T> extends IgniteInClosure<T> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
index 11d40a8..723613a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiInClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiInClosure} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteBiInClosure
  */
-public interface CI2<E1, E2> extends IgniteBiInClosure<E1, E2> { /* No-op. */ }
+public interface CI2<E1, E2> extends IgniteBiInClosure<E1, E2> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
index 325ab41..82fcc57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteInClosureX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteInClosureX} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CIX1<T> extends IgniteInClosureX<T> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
index beb6318..697b494 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteInClosure2X} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CIX2<E1, E2> extends IgniteInClosure2X<E1, E2> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
index e828a99..e61f8d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridInClosure3X;
 
 /**
  * Defines {@code alias} for {@link GridInClosure3X} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +27,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridInClosure3X
  */
-public abstract class CIX3<E1, E2, E3> extends GridInClosure3X<E1, E2, E3> { /* No-op. */ }
+public abstract class CIX3<E1, E2, E3> extends GridInClosure3X<E1, E2, E3> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
index 77d0ac0..c161565 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteOutClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteOutClosure} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteOutClosure
  */
-public interface CO<T> extends IgniteOutClosure<T> { /* No-op. */ }
+public interface CO<T> extends IgniteOutClosure<T> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
index cf17452..82b4ab5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteOutClosureX} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class COX<T> extends IgniteOutClosureX<T> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
index 1ee5ea4..0a99473 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteClosureX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteClosureX} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CX1<E1, R> extends IgniteClosureX<E1, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
index c4341a3..2362171 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteClosure2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteClosure2X} by extending it. Since Java doesn't provide type aliases
@@ -32,4 +33,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CX2<E1, E2, R> extends IgniteClosure2X<E1, E2, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
index b6ba3cb..2c6dfce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridClosure3X;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridClosure3X} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridClosure3X
  */
-public abstract class CX3<E1, E2, E3, R> extends GridClosure3X<E1, E2, E3, R> { /* No-op. */ }
+public abstract class CX3<E1, E2, E3, R> extends GridClosure3X<E1, E2, E3, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
index 3a61b42..0c3e170 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridFunc} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +26,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class F extends GridFunc { /* No-op. */ }
+public class F extends GridFunc { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
index aed778f..fbf8e3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.*;
+import org.apache.ignite.Ignition;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.Ignition} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +26,4 @@ import org.apache.ignite.*;
  * @see org.apache.ignite.Ignition
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class G extends Ignition { /* No-op. */ }
+public class G extends Ignition { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
index 8e33a40..b9cf5dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgnitePredicate} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgnitePredicate
  */
-public interface P1<E1> extends IgnitePredicate<E1> { /* No-op. */ }
+public interface P1<E1> extends IgnitePredicate<E1> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
index d043e2b..1d1e161 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiPredicate} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteBiPredicate
  */
-public interface P2<T1, T2> extends IgniteBiPredicate<T1, T2> { /* No-op. */ }
+public interface P2<T1, T2> extends IgniteBiPredicate<T1, T2> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
index b4698f4..6f53163 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridPredicate3;
 
 /**
  * Defines {@code alias} for {@link GridPredicate3} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridPredicate3
  */
-public interface P3<T1, T2, T3> extends GridPredicate3<T1, T2, T3> { /* No-op. */ }
+public interface P3<T1, T2, T3> extends GridPredicate3<T1, T2, T3> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
index 7322a78..249ec05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsPredicate} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +27,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridAbsPredicate
  */
-public interface PA extends GridAbsPredicate { /* No-op. */ }
+public interface PA extends GridAbsPredicate { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
index 2cb97b1..8317dfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsPredicateX} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +28,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridAbsPredicate
  */
-public abstract class PAX extends GridAbsPredicateX { /* No-op. */ }
+public abstract class PAX extends GridAbsPredicateX { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
index 2139c70..03fa8bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 
 /**
@@ -31,4 +30,4 @@ import javax.cache.*;
  * @see org.apache.ignite.lang.IgnitePredicate
  * @see GridFunc
  */
-public interface PCE<K, V> extends IgnitePredicate<Cache.Entry<K, V>> { /* No-op. */ }
+public interface PCE<K, V> extends IgnitePredicate<Cache.Entry<K, V>> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
index ab86b4a..d01240f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;GridEvent&gt;</tt> by extending
@@ -30,4 +30,4 @@ import org.apache.ignite.lang.*;
  * @see org.apache.ignite.events.Event
  * @see GridFunc
  */
-public interface PE extends IgnitePredicate<Event> { /* No-op. */ }
+public interface PE extends IgnitePredicate<Event> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
index 5a51709..69236d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate2&lt;K, V&gt;</tt> by extending
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see org.apache.ignite.lang.IgniteBiPredicate
  * @see GridFunc
  */
-public interface PKV<K, V> extends IgniteBiPredicate<K, V> { /* No-op. */ }
+public interface PKV<K, V> extends IgniteBiPredicate<K, V> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
index cdecb8e..c706873 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;GridNode&gt;</tt> by extending
@@ -30,4 +30,4 @@ import org.apache.ignite.lang.*;
  * @see org.apache.ignite.cluster.ClusterNode
  * @see GridFunc
  */
-public interface PN extends IgnitePredicate<ClusterNode> { /* No-op. */ }
+public interface PN extends IgnitePredicate<ClusterNode> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
index 54be2dc8..2ebae34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgnitePredicateX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgnitePredicateX} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class PX1<E1> extends IgnitePredicateX<E1> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
index 674abd9..42d7373 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgnitePredicate2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgnitePredicate2X} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class PX2<T1, T2> extends IgnitePredicate2X<T1, T2> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
index a6d959a..e81cbb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridPredicate3X;
 
 /**
  * Defines {@code alias} for {@link GridPredicate3X} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridPredicate3X
  */
-public abstract class PX3<T1, T2, T3> extends GridPredicate3X<T1, T2, T3> { /* No-op. */ }
+public abstract class PX3<T1, T2, T3> extends GridPredicate3X<T1, T2, T3> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
index 214d128..b9e894c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteReducer;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteReducer} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteReducer
  */
-public interface R1<E1, R> extends IgniteReducer<E1, R> { /* No-op. */ }
+public interface R1<E1, R> extends IgniteReducer<E1, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
index 82fdc45..3a11818 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer2;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer2} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +29,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.internal.util.lang.IgniteReducer2
  */
-public interface R2<E1, E2, R> extends IgniteReducer2<E1, E2, R> { /* No-op. */ }
+public interface R2<E1, E2, R> extends IgniteReducer2<E1, E2, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
index 4b3f11f..bf6cc7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer3;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer3} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +29,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.internal.util.lang.IgniteReducer3
  */
-public interface R3<E1, E2, E3, R> extends IgniteReducer3<E1, E2, E3, R> { /* No-op. */ }
+public interface R3<E1, E2, E3, R> extends IgniteReducer3<E1, E2, E3, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
index 186f0c9..2576b2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducerX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducerX} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class RX1<E1, R> extends IgniteReducerX<E1, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
index f6b5eb4..38fcaf6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer2X} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class RX2<E1, E2, R> extends IgniteReducer2X<E1, E2, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
index 0e9fa55..dc52dfd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer3X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer3X} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class RX3<E1, E2, E3, R> extends IgniteReducer3X<E1, E2, E3, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
index b096c4d..4150e3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
 
 /**
  * Defines {@code alias} for {@link GridTuple} by extending it. Since Java doesn't provide type aliases
@@ -48,4 +48,4 @@ public class T1<V> extends GridTuple<V> {
     public T1(V val) {
         super(val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
index face0ff..a58272a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiTuple} by extending it. Since Java doesn't provide type aliases
@@ -49,4 +49,4 @@ public class T2<V1, V2> extends IgniteBiTuple<V1, V2> {
     public T2(V1 val1, V2 val2) {
         super(val1, val2);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
index a6b8c65..febac32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple3;
 
 /**
  * Defines {@code alias} for {@link GridTuple3} by extending it. Since Java doesn't provide type aliases
@@ -49,4 +50,4 @@ public class T3<V1, V2, V3> extends GridTuple3<V1, V2, V3> {
     public T3(V1 val1, V2 val2, V3 val3) {
         super(val1, val2, val3);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
index be0408f..21e0f0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple4;
 
 /**
  * Defines {@code alias} for {@link GridTuple4} by extending it. Since Java doesn't provide type aliases
@@ -50,4 +51,4 @@ public class T4<V1, V2, V3, V4> extends GridTuple4<V1, V2, V3, V4> {
     public T4(V1 val1, V2 val2, V3 val3, V4 val4) {
         super(val1, val2, val3, val4);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
index 7257ad0..a653126 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple5;
 
 /**
  * Defines {@code alias} for {@link GridTuple5} by extending it. Since Java doesn't provide type aliases
@@ -51,4 +52,4 @@ public class T5<V1, V2, V3, V4, V5> extends GridTuple5<V1, V2, V3, V4, V5> {
     public T5(V1 v1, V2 v2, V3 v3, V4 v4, V5 v5) {
         super(v1, v2, v3, v4, v5);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
index a83c562..d968b8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple6;
 
 /**
  * Defines {@code alias} for {@link GridTuple6} by extending it. Since Java doesn't provide type aliases
@@ -52,4 +53,4 @@ public class T6<V1, V2, V3, V4, V5, V6> extends GridTuple6<V1, V2, V3, V4, V5, V
     public T6(V1 v1, V2 v2, V3 v3, V4 v4, V5 v5, V6 v6) {
         super(v1, v2, v3, v4, v5, v6);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
index fc9dad0..65b89bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
@@ -17,19 +17,30 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.Array;
-import java.lang.reflect.*;
-import java.sql.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
 
 /**
  * Defines global scope.
@@ -878,4 +889,4 @@ public final class X {
             return dflt;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
index 920681b..6d19e05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridArgumentCheck;
 
 /**
  * Defines internal {@code typedef} for {@link GridArgumentCheck}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class A extends GridArgumentCheck { /* No-op. */ }
+public class A extends GridArgumentCheck { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
index 3562a06..cc8b4f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 
 /**
  * Defines internal {@code typedef} for {@link GridCacheUtils}. Since Java doesn't provide type aliases
@@ -27,4 +27,4 @@ import org.apache.ignite.internal.processors.cache.*;
 @SuppressWarnings({"ExtendsUtilityClass"})
 public final class CU extends GridCacheUtils {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
index 4e5d042..1efda3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridDebug;
 
 /**
  * Convenience alias for {@link GridDebug} class.
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
 @SuppressWarnings("ExtendsUtilityClass")
 public class D extends GridDebug {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
index 3b65dc5..3476517 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridPlainCallable;
 
 /**
  * Defines internal {@code typedef} for {@link GridPlainCallable}. Since Java doesn't provide type aliases
  * (like Scala, for example) we resort to these types of measures. This is intended for internal
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
-public interface GPC<T> extends GridPlainCallable<T> { /* No-op. */ }
+public interface GPC<T> extends GridPlainCallable<T> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
index f7d4c3e..4248a5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
 
 /**
  * Defines internal {@code typedef} for {@link GridPlainRunnable}. Since Java doesn't provide type aliases
  * (like Scala, for example) we resort to these types of measures. This is intended for internal
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
-public interface GPR extends GridPlainRunnable { /* No-op. */ }
+public interface GPR extends GridPlainRunnable { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
index 3428993..3a0c5a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridLogThrottle;
 
 /**
  * Defines internal {@code typedef} for {@link GridLogThrottle}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class LT extends GridLogThrottle { /* No-op. */ }
+public class LT extends GridLogThrottle { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
index 39d5c69..259d688 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
 
 /**
  * Defines internal {@code typedef} for {@link GridToStringBuilder}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.tostring.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class S extends GridToStringBuilder { /* No-op. */ }
+public class S extends GridToStringBuilder { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
index 9fd88c0..79176e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridStringBuilder;
 
 /**
  * Defines internal {@code typedef} for {@link GridStringBuilder}. Since Java doesn't provide type aliases
@@ -60,4 +60,4 @@ public class SB extends GridStringBuilder {
     public SB(CharSequence seq) {
         super(seq);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
index 05c76b46..d5bc0b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.IgniteUtils;
 
 /**
  * Defines internal {@code typedef} for {@link IgniteUtils}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class U extends IgniteUtils { /* No-op. */ }
+public class U extends IgniteUtils { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
index 99fa270..499c097 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extension to standard {@link Runnable} interface. Adds proper details to be used
@@ -262,4 +264,4 @@ public abstract class GridWorker implements Runnable {
             "interrupted", (runner != null ? runner.isInterrupted() : "unknown"),
             "runner", (runner == null ? "null" : runner.getName()));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
index e1d156a..75323a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
 
 /**
  * Future for locally executed closure that defines cancellation logic.
@@ -50,4 +50,4 @@ public class GridWorkerFuture<T> extends GridFutureAdapter<T> {
 
         this.w = w;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
index 2abc75e..e4b39ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * This interface defines worker listener.
@@ -32,4 +32,4 @@ public interface GridWorkerListener extends EventListener {
      * @param w Stopped worker.
      */
     public void onStopped(GridWorker w);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
index 954a35b..c6f688b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
@@ -30,4 +30,4 @@ public class GridWorkerListenerAdapter implements GridWorkerListener {
     @Override public void onStopped(GridWorker w) {
         /* No-op. */
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
index 9a7b936..f015b62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Pool of runnable workers. This class automatically takes care of
@@ -113,4 +114,4 @@ public class GridWorkerPool {
                 Thread.currentThread().interrupt();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
index 8a017a4..0c89f99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.visor;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logFinish;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logStart;
 
 /**
  * Base class for Visor jobs.
@@ -81,4 +82,4 @@ public abstract class VisorJob<A, R> extends ComputeJobAdapter {
      * @throws IgniteException In case of error.
      */
     protected abstract R run(@Nullable A arg) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
index 9eda849..57f1346 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
@@ -17,17 +17,24 @@
 
 package org.apache.ignite.internal.visor;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logFinish;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logStart;
 
 /**
  * Base class for Visor tasks intended to query data from a multiple node.
@@ -123,4 +130,4 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
                 logFinish(ignite.log(), getClass(), start);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
index 351ebc5..e4880a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for Visor tasks intended to query data from a single node.
@@ -38,4 +37,4 @@ public abstract class VisorOneNodeTask<A, R> extends VisorMultiNodeTask<A, R, R>
 
         throw res.getException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
index 1a4e498..255bd75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
@@ -17,8 +17,10 @@
 
 package org.apache.ignite.internal.visor;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
 
 /**
  * Visor tasks argument.
@@ -103,4 +105,4 @@ public class VisorTaskArgument<A> implements Serializable {
     public boolean debug() {
         return debug;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 9e15d2d..937121d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -17,23 +17,31 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.util.lang.IgnitePair;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Data transfer object for {@link IgniteCache}.
@@ -398,4 +406,4 @@ public class VisorCache implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCache.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index 0256c93..7aa6215 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -17,15 +17,14 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
 
 /**
  * Data transfer object for affinity configuration properties.
@@ -114,4 +113,4 @@ public class VisorCacheAffinityConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheAffinityConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
index af68e9f..fba8a0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for aggregated cache metrics.
@@ -458,4 +460,4 @@ public class VisorCacheAggregatedMetrics implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheAggregatedMetrics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index 2ba489d..1f1a6fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.resources.JobContextResource;
 
 /**
  * Task that clears specified caches on specified node.
@@ -186,4 +191,4 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple<
             return 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index b983039..073ad22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import java.util.Collection;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
 
 /**
  * Data transfer object for cache configuration properties.
@@ -347,4 +350,4 @@ public class VisorCacheConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
index c8913c6..c872d98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Job that collect cache metrics from node.
@@ -73,4 +74,4 @@ public class VisorCacheConfigurationCollectorJob
     @Override public String toString() {
         return S.toString(VisorCacheConfigurationCollectorJob.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
index a92dd3c..49e8de4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Task that collect cache metrics from all nodes.
@@ -36,4 +36,4 @@ public class VisorCacheConfigurationCollectorTask
     @Override protected VisorCacheConfigurationCollectorJob job(Collection<IgniteUuid> arg) {
         return new VisorCacheConfigurationCollectorJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index 998b921..efebfe5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for default cache configuration properties.
@@ -55,4 +54,4 @@ public class VisorCacheDefaultConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheDefaultConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
index 8129c20..db216e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.evictionPolicyMaxSize;
 
 /**
  * Data transfer object for eviction configuration properties.
@@ -138,4 +138,4 @@ public class VisorCacheEvictionConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheEvictionConfiguration.class, this);
     }
-}
+}
\ No newline at end of file


[82/82] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
	modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
	modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java


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

Branch: refs/heads/ignite-1093-2
Commit: 59936ba02d4d4c3866937757e05c656603ed75b5
Parents: 0e6866c 2cd3da2
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 1 14:43:23 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 1 14:43:23 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   22 +-
 DISCLAIMER.txt                                  |   15 -
 LICENSE                                         |    2 +-
 NOTICE                                          |    2 +-
 assembly/LICENSE_FABRIC                         |    2 +-
 assembly/LICENSE_HADOOP                         |    2 +-
 assembly/NOTICE_FABRIC                          |    2 +-
 assembly/NOTICE_HADOOP                          |    2 +-
 assembly/release-base.xml                       |    5 -
 dev-tools/slurp.sh                              |    2 +-
 dev-tools/src/main/groovy/jiraslurp.groovy      |    2 +-
 .../org/apache/ignite/schema/CacheConfig.java   |    9 +-
 .../java/org/apache/ignite/schema/Demo.java     |   22 +-
 .../java/org/apache/ignite/schema/DemoNode.java |    5 +-
 .../java/org/apache/ignite/schema/Person.java   |    1 -
 .../org/apache/ignite/schema/PersonKey.java     |    1 -
 .../ignite/examples/ExampleNodeStartup.java     |    5 +-
 .../apache/ignite/examples/ExamplesUtils.java   |   11 +-
 .../computegrid/ComputeAsyncExample.java        |   16 +-
 .../computegrid/ComputeBroadcastExample.java    |   16 +-
 .../computegrid/ComputeCallableExample.java     |   14 +-
 .../computegrid/ComputeClosureExample.java      |   14 +-
 .../ComputeContinuousMapperExample.java         |   32 +-
 .../ComputeFibonacciContinuationExample.java    |   32 +-
 .../computegrid/ComputeReducerExample.java      |   16 +-
 .../computegrid/ComputeRunnableExample.java     |   11 +-
 .../computegrid/ComputeTaskMapExample.java      |   23 +-
 .../computegrid/ComputeTaskSplitExample.java    |   20 +-
 .../cluster/ClusterGroupExample.java            |   16 +-
 .../computegrid/cluster/package-info.java       |    2 +-
 .../failover/ComputeFailoverExample.java        |   23 +-
 .../failover/ComputeFailoverNodeStartup.java    |   17 +-
 .../computegrid/failover/package-info.java      |    2 +-
 .../examples/computegrid/montecarlo/Credit.java |    4 +-
 .../montecarlo/CreditRiskExample.java           |   16 +-
 .../montecarlo/CreditRiskManager.java           |    5 +-
 .../computegrid/montecarlo/package-info.java    |    2 +-
 .../examples/computegrid/package-info.java      |    2 +-
 .../examples/datagrid/CacheAffinityExample.java |   20 +-
 .../examples/datagrid/CacheApiExample.java      |   15 +-
 .../examples/datagrid/CacheAsyncApiExample.java |   16 +-
 .../datagrid/CacheContinuousQueryExample.java   |   22 +-
 .../datagrid/CacheDataStreamerExample.java      |   11 +-
 .../examples/datagrid/CacheEventsExample.java   |   21 +-
 .../examples/datagrid/CachePutGetExample.java   |   13 +-
 .../examples/datagrid/CacheQueryExample.java    |   35 +-
 .../datagrid/CacheTransactionExample.java       |   25 +-
 .../hibernate/HibernateL2CacheExample.java      |   35 +-
 .../examples/datagrid/hibernate/Post.java       |   10 +-
 .../examples/datagrid/hibernate/User.java       |   13 +-
 .../datagrid/hibernate/package-info.java        |    2 +-
 .../ignite/examples/datagrid/package-info.java  |    2 +-
 .../starschema/CacheStarSchemaExample.java      |   26 +-
 .../datagrid/starschema/DimProduct.java         |    6 +-
 .../examples/datagrid/starschema/DimStore.java  |    6 +-
 .../datagrid/starschema/FactPurchase.java       |    6 +-
 .../datagrid/starschema/package-info.java       |    2 +-
 .../ignite/examples/datagrid/store/Person.java  |    3 +-
 .../store/auto/CacheAutoStoreExample.java       |   18 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |   16 +-
 .../datagrid/store/auto/CacheConfig.java        |   27 +-
 .../datagrid/store/auto/DbH2ServerStartup.java  |   15 +-
 .../datagrid/store/auto/package-info.java       |    2 +-
 .../store/dummy/CacheDummyPersonStore.java      |   24 +-
 .../store/dummy/CacheDummyStoreExample.java     |   25 +-
 .../datagrid/store/dummy/package-info.java      |    2 +-
 .../hibernate/CacheHibernatePersonStore.java    |   22 +-
 .../hibernate/CacheHibernateStoreExample.java   |   30 +-
 .../datagrid/store/hibernate/package-info.java  |    2 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |   29 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |   30 +-
 .../datagrid/store/jdbc/package-info.java       |    2 +-
 .../examples/datagrid/store/package-info.java   |    2 +-
 .../store/spring/CacheSpringPersonStore.java    |   31 +-
 .../store/spring/CacheSpringStoreExample.java   |   30 +-
 .../datagrid/store/spring/package-info.java     |    2 +-
 .../datastructures/IgniteAtomicLongExample.java |   13 +-
 .../IgniteAtomicReferenceExample.java           |   13 +-
 .../IgniteAtomicSequenceExample.java            |   10 +-
 .../IgniteAtomicStampedExample.java             |   13 +-
 .../IgniteCountDownLatchExample.java            |   13 +-
 .../IgniteExecutorServiceExample.java           |   13 +-
 .../datastructures/IgniteQueueExample.java      |   18 +-
 .../datastructures/IgniteSetExample.java        |   22 +-
 .../examples/datastructures/package-info.java   |    2 +-
 .../ignite/examples/events/EventsExample.java   |   25 +-
 .../ignite/examples/events/package-info.java    |    2 +-
 .../ignite/examples/igfs/IgfsExample.java       |   20 +-
 .../examples/igfs/IgfsMapReduceExample.java     |   35 +-
 .../ignite/examples/igfs/IgfsNodeStartup.java   |    5 +-
 .../ignite/examples/igfs/package-info.java      |    2 +-
 .../examples/messaging/MessagingExample.java    |   21 +-
 .../messaging/MessagingPingPongExample.java     |   18 +-
 .../MessagingPingPongListenActorExample.java    |   20 +-
 .../ignite/examples/messaging/package-info.java |    2 +-
 .../client/memcache/MemcacheRestExample.java    |   17 +-
 .../MemcacheRestExampleNodeStartup.java         |   28 +-
 .../misc/client/memcache/package-info.java      |    2 +-
 .../examples/misc/client/package-info.java      |    2 +-
 .../misc/deployment/DeploymentExample.java      |   25 +-
 .../examples/misc/deployment/package-info.java  |    2 +-
 .../misc/lifecycle/LifecycleExample.java        |   16 +-
 .../examples/misc/lifecycle/package-info.java   |    2 +-
 .../ignite/examples/misc/package-info.java      |    2 +-
 .../misc/schedule/ComputeScheduleExample.java   |   15 +-
 .../examples/misc/schedule/package-info.java    |    2 +-
 .../misc/springbean/SpringBeanExample.java      |   13 +-
 .../examples/misc/springbean/package-info.java  |    2 +-
 .../apache/ignite/examples/package-info.java    |    2 +-
 .../examples/servicegrid/ServicesExample.java   |   16 +-
 .../examples/servicegrid/SimpleMapService.java  |    2 +-
 .../servicegrid/SimpleMapServiceImpl.java       |   12 +-
 .../examples/servicegrid/package-info.java      |    2 +-
 .../streaming/StreamTransformerExample.java     |   22 +-
 .../streaming/StreamVisitorExample.java         |   25 +-
 .../ignite/examples/streaming/package-info.java |    2 +-
 .../streaming/wordcount/CacheConfig.java        |   14 +-
 .../streaming/wordcount/QueryWords.java         |   16 +-
 .../streaming/wordcount/StreamWords.java        |   17 +-
 .../streaming/wordcount/package-info.java       |    2 +-
 .../socket/WordsSocketStreamerClient.java       |   19 +-
 .../socket/WordsSocketStreamerServer.java       |   30 +-
 .../wordcount/socket/package-info.java          |    2 +-
 .../java8/cluster/ClusterGroupExample.java      |   12 +-
 .../examples/java8/cluster/package-info.java    |    2 +-
 .../java8/computegrid/ComputeAsyncExample.java  |   16 +-
 .../computegrid/ComputeBroadcastExample.java    |   11 +-
 .../computegrid/ComputeCallableExample.java     |   14 +-
 .../computegrid/ComputeClosureExample.java      |   12 +-
 .../computegrid/ComputeRunnableExample.java     |   13 +-
 .../java8/computegrid/package-info.java         |    2 +-
 .../java8/datagrid/CacheAffinityExample.java    |   11 +-
 .../java8/datagrid/CacheApiExample.java         |   16 +-
 .../java8/datagrid/CacheAsyncApiExample.java    |   19 +-
 .../examples/java8/datagrid/package-info.java   |    2 +-
 .../IgniteExecutorServiceExample.java           |   13 +-
 .../java8/datastructures/package-info.java      |    2 +-
 .../examples/java8/events/EventsExample.java    |   25 +-
 .../examples/java8/events/package-info.java     |    2 +-
 .../java8/messaging/MessagingExample.java       |    8 +-
 .../messaging/MessagingPingPongExample.java     |   14 +-
 .../examples/java8/messaging/package-info.java  |    2 +-
 .../misc/schedule/ComputeScheduleExample.java   |   10 +-
 .../java8/misc/schedule/package-info.java       |    2 +-
 .../ignite/examples/java8/package-info.java     |    2 +-
 .../streaming/StreamTransformerExample.java     |   20 +-
 .../java8/streaming/StreamVisitorExample.java   |   24 +-
 .../examples/java8/streaming/package-info.java  |    2 +-
 .../BasicExamplesMultiNodeSelfTest.java         |    2 +-
 .../ignite/examples/BasicExamplesSelfTest.java  |   14 +-
 .../CacheExamplesMultiNodeSelfTest.java         |    2 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |   24 +-
 .../examples/CheckpointExamplesSelfTest.java    |    7 +-
 .../examples/ClusterGroupExampleSelfTest.java   |    6 +-
 .../ContinuationExamplesMultiNodeSelfTest.java  |    2 +-
 .../examples/ContinuationExamplesSelfTest.java  |    6 +-
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |    2 +-
 .../ContinuousMapperExamplesSelfTest.java       |    6 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |    2 +-
 .../examples/DeploymentExamplesSelfTest.java    |    6 +-
 .../EventsExamplesMultiNodeSelfTest.java        |    2 +-
 .../ignite/examples/EventsExamplesSelfTest.java |    6 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |    4 +-
 .../HibernateL2CacheExampleSelfTest.java        |    6 +-
 .../ignite/examples/IgfsExamplesSelfTest.java   |    8 +-
 .../examples/LifecycleExamplesSelfTest.java     |    6 +-
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |    4 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |    7 +-
 .../examples/MessagingExamplesSelfTest.java     |    8 +-
 .../MonteCarloExamplesMultiNodeSelfTest.java    |    2 +-
 .../examples/MonteCarloExamplesSelfTest.java    |    6 +-
 .../examples/SpringBeanExamplesSelfTest.java    |    6 +-
 .../examples/TaskExamplesMultiNodeSelfTest.java |    2 +-
 .../ignite/examples/TaskExamplesSelfTest.java   |    7 +-
 .../testsuites/IgniteExamplesSelfTestSuite.java |   35 +-
 .../BasicExamplesMultiNodeSelfTest.java         |    2 +-
 .../java8/examples/BasicExamplesSelfTest.java   |    3 +-
 .../CacheExamplesMultiNodeSelfTest.java         |    2 +-
 .../java8/examples/CacheExamplesSelfTest.java   |    4 +-
 .../examples/CheckpointExamplesSelfTest.java    |    3 +-
 .../examples/ClusterGroupExampleSelfTest.java   |    4 +-
 .../ContinuationExamplesMultiNodeSelfTest.java  |    2 +-
 .../examples/ContinuationExamplesSelfTest.java  |    3 +-
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |    2 +-
 .../ContinuousMapperExamplesSelfTest.java       |    4 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |    2 +-
 .../examples/DeploymentExamplesSelfTest.java    |    3 +-
 .../EventsExamplesMultiNodeSelfTest.java        |    2 +-
 .../java8/examples/EventsExamplesSelfTest.java  |    3 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |    2 +-
 .../HibernateL2CacheExampleSelfTest.java        |    3 +-
 .../java8/examples/IgfsExamplesSelfTest.java    |    3 +-
 .../examples/LifecycleExamplesSelfTest.java     |    3 +-
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |    2 +-
 .../examples/MemcacheRestExamplesSelfTest.java  |    3 +-
 .../examples/MessagingExamplesSelfTest.java     |    3 +-
 .../MonteCarloExamplesMultiNodeSelfTest.java    |    2 +-
 .../examples/MonteCarloExamplesSelfTest.java    |    3 +-
 .../examples/SpringBeanExamplesSelfTest.java    |    3 +-
 .../examples/TaskExamplesMultiNodeSelfTest.java |    2 +-
 .../java8/examples/TaskExamplesSelfTest.java    |    3 +-
 .../IgniteExamplesJ8SelfTestSuite.java          |    6 +-
 idea/ignite_codeStyle.xml                       |   11 +-
 .../aop/aspectj/GridifyAspectJAspect.java       |   32 +-
 .../aspectj/GridifySetToSetAspectJAspect.java   |   34 +-
 .../aspectj/GridifySetToValueAspectJAspect.java |   34 +-
 .../aop/spring/GridifySetToSetSpringAspect.java |   30 +-
 .../spring/GridifySetToValueSpringAspect.java   |   30 +-
 .../gridify/aop/spring/GridifySpringAspect.java |   28 +-
 .../aop/spring/GridifySpringEnhancer.java       |    6 +-
 .../aop/spring/GridifySpringPointcut.java       |   13 +-
 .../apache/ignite/gridify/AbstractAopTest.java  |   35 +-
 .../apache/ignite/gridify/BasicAopSelfTest.java |   21 +-
 .../ignite/gridify/GridifySetToSetTarget.java   |   17 +-
 .../gridify/GridifySetToSetTargetInterface.java |   11 +-
 .../ignite/gridify/GridifySetToValueTarget.java |   14 +-
 .../GridifySetToValueTargetInterface.java       |   10 +-
 .../GridifySetToXXXNonSpringAopSelfTest.java    |   13 +-
 .../GridifySetToXXXSpringAopSelfTest.java       |   15 +-
 .../ignite/gridify/NonSpringAopSelfTest.java    |    4 +-
 .../ignite/gridify/SpringAopSelfTest.java       |    6 +-
 .../apache/ignite/gridify/TestAopTarget.java    |   10 +-
 .../ignite/gridify/TestAopTargetInterface.java  |    7 +-
 .../ignite/gridify/TestGridifyException.java    |    2 +-
 .../apache/ignite/gridify/TestGridifyJob.java   |   11 +-
 .../apache/ignite/gridify/TestGridifyTask.java  |   14 +-
 .../gridify/hierarchy/GridifyHierarchyTest.java |    4 +-
 .../ignite/gridify/hierarchy/SuperTarget.java   |    4 +-
 .../apache/ignite/gridify/hierarchy/Target.java |    2 +-
 .../optimized/OptimizedMarshallerAopTest.java   |   20 +-
 .../apache/ignite/p2p/P2PGridifySelfTest.java   |   22 +-
 .../testsuites/IgniteAopSelfTestSuite.java      |   16 +-
 .../singlesplit/SingleSplitTestJobTarget.java   |    8 +-
 .../direct/singlesplit/SingleSplitTestTask.java |   22 +-
 .../singlesplit/SingleSplitsLoadTest.java       |   29 +-
 .../gridify/GridifyLoadTestJobTarget.java       |    4 +-
 .../loadtests/gridify/GridifyLoadTestTask.java  |   18 +-
 .../gridify/GridifySingleSplitLoadTest.java     |   31 +-
 .../org/test/gridify/ExternalAopTarget.java     |   10 +-
 .../test/gridify/ExternalGridifyException.java  |    2 +-
 .../org/test/gridify/ExternalGridifyTask.java   |   20 +-
 .../gridify/ExternalNonSpringAopSelfTest.java   |   17 +-
 modules/apache-license-gen/pom.xml              |   13 +-
 .../spi/checkpoint/s3/S3CheckpointData.java     |    9 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |   60 +-
 .../spi/checkpoint/s3/S3CheckpointSpiMBean.java |    6 +-
 .../ignite/spi/checkpoint/s3/S3TimeData.java    |    4 +-
 .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java |   46 +-
 .../s3/S3CheckpointManagerSelfTest.java         |   11 +-
 .../s3/S3CheckpointSpiConfigSelfTest.java       |    5 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |   32 +-
 .../s3/S3CheckpointSpiStartStopSelfTest.java    |   11 +-
 .../s3/S3SessionCheckpointSelfTest.java         |   12 +-
 .../s3/TcpDiscoveryS3IpFinderSelfTest.java      |   16 +-
 .../ignite/testsuites/IgniteS3TestSuite.java    |   12 +-
 .../internal/TaskEventSubjectIdSelfTest.java    |   53 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |   62 +-
 .../client/ClientDefaultCacheSelfTest.java      |   35 +-
 .../internal/client/ClientGetAffinityTask.java  |   19 +-
 .../ignite/internal/client/ClientHttpTask.java  |   19 +-
 .../internal/client/ClientNodeStartup.java      |    9 +-
 .../client/ClientReconnectionSelfTest.java      |   16 +-
 .../internal/client/ClientSslNodeStartup.java   |    9 +-
 .../internal/client/ClientStartNodeTask.java    |   38 +-
 .../internal/client/ClientStopNodeTask.java     |   26 +-
 .../internal/client/ClientStringLengthTask.java |   16 +-
 .../client/ClientTcpMultiThreadedSelfTest.java  |    4 +-
 .../ClientTcpSslAuthenticationSelfTest.java     |   30 +-
 .../ClientTcpSslMultiThreadedSelfTest.java      |    6 +-
 .../ignite/internal/client/ClientTcpTask.java   |   16 +-
 ...skExecutionAfterTopologyRestartSelfTest.java |   10 +-
 .../internal/client/ClientTestRestServer.java   |   43 +-
 .../ignite/internal/client/HashMapStore.java    |   12 +-
 .../ignite/internal/client/SleepTestTask.java   |   16 +-
 .../client/TaskSingleJobSplitAdapter.java       |   14 +-
 .../client/impl/ClientCacheFlagsCodecTest.java  |   19 +-
 .../client/impl/ClientComputeImplSelfTest.java  |   16 +-
 .../client/impl/ClientDataImplSelfTest.java     |   11 +-
 .../impl/ClientFutureAdapterSelfTest.java       |   14 +-
 .../ClientPropertiesConfigurationSelfTest.java  |   41 +-
 .../ClientAbstractConnectivitySelfTest.java     |   35 +-
 .../ClientAbstractMultiNodeSelfTest.java        |  100 +-
 .../integration/ClientAbstractSelfTest.java     |   86 +-
 .../integration/ClientPreferDirectSelfTest.java |   43 +-
 .../ClientTcpConnectivitySelfTest.java          |   15 +-
 .../ClientTcpDirectMultiNodeSelfTest.java       |   11 +-
 .../integration/ClientTcpDirectSelfTest.java    |   11 +-
 .../integration/ClientTcpMultiNodeSelfTest.java |    4 +-
 .../client/integration/ClientTcpSelfTest.java   |    6 +-
 .../ClientTcpSslDirectMultiNodeSelfTest.java    |   15 +-
 .../integration/ClientTcpSslDirectSelfTest.java |   13 +-
 .../ClientTcpSslMultiNodeSelfTest.java          |    8 +-
 .../integration/ClientTcpSslSelfTest.java       |    8 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |   22 +-
 .../client/router/ClientFailedInitSelfTest.java |   50 +-
 .../client/router/RouterFactorySelfTest.java    |   23 +-
 .../router/TcpRouterAbstractSelfTest.java       |   22 +-
 .../router/TcpRouterMultiNodeSelfTest.java      |   23 +-
 .../client/router/TcpRouterSelfTest.java        |    4 +-
 .../client/router/TcpSslRouterSelfTest.java     |    8 +-
 .../client/suite/IgniteClientTestSuite.java     |   50 +-
 .../client/util/ClientByteUtilsTest.java        |   24 +-
 .../util/ClientConsistentHashSelfTest.java      |   19 +-
 .../client/util/ClientJavaHasherSelfTest.java   |    9 +-
 .../rest/AbstractRestProcessorSelfTest.java     |   16 +-
 .../rest/ClientMemcachedProtocolSelfTest.java   |   27 +-
 .../JettyRestProcessorAbstractSelfTest.java     |   44 +-
 .../rest/JettyRestProcessorSignedSelfTest.java  |   16 +-
 .../JettyRestProcessorUnsignedSelfTest.java     |    2 +-
 .../rest/MemcacheRestProcessorTest.java         |   15 +-
 .../rest/RestBinaryProtocolSelfTest.java        |   52 +-
 .../rest/RestMemcacheProtocolSelfTest.java      |   29 +-
 .../rest/RestProcessorMultiStartSelfTest.java   |    7 +-
 .../rest/RestProcessorStartSelfTest.java        |   34 +-
 .../processors/rest/RestProcessorTest.java      |   30 +-
 .../rest/TaskCommandHandlerSelfTest.java        |   59 +-
 .../processors/rest/TestBinaryClient.java       |   64 +-
 .../processors/rest/TestMemcacheClient.java     |   34 +-
 .../internal/processors/rest/TestTask1.java     |   16 +-
 .../internal/processors/rest/TestTask2.java     |   16 +-
 .../rest/protocols/tcp/MockNioSession.java      |   15 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |   43 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |   37 +-
 .../ignite/jdbc/JdbcConnectionSelfTest.java     |   25 +-
 .../ignite/jdbc/JdbcEmptyCacheSelfTest.java     |   25 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |   31 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |   45 +-
 .../jdbc/JdbcPreparedStatementSelfTest.java     |   53 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |   47 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |   34 +-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   13 +-
 .../loadtests/client/ClientCacheBenchmark.java  |   28 +-
 .../client/ClientMarshallerBenchmarkTest.java   |   27 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |    8 +-
 .../cloud/TcpDiscoveryCloudIpFinder.java        |   59 +-
 .../TcpDiscoveryCloudIpFinderSelfTest.java      |   15 +-
 .../ignite/testsuites/IgniteCloudTestSuite.java |    9 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   49 +-
 modules/core/pom.xml                            |    6 +-
 modules/core/src/main/java/META-INF/LICENSE     |    2 +-
 modules/core/src/main/java/META-INF/NOTICE      |    2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   28 +-
 .../org/apache/ignite/IgniteAtomicLong.java     |    4 +-
 .../apache/ignite/IgniteAtomicReference.java    |    4 +-
 .../org/apache/ignite/IgniteAtomicSequence.java |    4 +-
 .../org/apache/ignite/IgniteAtomicStamped.java  |    7 +-
 .../ignite/IgniteAuthenticationException.java   |    2 +-
 .../java/org/apache/ignite/IgniteCache.java     |   65 +-
 .../apache/ignite/IgniteCheckedException.java   |    6 +-
 .../IgniteClientDisconnectedException.java      |    6 +-
 .../java/org/apache/ignite/IgniteCluster.java   |   23 +-
 .../java/org/apache/ignite/IgniteCompute.java   |   33 +-
 .../org/apache/ignite/IgniteCountDownLatch.java |    6 +-
 .../org/apache/ignite/IgniteDataStreamer.java   |   15 +-
 .../ignite/IgniteDeploymentException.java       |    4 +-
 .../java/org/apache/ignite/IgniteEvents.java    |   18 +-
 .../java/org/apache/ignite/IgniteException.java |    6 +-
 .../org/apache/ignite/IgniteFileSystem.java     |   25 +-
 .../ignite/IgniteIllegalStateException.java     |    6 +-
 .../ignite/IgniteInterruptedException.java      |    2 +-
 .../org/apache/ignite/IgniteJdbcDriver.java     |   18 +-
 .../java/org/apache/ignite/IgniteLogger.java    |    6 +-
 .../java/org/apache/ignite/IgniteMessaging.java |   17 +-
 .../java/org/apache/ignite/IgnitePortables.java |   26 +-
 .../java/org/apache/ignite/IgniteQueue.java     |   10 +-
 .../java/org/apache/ignite/IgniteScheduler.java |   13 +-
 .../java/org/apache/ignite/IgniteServices.java  |   20 +-
 .../main/java/org/apache/ignite/IgniteSet.java  |    8 +-
 .../java/org/apache/ignite/IgniteState.java     |    6 +-
 .../apache/ignite/IgniteSystemProperties.java   |   11 +-
 .../org/apache/ignite/IgniteTransactions.java   |   12 +-
 .../main/java/org/apache/ignite/Ignition.java   |   22 +-
 .../org/apache/ignite/IgnitionListener.java     |    7 +-
 .../CacheAtomicUpdateTimeoutException.java      |    4 +-
 .../ignite/cache/CacheAtomicWriteOrderMode.java |    4 +-
 .../apache/ignite/cache/CacheAtomicityMode.java |    6 +-
 .../org/apache/ignite/cache/CacheEntry.java     |   11 +-
 .../CacheEntryEventSerializableFilter.java      |    6 +-
 .../ignite/cache/CacheEntryProcessor.java       |    6 +-
 .../ignite/cache/CacheExistsException.java      |    7 +-
 .../apache/ignite/cache/CacheInterceptor.java   |   15 +-
 .../ignite/cache/CacheInterceptorAdapter.java   |    9 +-
 .../org/apache/ignite/cache/CacheManager.java   |   55 +-
 .../apache/ignite/cache/CacheMemoryMode.java    |    4 +-
 .../org/apache/ignite/cache/CacheMetrics.java   |   10 +-
 .../java/org/apache/ignite/cache/CacheMode.java |    8 +-
 .../cache/CachePartialUpdateException.java      |    9 +-
 .../org/apache/ignite/cache/CachePeekMode.java  |    6 +-
 .../apache/ignite/cache/CacheRebalanceMode.java |    6 +-
 .../cache/CacheServerNotFoundException.java     |    4 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |    7 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |   19 +-
 .../cache/CacheWriteSynchronizationMode.java    |    6 +-
 .../apache/ignite/cache/CachingProvider.java    |   30 +-
 .../apache/ignite/cache/affinity/Affinity.java  |   10 +-
 .../affinity/AffinityCentralizedFunction.java   |    7 +-
 .../ignite/cache/affinity/AffinityFunction.java |   10 +-
 .../cache/affinity/AffinityFunctionContext.java |   13 +-
 .../ignite/cache/affinity/AffinityKey.java      |   15 +-
 .../cache/affinity/AffinityKeyMapped.java       |   10 +-
 .../cache/affinity/AffinityKeyMapper.java       |    4 +-
 .../AffinityNodeAddressHashResolver.java        |   11 +-
 .../affinity/AffinityNodeHashResolver.java      |    9 +-
 .../affinity/AffinityNodeIdHashResolver.java    |   11 +-
 .../ignite/cache/affinity/AffinityUuid.java     |    6 +-
 .../affinity/fair/FairAffinityFunction.java     |   34 +-
 .../rendezvous/RendezvousAffinityFunction.java  |   49 +-
 .../ignite/cache/eviction/EvictableEntry.java   |    7 +-
 .../ignite/cache/eviction/EvictionFilter.java   |    7 +-
 .../ignite/cache/eviction/EvictionPolicy.java   |   10 +-
 .../cache/eviction/fifo/FifoEvictionPolicy.java |   27 +-
 .../eviction/fifo/FifoEvictionPolicyMBean.java  |    4 +-
 .../cache/eviction/igfs/IgfsEvictionFilter.java |    9 +-
 .../igfs/IgfsPerBlockLruEvictionPolicy.java     |   35 +-
 .../IgfsPerBlockLruEvictionPolicyMXBean.java    |    9 +-
 .../cache/eviction/lru/LruEvictionPolicy.java   |   27 +-
 .../eviction/lru/LruEvictionPolicyMBean.java    |    4 +-
 .../eviction/random/RandomEvictionPolicy.java   |   24 +-
 .../random/RandomEvictionPolicyMBean.java       |    4 +-
 .../eviction/sorted/SortedEvictionPolicy.java   |   36 +-
 .../sorted/SortedEvictionPolicyMBean.java       |    4 +-
 .../ignite/cache/query/ContinuousQuery.java     |   11 +-
 .../org/apache/ignite/cache/query/Query.java    |    9 +-
 .../apache/ignite/cache/query/QueryCursor.java  |    4 +-
 .../apache/ignite/cache/query/QueryMetrics.java |    4 +-
 .../apache/ignite/cache/query/ScanQuery.java    |   13 +-
 .../org/apache/ignite/cache/query/SpiQuery.java |   13 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |   12 +-
 .../org/apache/ignite/cache/query/SqlQuery.java |   14 +-
 .../apache/ignite/cache/query/TextQuery.java    |   12 +-
 .../query/annotations/QueryGroupIndex.java      |    7 +-
 .../cache/query/annotations/QuerySqlField.java  |   11 +-
 .../query/annotations/QuerySqlFunction.java     |    8 +-
 .../cache/query/annotations/QueryTextField.java |   11 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |   36 +-
 .../apache/ignite/cache/store/CacheStore.java   |   20 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |   12 +-
 .../ignite/cache/store/CacheStoreSession.java   |   11 +-
 .../cache/store/CacheStoreSessionListener.java  |   12 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |   83 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |   57 +-
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |   24 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   31 +-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |   23 +-
 .../jdbc/CacheJdbcStoreSessionListener.java     |   22 +-
 .../store/jdbc/dialect/BasicJdbcDialect.java    |   10 +-
 .../cache/store/jdbc/dialect/DB2Dialect.java    |    8 +-
 .../cache/store/jdbc/dialect/H2Dialect.java     |    7 +-
 .../cache/store/jdbc/dialect/JdbcDialect.java   |    6 +-
 .../cache/store/jdbc/dialect/MySQLDialect.java  |    8 +-
 .../cache/store/jdbc/dialect/OracleDialect.java |    8 +-
 .../store/jdbc/dialect/SQLServerDialect.java    |    8 +-
 .../org/apache/ignite/cluster/ClusterGroup.java |   17 +-
 .../cluster/ClusterGroupEmptyException.java     |    4 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |    6 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |   20 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |    4 +-
 .../cluster/ClusterTopologyException.java       |    8 +-
 .../ComputeExecutionRejectedException.java      |    6 +-
 .../org/apache/ignite/compute/ComputeJob.java   |   10 +-
 .../ignite/compute/ComputeJobAdapter.java       |    9 +-
 .../ignite/compute/ComputeJobAfterSend.java     |    8 +-
 .../compute/ComputeJobBeforeFailover.java       |    8 +-
 .../ignite/compute/ComputeJobContext.java       |   10 +-
 .../ignite/compute/ComputeJobContinuation.java  |    4 +-
 .../compute/ComputeJobContinuationAdapter.java  |    6 +-
 .../compute/ComputeJobFailoverException.java    |   12 +-
 .../compute/ComputeJobMasterLeaveAware.java     |    4 +-
 .../apache/ignite/compute/ComputeJobResult.java |   10 +-
 .../ignite/compute/ComputeJobResultPolicy.java  |    7 +-
 .../ignite/compute/ComputeJobSibling.java       |    9 +-
 .../ignite/compute/ComputeLoadBalancer.java     |   12 +-
 .../org/apache/ignite/compute/ComputeTask.java  |   14 +-
 .../ignite/compute/ComputeTaskAdapter.java      |    9 +-
 .../compute/ComputeTaskCancelledException.java  |    6 +-
 .../compute/ComputeTaskContinuousMapper.java    |   11 +-
 .../ignite/compute/ComputeTaskFuture.java       |   10 +-
 .../ignite/compute/ComputeTaskMapAsync.java     |   10 +-
 .../apache/ignite/compute/ComputeTaskName.java  |    8 +-
 .../compute/ComputeTaskNoResultCache.java       |   10 +-
 .../ignite/compute/ComputeTaskSession.java      |   15 +-
 .../ComputeTaskSessionAttributeListener.java    |    4 +-
 .../compute/ComputeTaskSessionFullSupport.java  |   10 +-
 .../ignite/compute/ComputeTaskSessionScope.java |    4 +-
 .../apache/ignite/compute/ComputeTaskSpis.java  |    8 +-
 .../ignite/compute/ComputeTaskSplitAdapter.java |   17 +-
 .../compute/ComputeTaskTimeoutException.java    |    6 +-
 .../compute/ComputeUserUndeclaredException.java |    6 +-
 .../apache/ignite/compute/gridify/Gridify.java  |   15 +-
 .../ignite/compute/gridify/GridifyArgument.java |    4 +-
 .../ignite/compute/gridify/GridifyInput.java    |    8 +-
 .../compute/gridify/GridifyInterceptor.java     |    7 +-
 .../compute/gridify/GridifyNodeFilter.java      |    8 +-
 .../gridify/GridifyRuntimeException.java        |    4 +-
 .../ignite/compute/gridify/GridifySetToSet.java |   10 +-
 .../compute/gridify/GridifySetToValue.java      |   10 +-
 .../compute/gridify/GridifyTaskAdapter.java     |    7 +-
 .../gridify/GridifyTaskSplitAdapter.java        |    7 +-
 .../gridify/aop/GridifyArgumentAdapter.java     |    7 +-
 .../gridify/aop/GridifyDefaultRangeTask.java    |   46 +-
 .../compute/gridify/aop/GridifyDefaultTask.java |   27 +-
 .../aop/GridifySetToSetAbstractAspect.java      |   27 +-
 .../aop/GridifySetToValueAbstractAspect.java    |   29 +-
 .../ignite/configuration/AddressResolver.java   |    9 +-
 .../configuration/AtomicConfiguration.java      |   10 +-
 .../configuration/CacheConfiguration.java       |   49 +-
 .../configuration/CollectionConfiguration.java  |   23 +-
 .../configuration/ConnectorConfiguration.java   |   18 +-
 .../ConnectorMessageInterceptor.java            |    4 +-
 .../ignite/configuration/DeploymentMode.java    |    4 +-
 .../configuration/FileSystemConfiguration.java  |   17 +-
 .../configuration/HadoopConfiguration.java      |    6 +-
 .../configuration/IgniteConfiguration.java      |  104 +-
 .../configuration/IgniteReflectionFactory.java  |   18 +-
 .../configuration/NearCacheConfiguration.java   |   13 +-
 .../configuration/PlatformConfiguration.java    |    2 +-
 .../ignite/configuration/TopologyValidator.java |    9 +-
 .../configuration/TransactionConfiguration.java |    9 +-
 .../org/apache/ignite/events/CacheEvent.java    |   18 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |   18 +-
 .../ignite/events/CacheQueryReadEvent.java      |   18 +-
 .../ignite/events/CacheRebalancingEvent.java    |    8 +-
 .../apache/ignite/events/CheckpointEvent.java   |    7 +-
 .../apache/ignite/events/DeploymentEvent.java   |    7 +-
 .../apache/ignite/events/DiscoveryEvent.java    |   12 +-
 .../java/org/apache/ignite/events/Event.java    |   11 +-
 .../org/apache/ignite/events/EventAdapter.java  |   12 +-
 .../apache/ignite/events/EventLocalOrder.java   |    4 +-
 .../org/apache/ignite/events/EventType.java     |    9 +-
 .../org/apache/ignite/events/IgfsEvent.java     |   19 +-
 .../java/org/apache/ignite/events/JobEvent.java |   12 +-
 .../apache/ignite/events/SwapSpaceEvent.java    |    9 +-
 .../org/apache/ignite/events/TaskEvent.java     |   14 +-
 .../apache/ignite/igfs/IgfsBlockLocation.java   |    5 +-
 .../IgfsConcurrentModificationException.java    |    4 +-
 .../ignite/igfs/IgfsCorruptedFileException.java |    4 +-
 .../igfs/IgfsDirectoryNotEmptyException.java    |    4 +-
 .../org/apache/ignite/igfs/IgfsException.java   |    6 +-
 .../java/org/apache/ignite/igfs/IgfsFile.java   |    7 +-
 .../igfs/IgfsGroupDataBlocksKeyMapper.java      |    9 +-
 .../org/apache/ignite/igfs/IgfsInputStream.java |    5 +-
 .../igfs/IgfsInvalidHdfsVersionException.java   |    4 +-
 .../ignite/igfs/IgfsInvalidPathException.java   |    4 +-
 .../igfs/IgfsIpcEndpointConfiguration.java      |   10 +-
 .../apache/ignite/igfs/IgfsIpcEndpointType.java |    2 +-
 .../org/apache/ignite/igfs/IgfsMetrics.java     |    2 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |    4 +-
 .../ignite/igfs/IgfsOutOfSpaceException.java    |    4 +-
 .../apache/ignite/igfs/IgfsOutputStream.java    |    6 +-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |   23 +-
 .../igfs/IgfsPathAlreadyExistsException.java    |    5 +-
 .../igfs/IgfsPathIsDirectoryException.java      |    4 +-
 .../igfs/IgfsPathIsNotDirectoryException.java   |    4 +-
 .../ignite/igfs/IgfsPathNotFoundException.java  |    4 +-
 .../org/apache/ignite/igfs/IgfsPathSummary.java |   10 +-
 .../org/apache/ignite/igfs/IgfsUserContext.java |   11 +-
 .../ignite/igfs/mapreduce/IgfsFileRange.java    |    6 +-
 .../mapreduce/IgfsInputStreamJobAdapter.java    |   12 +-
 .../apache/ignite/igfs/mapreduce/IgfsJob.java   |   10 +-
 .../ignite/igfs/mapreduce/IgfsJobAdapter.java   |    2 +-
 .../igfs/mapreduce/IgfsRangeInputStream.java    |   12 +-
 .../igfs/mapreduce/IgfsRecordResolver.java      |   13 +-
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |   32 +-
 .../ignite/igfs/mapreduce/IgfsTaskArgs.java     |    7 +-
 .../igfs/mapreduce/IgfsTaskNoReduceAdapter.java |    7 +-
 .../IgfsByteDelimiterRecordResolver.java        |   31 +-
 .../records/IgfsFixedLengthRecordResolver.java  |   18 +-
 .../records/IgfsNewLineRecordResolver.java      |    7 +-
 .../IgfsStringDelimiterRecordResolver.java      |   11 +-
 .../igfs/secondary/IgfsSecondaryFileSystem.java |   15 +-
 ...fsSecondaryFileSystemPositionedReadable.java |    5 +-
 .../ignite/internal/AsyncSupportAdapter.java    |    9 +-
 .../ClusterLocalNodeMetricsMXBeanImpl.java      |    8 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |   24 +-
 .../internal/ComputeTaskInternalFuture.java     |   35 +-
 .../ignite/internal/GridCachePluginContext.java |   13 +-
 .../ignite/internal/GridClosureCallMode.java    |    4 +-
 .../apache/ignite/internal/GridComponent.java   |   17 +-
 .../apache/ignite/internal/GridDiagnostic.java  |   20 +-
 .../ignite/internal/GridDirectCollection.java   |   10 +-
 .../apache/ignite/internal/GridDirectMap.java   |    7 +-
 .../ignite/internal/GridDirectTransient.java    |    7 +-
 .../internal/GridEventConsumeHandler.java       |   65 +-
 .../ignite/internal/GridInternalException.java  |    9 +-
 .../ignite/internal/GridInternalWrapper.java    |    2 +-
 .../ignite/internal/GridJobCancelRequest.java   |   17 +-
 .../ignite/internal/GridJobContextImpl.java     |   35 +-
 .../ignite/internal/GridJobExecuteRequest.java  |   32 +-
 .../ignite/internal/GridJobExecuteResponse.java |   24 +-
 .../ignite/internal/GridJobResultImpl.java      |   19 +-
 .../ignite/internal/GridJobSessionImpl.java     |   24 +-
 .../ignite/internal/GridJobSiblingImpl.java     |   30 +-
 .../ignite/internal/GridJobSiblingsRequest.java |   15 +-
 .../internal/GridJobSiblingsResponse.java       |   23 +-
 .../ignite/internal/GridKernalContext.java      |   96 +-
 .../ignite/internal/GridKernalContextImpl.java  |  133 +-
 .../ignite/internal/GridKernalGateway.java      |    7 +-
 .../ignite/internal/GridKernalGatewayImpl.java  |   23 +-
 .../apache/ignite/internal/GridKernalState.java |    4 +-
 .../apache/ignite/internal/GridLoggerProxy.java |   31 +-
 .../internal/GridMessageListenHandler.java      |   27 +-
 .../internal/GridNodeOrderComparator.java       |    9 +-
 .../internal/GridPerformanceSuggestions.java    |   18 +-
 .../ignite/internal/GridPluginComponent.java    |   20 +-
 .../ignite/internal/GridPluginContext.java      |   18 +-
 .../ignite/internal/GridProxyListener.java      |    4 +-
 .../ignite/internal/GridTaskCancelRequest.java  |   15 +-
 .../ignite/internal/GridTaskNameHashKey.java    |   10 +-
 .../ignite/internal/GridTaskSessionImpl.java    |   36 +-
 .../internal/GridTaskSessionInternal.java       |   11 +-
 .../ignite/internal/GridTaskSessionRequest.java |   17 +-
 .../org/apache/ignite/internal/GridTopic.java   |   20 +-
 .../ignite/internal/GridUpdateNotifier.java     |   52 +-
 ...gniteClientDisconnectedCheckedException.java |    6 +-
 .../internal/IgniteCodeGeneratingFail.java      |    7 +-
 .../ignite/internal/IgniteComponentType.java    |   13 +-
 .../ignite/internal/IgniteComputeImpl.java      |   52 +-
 .../IgniteDeploymentCheckedException.java       |    6 +-
 .../ignite/internal/IgniteEventsImpl.java       |   32 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   22 +-
 .../IgniteFutureCancelledCheckedException.java  |    6 +-
 .../IgniteFutureTimeoutCheckedException.java    |    6 +-
 .../ignite/internal/IgniteInternalFuture.java   |   11 +-
 .../IgniteInterruptedCheckedException.java      |    4 +-
 .../apache/ignite/internal/IgniteKernal.java    |  278 ++-
 .../ignite/internal/IgniteMessagingImpl.java    |   31 +-
 .../ignite/internal/IgniteNodeAttributes.java   |    5 +-
 .../ignite/internal/IgniteProperties.java       |    7 +-
 .../ignite/internal/IgniteSchedulerImpl.java    |   21 +-
 .../ignite/internal/IgniteServicesImpl.java     |   28 +-
 .../ignite/internal/IgniteTransactionsEx.java   |   11 +-
 .../ignite/internal/IgniteVersionUtils.java     |    9 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  161 +-
 .../ignite/internal/IgnitionMXBeanAdapter.java  |    7 +-
 .../internal/MarshallerContextAdapter.java      |   34 +-
 .../ignite/internal/MarshallerContextImpl.java  |   31 +-
 .../org/apache/ignite/internal/SkipDaemon.java  |    7 +-
 .../internal/ThreadPoolMXBeanAdapter.java       |   13 +-
 .../ignite/internal/client/GridClient.java      |    5 +-
 .../GridClientAuthenticationException.java      |    2 +-
 .../internal/client/GridClientCacheFlag.java    |    4 +-
 .../internal/client/GridClientCacheMode.java    |    2 +-
 .../client/GridClientClosedException.java       |    2 +-
 .../internal/client/GridClientCompute.java      |   11 +-
 .../client/GridClientConfiguration.java         |   35 +-
 .../ignite/internal/client/GridClientData.java  |    7 +-
 .../internal/client/GridClientDataAffinity.java |    4 +-
 .../client/GridClientDataConfiguration.java     |    5 +-
 .../internal/client/GridClientDataMetrics.java  |    4 +-
 .../client/GridClientDisconnectedException.java |    2 +-
 .../internal/client/GridClientException.java    |    6 +-
 .../internal/client/GridClientFactory.java      |   13 +-
 .../internal/client/GridClientFuture.java       |    4 +-
 .../client/GridClientFutureListener.java        |    2 +-
 .../GridClientFutureTimeoutException.java       |    2 +-
 .../client/GridClientHandshakeException.java    |    2 +-
 .../ignite/internal/client/GridClientNode.java  |   12 +-
 .../internal/client/GridClientNodeMetrics.java  |    4 +-
 .../client/GridClientPartitionAffinity.java     |   15 +-
 .../internal/client/GridClientPredicate.java    |    2 +-
 .../internal/client/GridClientProtocol.java     |    2 +-
 .../client/GridClientTopologyListener.java      |    2 +-
 .../client/GridServerUnreachableException.java  |    2 +-
 .../balancer/GridClientBalancerAdapter.java     |   11 +-
 .../client/balancer/GridClientLoadBalancer.java |    8 +-
 .../balancer/GridClientRandomBalancer.java      |   10 +-
 .../balancer/GridClientRoundRobinBalancer.java  |   18 +-
 .../impl/GridClientAbstractProjection.java      |   39 +-
 .../client/impl/GridClientAndPredicate.java     |    4 +-
 .../client/impl/GridClientComputeImpl.java      |   30 +-
 .../client/impl/GridClientDataImpl.java         |   32 +-
 .../impl/GridClientDataMetricsAdapter.java      |    4 +-
 .../client/impl/GridClientFutureAdapter.java    |   20 +-
 .../client/impl/GridClientFutureCallback.java   |    5 +-
 .../internal/client/impl/GridClientImpl.java    |   66 +-
 .../client/impl/GridClientNodeImpl.java         |   23 +-
 .../impl/GridClientNodeMetricsAdapter.java      |    4 +-
 .../client/impl/GridClientThreadFactory.java    |    9 +-
 .../impl/connection/GridClientConnection.java   |   29 +-
 .../GridClientConnectionCloseReason.java        |    2 +-
 .../connection/GridClientConnectionManager.java |   15 +-
 .../GridClientConnectionManagerAdapter.java     |   79 +-
 .../GridClientConnectionManagerOsImpl.java      |   13 +-
 .../GridClientConnectionResetException.java     |    4 +-
 .../connection/GridClientNioTcpConnection.java  |  105 +-
 .../impl/connection/GridClientTopology.java     |   45 +-
 .../GridConnectionIdleClosedException.java      |    2 +-
 .../client/marshaller/GridClientMarshaller.java |    6 +-
 .../marshaller/jdk/GridClientJdkMarshaller.java |   16 +-
 .../GridClientOptimizedMarshaller.java          |   24 +-
 .../client/router/GridRouterFactory.java        |   17 +-
 .../internal/client/router/GridTcpRouter.java   |    4 +-
 .../router/GridTcpRouterConfiguration.java      |   22 +-
 .../client/router/GridTcpRouterMBean.java       |    7 +-
 .../router/impl/GridRouterClientImpl.java       |   40 +-
 .../impl/GridRouterCommandLineStartup.java      |   32 +-
 .../client/router/impl/GridTcpRouterImpl.java   |   52 +-
 .../impl/GridTcpRouterNioListenerAdapter.java   |   41 +-
 .../impl/GridTcpRouterNioListenerOsImpl.java    |    4 +-
 .../router/impl/GridTcpRouterNioParser.java     |   28 +-
 .../client/ssl/GridSslBasicContextFactory.java  |   27 +-
 .../client/ssl/GridSslContextFactory.java       |    7 +-
 .../client/util/GridClientConsistentHash.java   |   25 +-
 .../client/util/GridClientStripedLock.java      |    5 +-
 .../internal/client/util/GridClientUtils.java   |   22 +-
 .../client/util/GridConcurrentHashSet.java      |    9 +-
 .../internal/cluster/ClusterGroupAdapter.java   |   60 +-
 .../ClusterGroupEmptyCheckedException.java      |    4 +-
 .../ignite/internal/cluster/ClusterGroupEx.java |   10 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |   21 +-
 .../cluster/ClusterStartNodeResultImpl.java     |    4 +-
 .../ClusterTopologyCheckedException.java        |    8 +-
 .../ClusterTopologyServerNotFoundException.java |    2 +-
 .../cluster/IgniteClusterAsyncImpl.java         |   34 +-
 .../internal/cluster/IgniteClusterEx.java       |    4 +-
 .../internal/cluster/IgniteClusterImpl.java     |   70 +-
 .../ignite/internal/cluster/IgniteKillTask.java |   24 +-
 .../ComputeTaskCancelledCheckedException.java   |    6 +-
 .../ComputeTaskTimeoutCheckedException.java     |    6 +-
 .../internal/direct/DirectByteBufferStream.java |   32 +-
 .../internal/direct/DirectMessageReader.java    |   20 +-
 .../internal/direct/DirectMessageWriter.java    |   18 +-
 .../direct/DirectMessageWriterState.java        |    4 +-
 .../internal/events/DiscoveryCustomEvent.java   |   11 +-
 .../internal/executor/GridExecutorService.java  |   47 +-
 .../igfs/common/IgfsControlResponse.java        |   42 +-
 .../igfs/common/IgfsDataInputStream.java        |    7 +-
 .../igfs/common/IgfsDataOutputStream.java       |    8 +-
 .../igfs/common/IgfsHandshakeRequest.java       |    6 +-
 .../internal/igfs/common/IgfsIpcCommand.java    |    5 +-
 .../ignite/internal/igfs/common/IgfsLogger.java |   34 +-
 .../internal/igfs/common/IgfsMarshaller.java    |   26 +-
 .../internal/igfs/common/IgfsMessage.java       |    2 +-
 .../igfs/common/IgfsPathControlRequest.java     |   13 +-
 .../internal/igfs/common/IgfsStatusRequest.java |    4 +-
 .../igfs/common/IgfsStreamControlRequest.java   |    6 +-
 .../ignite/internal/jdbc/JdbcConnection.java    |   47 +-
 .../internal/jdbc/JdbcConnectionInfo.java       |    2 +-
 .../internal/jdbc/JdbcDatabaseMetadata.java     |   30 +-
 .../internal/jdbc/JdbcPreparedStatement.java    |   27 +-
 .../ignite/internal/jdbc/JdbcResultSet.java     |   38 +-
 .../internal/jdbc/JdbcResultSetMetadata.java    |    7 +-
 .../ignite/internal/jdbc/JdbcStatement.java     |   25 +-
 .../apache/ignite/internal/jdbc/JdbcUtils.java  |   37 +-
 .../ignite/internal/managers/GridManager.java   |    6 +-
 .../internal/managers/GridManagerAdapter.java   |   69 +-
 .../checkpoint/GridCheckpointManager.java       |   65 +-
 .../checkpoint/GridCheckpointRequest.java       |   15 +-
 .../GridCollisionJobContextAdapter.java         |   11 +-
 .../collision/GridCollisionManager.java         |   23 +-
 .../communication/GridDisconnectListener.java   |    4 +-
 .../managers/communication/GridIoManager.java   |  128 +-
 .../managers/communication/GridIoMessage.java   |   17 +-
 .../communication/GridIoMessageFactory.java     |  140 +-
 .../managers/communication/GridIoPolicy.java    |    2 +-
 .../communication/GridIoUserMessage.java        |   31 +-
 .../GridLifecycleAwareMessageFilter.java        |   38 -
 .../communication/GridMessageListener.java      |    5 +-
 .../managers/deployment/GridDeployment.java     |   50 +-
 .../deployment/GridDeploymentClassLoader.java   |   40 +-
 .../deployment/GridDeploymentCommunication.java |   50 +-
 .../managers/deployment/GridDeploymentInfo.java |   10 +-
 .../deployment/GridDeploymentInfoBean.java      |   29 +-
 .../deployment/GridDeploymentLocalStore.java    |   59 +-
 .../deployment/GridDeploymentManager.java       |   46 +-
 .../deployment/GridDeploymentMetadata.java      |   17 +-
 .../GridDeploymentPerLoaderStore.java           |   49 +-
 .../GridDeploymentPerVersionStore.java          |   65 +-
 .../deployment/GridDeploymentRequest.java       |   24 +-
 .../deployment/GridDeploymentResponse.java      |   15 +-
 .../deployment/GridDeploymentStore.java         |   13 +-
 .../deployment/GridDeploymentStoreAdapter.java  |   20 +-
 .../protocol/gg/GridProtocolHandler.java        |   11 +-
 .../protocol/gg/GridUrlConnection.java          |   14 +-
 .../managers/discovery/CustomEventListener.java |    4 +-
 .../discovery/CustomMessageWrapper.java         |    6 +-
 .../discovery/DiscoveryCustomMessage.java       |   11 +-
 .../discovery/GridDiscoveryManager.java         |  169 +-
 .../GridDiscoveryTopologySnapshot.java          |   11 +-
 .../managers/discovery/GridLocalMetrics.java    |    4 +-
 .../eventstorage/GridEventStorageManager.java   |   98 +-
 .../eventstorage/GridEventStorageMessage.java   |   30 +-
 .../eventstorage/GridLocalEventListener.java    |    7 +-
 .../failover/GridFailoverContextImpl.java       |   22 +-
 .../managers/failover/GridFailoverManager.java  |   20 +-
 .../managers/indexing/GridIndexingManager.java  |   22 +-
 .../loadbalancer/GridLoadBalancerAdapter.java   |   12 +-
 .../loadbalancer/GridLoadBalancerManager.java   |   27 +-
 .../swapspace/GridSwapSpaceManager.java         |   46 +-
 .../internal/mxbean/IgniteStandardMXBean.java   |   21 +-
 .../portable/GridPortableMarshaller.java        |   10 +-
 .../portable/PortableAbstractLazyValue.java     |    2 +-
 .../internal/portable/PortableBuilderEnum.java  |    6 +-
 .../internal/portable/PortableBuilderImpl.java  |   34 +-
 .../portable/PortableBuilderReader.java         |   15 +-
 .../PortableBuilderSerializationAware.java      |    2 +-
 .../portable/PortableBuilderSerializer.java     |   11 +-
 .../portable/PortableClassDescriptor.java       |   43 +-
 .../internal/portable/PortableContext.java      |   74 +-
 .../portable/PortableEnumArrayLazyValue.java    |    7 +-
 .../portable/PortableLazyArrayList.java         |    7 +-
 .../portable/PortableLazyLinkedList.java        |    9 +-
 .../internal/portable/PortableLazyMap.java      |   12 +-
 .../internal/portable/PortableLazyMapEntry.java |    4 +-
 .../internal/portable/PortableLazySet.java      |    8 +-
 .../internal/portable/PortableLazyValue.java    |    2 +-
 .../portable/PortableMetaDataCollector.java     |   23 +-
 .../portable/PortableMetaDataHandler.java       |    5 +-
 .../internal/portable/PortableMetaDataImpl.java |   28 +-
 .../portable/PortableObjectArrayLazyValue.java  |    6 +-
 .../internal/portable/PortableObjectEx.java     |   21 +-
 .../internal/portable/PortableObjectImpl.java   |   36 +-
 .../portable/PortableObjectOffheapImpl.java     |   33 +-
 .../portable/PortablePlainLazyValue.java        |    2 +-
 .../portable/PortablePlainPortableObject.java   |    4 +-
 .../internal/portable/PortablePrimitives.java   |   10 +-
 .../internal/portable/PortableRawReaderEx.java  |    8 +-
 .../internal/portable/PortableRawWriterEx.java  |   10 +-
 .../portable/PortableReaderContext.java         |   13 +-
 .../internal/portable/PortableReaderExImpl.java |  109 +-
 .../PortableThreadLocalMemoryAllocator.java     |   11 +-
 .../ignite/internal/portable/PortableUtils.java |   65 +-
 .../portable/PortableValueWithType.java         |    6 +-
 .../internal/portable/PortableWriterExImpl.java |   81 +-
 .../streams/PortableAbstractInputStream.java    |    4 +-
 .../streams/PortableAbstractOutputStream.java   |    2 +-
 .../streams/PortableAbstractStream.java         |   10 +-
 .../streams/PortableHeapInputStream.java        |    4 +-
 .../streams/PortableHeapOutputStream.java       |    5 +-
 .../portable/streams/PortableInputStream.java   |    2 +-
 .../streams/PortableMemoryAllocator.java        |    2 +-
 .../streams/PortableOffheapInputStream.java     |    2 +-
 .../streams/PortableOffheapOutputStream.java    |    2 +-
 .../portable/streams/PortableOutputStream.java  |    2 +-
 .../streams/PortableSimpleMemoryAllocator.java  |    7 +-
 .../portable/streams/PortableStream.java        |    2 +-
 .../internal/processors/GridProcessor.java      |    6 +-
 .../processors/GridProcessorAdapter.java        |   23 +-
 .../affinity/AffinityTopologyVersion.java       |   16 +-
 .../affinity/GridAffinityAssignment.java        |   17 +-
 .../affinity/GridAffinityAssignmentCache.java   |   47 +-
 .../GridAffinityFunctionContextImpl.java        |   14 +-
 .../affinity/GridAffinityMessage.java           |   21 +-
 .../affinity/GridAffinityProcessor.java         |   80 +-
 .../processors/affinity/GridAffinityUtils.java  |   41 +-
 ...acheAtomicUpdateTimeoutCheckedException.java |    4 +-
 .../processors/cache/CacheEntryImpl.java        |   14 +-
 .../processors/cache/CacheEntryImpl0.java       |   11 +-
 .../processors/cache/CacheEntryImplEx.java      |   13 +-
 .../cache/CacheEntryInfoCollection.java         |   15 +-
 .../processors/cache/CacheEntryPredicate.java   |    8 +-
 .../cache/CacheEntryPredicateAdapter.java       |   13 +-
 .../cache/CacheEntryPredicateContainsValue.java |   17 +-
 .../cache/CacheEntryPredicateHasValue.java      |    2 +-
 .../cache/CacheEntryPredicateNoValue.java       |    2 +-
 .../cache/CacheEntrySerializablePredicate.java  |   14 +-
 .../cache/CacheEvictableEntryImpl.java          |   23 +-
 .../processors/cache/CacheEvictionEntry.java    |   15 +-
 .../cache/CacheInvokeDirectResult.java          |   22 +-
 .../processors/cache/CacheInvokeEntry.java      |   14 +-
 .../processors/cache/CacheInvokeResult.java     |   17 +-
 .../cache/CacheIteratorConverter.java           |    2 +-
 .../processors/cache/CacheLazyEntry.java        |   12 +-
 .../processors/cache/CacheLockImpl.java         |   21 +-
 .../processors/cache/CacheMetricsImpl.java      |   19 +-
 .../cache/CacheMetricsMXBeanImpl.java           |    6 +-
 .../processors/cache/CacheMetricsSnapshot.java  |   14 +-
 .../internal/processors/cache/CacheObject.java  |    8 +-
 .../processors/cache/CacheObjectAdapter.java    |   19 +-
 .../cache/CacheObjectByteArrayImpl.java         |   22 +-
 .../processors/cache/CacheObjectContext.java    |   11 +-
 .../processors/cache/CacheObjectImpl.java       |    7 +-
 .../processors/cache/CacheOperationContext.java |   15 +-
 .../cache/CacheOsConflictResolutionManager.java |    8 +-
 .../CachePartialUpdateCheckedException.java     |   11 +-
 .../processors/cache/CachePeekModes.java        |    4 +-
 .../cache/CacheStoreBalancingWrapper.java       |   30 +-
 .../cache/CacheStorePartialUpdateException.java |    7 +-
 .../internal/processors/cache/CacheType.java    |    5 +-
 .../cache/CacheWeakQueryIteratorsHolder.java    |   21 +-
 .../cache/DynamicCacheChangeBatch.java          |   17 +-
 .../cache/DynamicCacheChangeRequest.java        |   16 +-
 .../cache/DynamicCacheDescriptor.java           |   20 +-
 .../processors/cache/GridCacheAdapter.java      |  190 +-
 .../cache/GridCacheAffinityManager.java         |   31 +-
 .../processors/cache/GridCacheAtomicFuture.java |   14 +-
 .../cache/GridCacheAtomicVersionComparator.java |    4 +-
 .../processors/cache/GridCacheAttributes.java   |   30 +-
 .../cache/GridCacheBatchSwapEntry.java          |   11 +-
 .../cache/GridCacheClearAllRunnable.java        |   18 +-
 .../cache/GridCacheConcurrentMap.java           |   60 +-
 .../processors/cache/GridCacheContext.java      |  142 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |   29 +-
 .../cache/GridCacheDeploymentManager.java       |   68 +-
 .../processors/cache/GridCacheEntryEx.java      |   34 +-
 .../processors/cache/GridCacheEntryInfo.java    |   20 +-
 .../GridCacheEntryInfoCollectSwapListener.java  |   10 +-
 .../processors/cache/GridCacheEntrySet.java     |   22 +-
 .../processors/cache/GridCacheEventManager.java |   30 +-
 .../cache/GridCacheEvictionManager.java         |  121 +-
 .../cache/GridCacheEvictionRequest.java         |   28 +-
 .../cache/GridCacheEvictionResponse.java        |   22 +-
 .../cache/GridCacheExplicitLockSpan.java        |   28 +-
 .../cache/GridCacheFilterFailedException.java   |    4 +-
 .../processors/cache/GridCacheFuture.java       |   14 +-
 .../processors/cache/GridCacheGateway.java      |   24 +-
 .../cache/GridCacheIndexUpdateException.java    |    6 +-
 .../processors/cache/GridCacheInternal.java     |    2 +-
 .../processors/cache/GridCacheIoManager.java    |   92 +-
 .../processors/cache/GridCacheIterator.java     |   14 +-
 .../processors/cache/GridCacheKeySet.java       |   18 +-
 .../cache/GridCacheLoaderWriterStore.java       |   22 +-
 .../GridCacheLoaderWriterStoreFactory.java      |   12 +-
 .../processors/cache/GridCacheLogger.java       |   23 +-
 .../processors/cache/GridCacheManager.java      |    6 +-
 .../cache/GridCacheManagerAdapter.java          |   12 +-
 .../processors/cache/GridCacheMapEntry.java     |   85 +-
 .../cache/GridCacheMapEntryFactory.java         |    6 +-
 .../processors/cache/GridCacheMessage.java      |   37 +-
 .../cache/GridCacheMultiTxFuture.java           |   25 +-
 .../processors/cache/GridCacheMvcc.java         |   32 +-
 .../processors/cache/GridCacheMvccCallback.java |    4 +-
 .../cache/GridCacheMvccCandidate.java           |   47 +-
 .../processors/cache/GridCacheMvccFuture.java   |    2 +-
 .../processors/cache/GridCacheMvccManager.java  |  140 +-
 .../cache/GridCacheOffheapSwapEntry.java        |   15 +-
 .../GridCachePartitionExchangeManager.java      |  108 +-
 .../processors/cache/GridCachePreloader.java    |   16 +-
 .../cache/GridCachePreloaderAdapter.java        |   21 +-
 .../processors/cache/GridCacheProcessor.java    |  209 +-
 .../processors/cache/GridCacheProxyImpl.java    |   54 +-
 .../processors/cache/GridCacheReturn.java       |   35 +-
 .../cache/GridCacheSharedContext.java           |   74 +-
 .../cache/GridCacheSharedManager.java           |    6 +-
 .../cache/GridCacheSharedManagerAdapter.java    |   12 +-
 .../processors/cache/GridCacheSwapEntry.java    |    8 +-
 .../cache/GridCacheSwapEntryImpl.java           |   20 +-
 .../processors/cache/GridCacheSwapListener.java |    4 +-
 .../processors/cache/GridCacheSwapManager.java  |   75 +-
 .../cache/GridCacheTryPutFailedException.java   |    4 +-
 .../processors/cache/GridCacheTtlManager.java   |   24 +-
 .../cache/GridCacheUpdateAtomicResult.java      |   16 +-
 .../cache/GridCacheUpdateTxResult.java          |    8 +-
 .../processors/cache/GridCacheUtilityKey.java   |    4 +-
 .../processors/cache/GridCacheUtils.java        |  130 +-
 .../cache/GridCacheValueCollection.java         |   22 +-
 .../cache/GridLoadCacheCloseablePredicate.java  |   30 -
 .../cache/IgniteCacheExpiryPolicy.java          |   15 +-
 .../processors/cache/IgniteCacheFutureImpl.java |   17 +-
 .../processors/cache/IgniteCacheProxy.java      |   96 +-
 .../processors/cache/IgniteInternalCache.java   |   53 +-
 .../processors/cache/KeyCacheObject.java        |    2 +-
 .../processors/cache/KeyCacheObjectImpl.java    |    6 +-
 .../processors/cache/QueryCursorImpl.java       |   14 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   28 +-
 .../cache/affinity/GridCacheAffinityProxy.java  |   22 +-
 .../CacheDataStructuresManager.java             |   78 +-
 .../distributed/GridCacheCommittedTxInfo.java   |   22 +-
 .../distributed/GridCacheMappedVersion.java     |    6 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |   30 +-
 .../distributed/GridCacheTxFinishSync.java      |   27 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |   40 +-
 .../distributed/GridCacheTxRecoveryRequest.java |   18 +-
 .../GridCacheTxRecoveryResponse.java            |   16 +-
 .../distributed/GridDistributedBaseMessage.java |   32 +-
 .../GridDistributedCacheAdapter.java            |   72 +-
 .../distributed/GridDistributedCacheEntry.java  |   35 +-
 .../distributed/GridDistributedLockRequest.java |   40 +-
 .../GridDistributedLockResponse.java            |   36 +-
 .../GridDistributedTxFinishRequest.java         |   24 +-
 .../GridDistributedTxFinishResponse.java        |   18 +-
 .../distributed/GridDistributedTxMapping.java   |   34 +-
 .../GridDistributedTxPrepareRequest.java        |   42 +-
 .../GridDistributedTxPrepareResponse.java       |   21 +-
 .../GridDistributedTxRemoteAdapter.java         |   85 +-
 .../GridDistributedUnlockRequest.java           |   26 +-
 .../GridFutureRemapTimeoutObject.java           |   13 +-
 .../IgniteExternalizableExpiryPolicy.java       |   18 +-
 .../dht/GridClientPartitionTopology.java        |   48 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   16 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   29 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |   37 +-
 .../cache/distributed/dht/GridDhtCache.java     |   15 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   95 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   49 +-
 .../distributed/dht/GridDhtEmbeddedFuture.java  |   16 +-
 .../distributed/dht/GridDhtFinishedFuture.java  |   10 +-
 .../cache/distributed/dht/GridDhtFuture.java    |    7 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   52 +-
 .../dht/GridDhtInvalidPartitionException.java   |    2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   73 +-
 .../distributed/dht/GridDhtLockFuture.java      |   84 +-
 .../distributed/dht/GridDhtLockRequest.java     |   47 +-
 .../distributed/dht/GridDhtLockResponse.java    |   38 +-
 .../dht/GridDhtOffHeapCacheEntry.java           |    9 +-
 .../distributed/dht/GridDhtPartitionState.java  |    4 +-
 .../dht/GridDhtPartitionTopology.java           |   22 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   59 +-
 .../dht/GridDhtPartitionsReservation.java       |   16 +-
 .../distributed/dht/GridDhtTopologyFuture.java  |    8 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   92 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   52 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   34 +-
 .../dht/GridDhtTxFinishResponse.java            |   18 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   65 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   79 +-
 .../cache/distributed/dht/GridDhtTxMapping.java |   21 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   99 +-
 .../dht/GridDhtTxPrepareRequest.java            |   45 +-
 .../dht/GridDhtTxPrepareResponse.java           |   40 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   49 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |   25 +-
 .../GridDhtUnreservedPartitionException.java    |    6 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   20 +-
 .../dht/GridPartitionedGetFuture.java           |   72 +-
 .../cache/distributed/dht/GridReservable.java   |    2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  144 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   14 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |   22 +-
 .../atomic/GridDhtAtomicOffHeapCacheEntry.java  |    9 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   66 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   46 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   32 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 1312 +++++------
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   58 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   41 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   78 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   13 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   81 +-
 .../GridDhtColocatedOffHeapCacheEntry.java      |    9 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |   17 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   70 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   33 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   34 +-
 .../GridDhtPartitionDemandMessage.java          |   30 +-
 .../preloader/GridDhtPartitionExchangeId.java   |   31 +-
 .../dht/preloader/GridDhtPartitionFullMap.java  |   16 +-
 .../dht/preloader/GridDhtPartitionMap.java      |   22 +-
 .../GridDhtPartitionSupplyMessage.java          |   35 +-
 .../GridDhtPartitionsAbstractMessage.java       |   18 +-
 .../GridDhtPartitionsExchangeFuture.java        |  185 +-
 .../preloader/GridDhtPartitionsFullMessage.java |   30 +-
 .../GridDhtPartitionsSingleMessage.java         |   27 +-
 .../GridDhtPartitionsSingleRequest.java         |   12 +-
 .../dht/preloader/GridDhtPreloader.java         |   72 +-
 .../preloader/GridDhtPreloaderAssignments.java  |   12 +-
 .../distributed/near/CacheVersionedValue.java   |   21 +-
 .../distributed/near/GridNearAtomicCache.java   |   75 +-
 .../distributed/near/GridNearCacheAdapter.java  |   72 +-
 .../near/GridNearCacheClearAllRunnable.java     |    9 +-
 .../distributed/near/GridNearCacheEntry.java    |   40 +-
 .../distributed/near/GridNearGetFuture.java     |   77 +-
 .../distributed/near/GridNearGetRequest.java    |   43 +-
 .../distributed/near/GridNearGetResponse.java   |   40 +-
 .../distributed/near/GridNearLockFuture.java    |   78 +-
 .../distributed/near/GridNearLockMapping.java   |   17 +-
 .../distributed/near/GridNearLockRequest.java   |   40 +-
 .../distributed/near/GridNearLockResponse.java  |   33 +-
 .../near/GridNearOffHeapCacheEntry.java         |    7 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   74 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   54 +-
 .../near/GridNearTransactionalCache.java        |   64 +-
 .../near/GridNearTxFinishFuture.java            |   58 +-
 .../near/GridNearTxFinishRequest.java           |   26 +-
 .../near/GridNearTxFinishResponse.java          |   26 +-
 .../cache/distributed/near/GridNearTxLocal.java |   90 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |   47 +-
 .../near/GridNearTxPrepareRequest.java          |   37 +-
 .../near/GridNearTxPrepareResponse.java         |   45 +-
 .../distributed/near/GridNearTxRemote.java      |   39 +-
 .../distributed/near/GridNearUnlockRequest.java |   14 +-
 .../cache/dr/GridCacheDrExpirationInfo.java     |    8 +-
 .../processors/cache/dr/GridCacheDrInfo.java    |   15 +-
 .../processors/cache/dr/GridCacheDrManager.java |   16 +-
 .../cache/dr/GridOsCacheDrManager.java          |   18 +-
 .../extras/GridCacheAttributesEntryExtras.java  |    8 +-
 .../GridCacheAttributesMvccEntryExtras.java     |   10 +-
 ...dCacheAttributesMvccObsoleteEntryExtras.java |   10 +-
 ...cheAttributesMvccObsoleteTtlEntryExtras.java |   10 +-
 .../GridCacheAttributesMvccTtlEntryExtras.java  |   10 +-
 .../GridCacheAttributesObsoleteEntryExtras.java |    8 +-
 ...idCacheAttributesObsoleteTtlEntryExtras.java |    8 +-
 .../GridCacheAttributesTtlEntryExtras.java      |    8 +-
 .../cache/extras/GridCacheEntryExtras.java      |    8 +-
 .../extras/GridCacheEntryExtrasAdapter.java     |    6 +-
 .../cache/extras/GridCacheMvccEntryExtras.java  |    8 +-
 .../GridCacheMvccObsoleteEntryExtras.java       |    8 +-
 .../GridCacheMvccObsoleteTtlEntryExtras.java    |    8 +-
 .../extras/GridCacheMvccTtlEntryExtras.java     |    7 +-
 .../extras/GridCacheObsoleteEntryExtras.java    |    8 +-
 .../extras/GridCacheObsoleteTtlEntryExtras.java |    8 +-
 .../cache/extras/GridCacheTtlEntryExtras.java   |    8 +-
 .../cache/jta/CacheJtaManagerAdapter.java       |   11 +-
 .../cache/jta/CacheNoopJtaManager.java          |    8 +-
 .../processors/cache/local/GridLocalCache.java  |   43 +-
 .../cache/local/GridLocalCacheEntry.java        |   21 +-
 .../cache/local/GridLocalLockCallback.java      |    4 +-
 .../cache/local/GridLocalLockFuture.java        |   42 +-
 .../local/atomic/GridLocalAtomicCache.java      |   91 +-
 .../CacheDefaultPortableAffinityKeyMapper.java  |   12 +-
 .../portable/CacheObjectPortableContext.java    |   23 +-
 .../portable/CacheObjectPortableProcessor.java  |   18 +-
 .../CacheObjectPortableProcessorImpl.java       |  138 +-
 .../cache/portable/IgnitePortablesImpl.java     |   19 +-
 .../cache/portable/PortableMetaDataKey.java     |   12 +-
 .../processors/cache/query/CacheQuery.java      |   18 +-
 .../CacheQueryCloseableScanBiPredicate.java     |   30 -
 .../cache/query/CacheQueryFuture.java           |   11 +-
 .../processors/cache/query/CacheQueryType.java  |    2 +-
 .../GridCacheDistributedFieldsQueryFuture.java  |   20 +-
 .../query/GridCacheDistributedQueryFuture.java  |   25 +-
 .../query/GridCacheDistributedQueryManager.java |   58 +-
 .../query/GridCacheLocalFieldsQueryFuture.java  |   17 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |   18 +-
 .../cache/query/GridCacheLocalQueryManager.java |   17 +-
 .../cache/query/GridCacheQueryAdapter.java      |   65 +-
 .../cache/query/GridCacheQueryBean.java         |    9 +-
 .../cache/query/GridCacheQueryErrorFuture.java  |   13 +-
 .../query/GridCacheQueryFutureAdapter.java      |   43 +-
 .../cache/query/GridCacheQueryInfo.java         |   12 +-
 .../cache/query/GridCacheQueryManager.java      |  155 +-
 .../query/GridCacheQueryMetadataAware.java      |    9 +-
 .../query/GridCacheQueryMetricsAdapter.java     |   12 +-
 .../cache/query/GridCacheQueryMetricsKey.java   |   14 +-
 .../cache/query/GridCacheQueryRequest.java      |   41 +-
 .../cache/query/GridCacheQueryResponse.java     |   34 +-
 .../query/GridCacheQueryResponseEntry.java      |   12 +-
 .../cache/query/GridCacheQueryType.java         |    4 +-
 .../cache/query/GridCacheSqlIndexMetadata.java  |    6 +-
 .../cache/query/GridCacheSqlMetadata.java       |   12 +-
 .../cache/query/GridCacheSqlQuery.java          |   24 +-
 .../cache/query/GridCacheTwoStepQuery.java      |   11 +-
 .../processors/cache/query/QueryCursorEx.java   |   11 +-
 .../continuous/CacheContinuousQueryEntry.java   |   29 +-
 .../continuous/CacheContinuousQueryEvent.java   |   14 +-
 .../CacheContinuousQueryFilterEx.java           |   31 -
 .../continuous/CacheContinuousQueryHandler.java |   60 +-
 .../CacheContinuousQueryListener.java           |    2 +-
 .../continuous/CacheContinuousQueryManager.java |   73 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   46 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   62 +-
 .../jdbc/GridCacheQueryJdbcValidationTask.java  |   25 +-
 .../processors/cache/store/CacheLocalStore.java |    8 +-
 .../cache/store/CacheOsStoreManager.java        |    8 +-
 .../cache/store/CacheStoreManager.java          |   24 +-
 .../store/GridCacheStoreManagerAdapter.java     |   69 +-
 .../cache/store/GridCacheWriteBehindStore.java  |   55 +-
 .../cache/transactions/IgniteInternalTx.java    |   40 +-
 .../transactions/IgniteTransactionsImpl.java    |   24 +-
 .../cache/transactions/IgniteTxAdapter.java     |  114 +-
 .../cache/transactions/IgniteTxEntry.java       |   61 +-
 .../cache/transactions/IgniteTxHandler.java     |   90 +-
 .../cache/transactions/IgniteTxKey.java         |   20 +-
 .../transactions/IgniteTxLocalAdapter.java      |  131 +-
 .../cache/transactions/IgniteTxLocalEx.java     |   26 +-
 .../cache/transactions/IgniteTxManager.java     |  119 +-
 .../cache/transactions/IgniteTxMap.java         |   23 +-
 .../cache/transactions/IgniteTxRemoteEx.java    |    7 +-
 .../transactions/TransactionMetricsAdapter.java |   13 +-
 .../cache/transactions/TransactionProxy.java    |    4 +-
 .../transactions/TransactionProxyImpl.java      |   38 +-
 .../cache/transactions/TxEntryValueHolder.java  |   31 +-
 .../version/CacheVersionConflictResolver.java   |    4 +-
 .../version/GridCachePlainVersionedEntry.java   |    6 +-
 .../version/GridCacheRawVersionedEntry.java     |   29 +-
 .../cache/version/GridCacheVersion.java         |   20 +-
 .../cache/version/GridCacheVersionAware.java    |    2 +-
 .../GridCacheVersionConflictContext.java        |   10 +-
 .../cache/version/GridCacheVersionEx.java       |   13 +-
 .../cache/version/GridCacheVersionManager.java  |   26 +-
 .../cache/version/GridCacheVersionable.java     |    2 +-
 .../cache/version/GridCacheVersionedEntry.java  |    4 +-
 .../version/GridCacheVersionedEntryEx.java      |    2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   18 +-
 .../IgniteCacheObjectProcessorImpl.java         |   46 +-
 .../clock/GridClockDeltaSnapshot.java           |   20 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |   21 +-
 .../processors/clock/GridClockDeltaVersion.java |   16 +-
 .../processors/clock/GridClockMessage.java      |   10 +-
 .../processors/clock/GridClockServer.java       |   24 +-
 .../processors/clock/GridClockSource.java       |    2 +-
 .../clock/GridClockSyncProcessor.java           |   52 +-
 .../processors/clock/GridJvmClockSource.java    |    2 +-
 .../processors/closure/AffinityTask.java        |    4 +-
 .../processors/closure/GridClosurePolicy.java   |    4 +-
 .../closure/GridClosureProcessor.java           |   80 +-
 .../closure/GridPeerDeployAwareTaskAdapter.java |   10 +-
 .../processors/cluster/ClusterProcessor.java    |   12 +-
 .../continuous/AbstractContinuousMessage.java   |    9 +-
 .../continuous/GridContinuousHandler.java       |   14 +-
 .../continuous/GridContinuousMessage.java       |   30 +-
 .../continuous/GridContinuousMessageType.java   |    4 +-
 .../continuous/GridContinuousProcessor.java     |   96 +-
 .../processors/continuous/StartRequestData.java |   23 +-
 .../StartRoutineAckDiscoveryMessage.java        |   15 +-
 .../StartRoutineDiscoveryMessage.java           |   13 +-
 .../StopRoutineAckDiscoveryMessage.java         |   11 +-
 .../continuous/StopRoutineDiscoveryMessage.java |   11 +-
 .../datastreamer/DataStreamProcessor.java       |   48 +-
 .../datastreamer/DataStreamerCacheUpdaters.java |   20 +-
 .../datastreamer/DataStreamerEntry.java         |   19 +-
 .../datastreamer/DataStreamerFuture.java        |   10 +-
 .../datastreamer/DataStreamerImpl.java          |  125 +-
 .../datastreamer/DataStreamerRequest.java       |   30 +-
 .../datastreamer/DataStreamerResponse.java      |   11 +-
 .../datastreamer/DataStreamerUpdateJob.java     |   25 +-
 .../CacheDataStructuresCacheKey.java            |   10 +-
 .../CacheDataStructuresConfigurationKey.java    |   10 +-
 .../datastructures/DataStructuresProcessor.java |  103 +-
 .../GridAtomicCacheQueueImpl.java               |   20 +-
 .../GridCacheAnnotationHelper.java              |   23 +-
 .../datastructures/GridCacheAtomicLongEx.java   |    4 +-
 .../datastructures/GridCacheAtomicLongImpl.java |   39 +-
 .../GridCacheAtomicLongValue.java               |   12 +-
 .../GridCacheAtomicReferenceEx.java             |    4 +-
 .../GridCacheAtomicReferenceImpl.java           |   38 +-
 .../GridCacheAtomicReferenceValue.java          |   14 +-
 .../GridCacheAtomicSequenceEx.java              |    4 +-
 .../GridCacheAtomicSequenceImpl.java            |   52 +-
 .../GridCacheAtomicSequenceValue.java           |   12 +-
 .../GridCacheAtomicStampedEx.java               |    4 +-
 .../GridCacheAtomicStampedImpl.java             |   44 +-
 .../GridCacheAtomicStampedValue.java            |   18 +-
 .../GridCacheCountDownLatchEx.java              |    4 +-
 .../GridCacheCountDownLatchImpl.java            |   44 +-
 .../GridCacheCountDownLatchValue.java           |   12 +-
 .../datastructures/GridCacheInternalKey.java    |    4 +-
 .../GridCacheInternalKeyImpl.java               |   15 +-
 .../datastructures/GridCacheQueueAdapter.java   |   49 +-
 .../datastructures/GridCacheQueueHeader.java    |   24 +-
 .../datastructures/GridCacheQueueHeaderKey.java |   13 +-
 .../datastructures/GridCacheQueueItemKey.java   |   15 +-
 .../datastructures/GridCacheQueueProxy.java     |   33 +-
 .../datastructures/GridCacheRemovable.java      |    2 +-
 .../datastructures/GridCacheSetHeader.java      |   15 +-
 .../datastructures/GridCacheSetHeaderKey.java   |   13 +-
 .../datastructures/GridCacheSetImpl.java        |   57 +-
 .../datastructures/GridCacheSetItemKey.java     |   17 +-
 .../datastructures/GridCacheSetProxy.java       |   34 +-
 .../datastructures/GridSetQueryPredicate.java   |   19 +-
 .../GridTransactionalCacheQueueImpl.java        |   28 +-
 .../internal/processors/dr/GridDrType.java      |    2 +-
 .../dr/IgniteDrDataStreamerCacheUpdater.java    |   40 +-
 .../internal/processors/hadoop/Hadoop.java      |   12 +-
 .../processors/hadoop/HadoopFileBlock.java      |   16 +-
 .../processors/hadoop/HadoopInputSplit.java     |    4 +-
 .../internal/processors/hadoop/HadoopJob.java   |    8 +-
 .../internal/processors/hadoop/HadoopJobId.java |   14 +-
 .../processors/hadoop/HadoopJobInfo.java        |   10 +-
 .../processors/hadoop/HadoopJobPhase.java       |    2 +-
 .../processors/hadoop/HadoopJobProperty.java    |    4 +-
 .../processors/hadoop/HadoopJobStatus.java      |   11 +-
 .../processors/hadoop/HadoopMapReducePlan.java  |   10 +-
 .../hadoop/HadoopMapReducePlanner.java          |   11 +-
 .../processors/hadoop/HadoopNoopProcessor.java  |   13 +-
 .../processors/hadoop/HadoopPartitioner.java    |    2 +-
 .../hadoop/HadoopProcessorAdapter.java          |   13 +-
 .../processors/hadoop/HadoopSerialization.java  |   10 +-
 .../internal/processors/hadoop/HadoopTask.java  |    7 +-
 .../processors/hadoop/HadoopTaskContext.java    |   12 +-
 .../processors/hadoop/HadoopTaskInfo.java       |   12 +-
 .../processors/hadoop/HadoopTaskInput.java      |    7 +-
 .../processors/hadoop/HadoopTaskOutput.java     |    4 +-
 .../processors/hadoop/HadoopTaskType.java       |    4 +-
 .../hadoop/counter/HadoopCounter.java           |    2 +-
 .../hadoop/counter/HadoopCounterWriter.java     |    6 +-
 .../hadoop/counter/HadoopCounters.java          |    4 +-
 .../processors/igfs/IgfsAckMessage.java         |   20 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |   34 +-
 .../processors/igfs/IgfsAttributes.java         |   16 +-
 .../internal/processors/igfs/IgfsBlockKey.java  |   26 +-
 .../processors/igfs/IgfsBlockLocationImpl.java  |   28 +-
 .../processors/igfs/IgfsBlocksMessage.java      |   17 +-
 .../processors/igfs/IgfsClientSession.java      |   13 +-
 .../igfs/IgfsCommunicationMessage.java          |   15 +-
 .../internal/processors/igfs/IgfsContext.java   |   23 +-
 .../processors/igfs/IgfsDataManager.java        |  117 +-
 .../processors/igfs/IgfsDeleteMessage.java      |   22 +-
 .../processors/igfs/IgfsDeleteWorker.java       |   46 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |   19 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |   27 +-
 .../internal/processors/igfs/IgfsFileImpl.java  |   22 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |   29 +-
 .../internal/processors/igfs/IgfsFileMap.java   |   28 +-
 .../processors/igfs/IgfsFileWorkerBatch.java    |   18 +-
 .../igfs/IgfsFragmentizerManager.java           |   71 +-
 .../igfs/IgfsFragmentizerRequest.java           |   21 +-
 .../igfs/IgfsFragmentizerResponse.java          |   12 +-
 .../processors/igfs/IgfsHandshakeResponse.java  |   10 +-
 .../internal/processors/igfs/IgfsHelper.java    |    6 +-
 .../processors/igfs/IgfsHelperImpl.java         |   14 +-
 .../internal/processors/igfs/IgfsImpl.java      |  134 +-
 .../processors/igfs/IgfsInputStreamAdapter.java |    9 +-
 .../igfs/IgfsInputStreamDescriptor.java         |    7 +-
 .../processors/igfs/IgfsInputStreamImpl.java    |   39 +-
 .../igfs/IgfsInvalidRangeException.java         |    4 +-
 .../processors/igfs/IgfsIpcHandler.java         |   45 +-
 .../internal/processors/igfs/IgfsJobImpl.java   |   24 +-
 .../processors/igfs/IgfsListingEntry.java       |   15 +-
 .../processors/igfs/IgfsLocalMetrics.java       |    8 +-
 .../internal/processors/igfs/IgfsManager.java   |    8 +-
 .../processors/igfs/IgfsMetaManager.java        |   99 +-
 .../processors/igfs/IgfsMetricsAdapter.java     |   12 +-
 .../processors/igfs/IgfsModeResolver.java       |   20 +-
 .../processors/igfs/IgfsNoopHelper.java         |    6 +-
 .../processors/igfs/IgfsNoopProcessor.java      |   23 +-
 .../igfs/IgfsOutputStreamAdapter.java           |   18 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |   40 +-
 .../internal/processors/igfs/IgfsPaths.java     |   21 +-
 .../internal/processors/igfs/IgfsProcessor.java |   67 +-
 .../processors/igfs/IgfsProcessorAdapter.java   |   22 +-
 .../processors/igfs/IgfsSamplingKey.java        |   15 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |   19 +-
 .../IgfsSecondaryInputStreamDescriptor.java     |    4 +-
 .../IgfsSecondaryOutputStreamDescriptor.java    |    7 +-
 .../internal/processors/igfs/IgfsServer.java    |   47 +-
 .../processors/igfs/IgfsServerHandler.java      |   13 +-
 .../processors/igfs/IgfsServerManager.java      |   35 +-
 .../internal/processors/igfs/IgfsStatus.java    |    7 +-
 .../processors/igfs/IgfsSyncMessage.java        |   12 +-
 .../processors/igfs/IgfsTaskArgsImpl.java       |   18 +-
 .../internal/processors/igfs/IgfsThread.java    |    4 +-
 .../internal/processors/igfs/IgfsUtils.java     |   40 +-
 .../processors/job/GridJobEventListener.java    |    4 +-
 .../processors/job/GridJobHoldListener.java     |    4 +-
 .../processors/job/GridJobProcessor.java        |  112 +-
 .../internal/processors/job/GridJobWorker.java  |   75 +-
 .../processors/jobmetrics/GridJobMetrics.java   |    4 +-
 .../jobmetrics/GridJobMetricsProcessor.java     |   21 +-
 .../jobmetrics/GridJobMetricsSnapshot.java      |    5 +-
 .../DiscoveryNodeValidationProcessor.java       |    4 +-
 .../OsDiscoveryNodeValidationProcessor.java     |   19 +-
 .../offheap/GridOffHeapProcessor.java           |   34 +-
 .../platform/PlatformAwareEventFilter.java      |   39 -
 .../processors/platform/PlatformContext.java    |   59 +-
 .../platform/PlatformEventFilterListener.java   |   39 +
 .../platform/PlatformLocalEventListener.java    |   28 -
 .../platform/PlatformNoopProcessor.java         |   73 +-
 .../processors/platform/PlatformProcessor.java  |  116 +-
 .../processors/platform/PlatformTarget.java     |   78 +-
 .../cache/PlatformCacheEntryFilter.java         |   13 +-
 .../cache/PlatformCacheEntryProcessor.java      |   27 +
 .../cache/query/PlatformContinuousQuery.java    |   15 +-
 .../query/PlatformContinuousQueryFilter.java    |   30 +
 .../callback/PlatformCallbackGateway.java       |   89 +-
 .../callback/PlatformCallbackUtils.java         |   23 +-
 .../cluster/PlatformClusterNodeFilter.java      |   28 +
 .../platform/compute/PlatformJob.java           |    4 +-
 .../datastreamer/PlatformStreamReceiver.java    |   27 +
 .../platform/memory/PlatformInputStream.java    |    4 +-
 .../platform/memory/PlatformMemory.java         |    2 +-
 .../platform/memory/PlatformMemoryManager.java  |    2 +-
 .../platform/memory/PlatformOutputStream.java   |    4 +-
 .../platform/message/PlatformMessageFilter.java |   40 +
 .../platform/services/PlatformService.java      |    6 +-
 .../processors/plugin/CachePluginManager.java   |   33 +-
 .../plugin/IgnitePluginProcessor.java           |   37 +-
 .../processors/port/GridPortListener.java       |    4 +-
 .../processors/port/GridPortProcessor.java      |   21 +-
 .../processors/port/GridPortRecord.java         |    6 +-
 .../query/GridQueryCacheObjectsIterator.java    |    9 +-
 .../query/GridQueryFieldMetadata.java           |    4 +-
 .../processors/query/GridQueryFieldsResult.java |    7 +-
 .../query/GridQueryFieldsResultAdapter.java     |   10 +-
 .../query/GridQueryIndexDescriptor.java         |    4 +-
 .../processors/query/GridQueryIndexType.java    |    2 +-
 .../processors/query/GridQueryIndexing.java     |   36 +-
 .../processors/query/GridQueryProcessor.java    |   99 +-
 .../query/GridQueryTypeDescriptor.java          |    7 +-
 .../messages/GridQueryCancelRequest.java        |   11 +-
 .../twostep/messages/GridQueryFailResponse.java |   11 +-
 .../messages/GridQueryNextPageRequest.java      |   11 +-
 .../messages/GridQueryNextPageResponse.java     |   22 +-
 .../h2/twostep/messages/GridQueryRequest.java   |   26 +-
 .../resource/GridNoImplicitInjection.java       |    2 +-
 .../resource/GridResourceBasicInjector.java     |    8 +-
 .../processors/resource/GridResourceField.java  |   13 +-
 .../resource/GridResourceInjector.java          |    6 +-
 .../processors/resource/GridResourceIoc.java    |   34 +-
 .../GridResourceJobContextInjector.java         |    9 +-
 .../resource/GridResourceLoggerInjector.java    |    9 +-
 .../processors/resource/GridResourceMethod.java |   11 +-
 .../resource/GridResourceProcessor.java         |   54 +-
 .../resource/GridResourceServiceInjector.java   |   14 +-
 .../processors/resource/GridResourceUtils.java  |   13 +-
 .../resource/GridSpringResourceContext.java     |    5 +-
 .../processors/rest/GridRestCommand.java        |    8 +-
 .../processors/rest/GridRestProcessor.java      |   84 +-
 .../processors/rest/GridRestProtocol.java       |    9 +-
 .../rest/GridRestProtocolHandler.java           |    8 +-
 .../processors/rest/GridRestResponse.java       |   15 +-
 .../message/GridClientAbstractMessage.java      |   13 +-
 .../GridClientAuthenticationRequest.java        |    9 +-
 .../client/message/GridClientCacheRequest.java  |   15 +-
 .../message/GridClientHandshakeRequest.java     |    7 +-
 .../message/GridClientHandshakeResponse.java    |    4 +-
 .../rest/client/message/GridClientMessage.java  |    6 +-
 .../rest/client/message/GridClientNodeBean.java |   15 +-
 .../message/GridClientNodeMetricsBean.java      |    7 +-
 .../client/message/GridClientPingPacket.java    |    4 +-
 .../message/GridClientPortableMetaData.java     |    7 +-
 .../rest/client/message/GridClientResponse.java |    9 +-
 .../client/message/GridClientTaskRequest.java   |    9 +-
 .../message/GridClientTaskResultBean.java       |   10 +-
 .../message/GridClientTopologyRequest.java      |   11 +-
 .../rest/client/message/GridRouterRequest.java  |    9 +-
 .../rest/client/message/GridRouterResponse.java |    9 +-
 .../rest/handlers/GridRestCommandHandler.java   |   12 +-
 .../handlers/GridRestCommandHandlerAdapter.java |    6 +-
 .../handlers/cache/GridCacheCommandHandler.java |  103 +-
 .../handlers/cache/GridCacheRestMetrics.java    |    7 +-
 .../handlers/cache/GridCacheRestResponse.java   |   12 +-
 .../DataStructuresCommandHandler.java           |   32 +-
 .../query/CacheQueryFieldsMetaResult.java       |   12 +-
 .../rest/handlers/query/CacheQueryResult.java   |   13 +-
 .../handlers/query/QueryCommandHandler.java     |   48 +-
 .../handlers/task/GridTaskCommandHandler.java   |  102 +-
 .../handlers/task/GridTaskResultRequest.java    |   15 +-
 .../handlers/task/GridTaskResultResponse.java   |   13 +-
 .../top/GridTopologyCommandHandler.java         |   61 +-
 .../version/GridVersionCommandHandler.java      |   24 +-
 .../rest/protocols/GridRestProtocolAdapter.java |   36 +-
 .../protocols/tcp/GridClientPacketType.java     |    2 +-
 .../protocols/tcp/GridMemcachedMessage.java     |   12 +-
 .../tcp/GridTcpMemcachedNioListener.java        |   65 +-
 .../protocols/tcp/GridTcpRestNioListener.java   |   83 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   62 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   63 +-
 .../rest/request/DataStructuresRequest.java     |    2 +-
 .../rest/request/GridRestCacheRequest.java      |    7 +-
 .../rest/request/GridRestLogRequest.java        |    4 +-
 .../rest/request/GridRestRequest.java           |   13 +-
 .../rest/request/GridRestTaskRequest.java       |    7 +-
 .../rest/request/GridRestTopologyRequest.java   |    7 +-
 .../rest/request/RestSqlQueryRequest.java       |    2 +-
 .../schedule/GridScheduleStatistics.java        |    5 +-
 .../schedule/IgniteNoopScheduleProcessor.java   |   11 +-
 .../IgniteScheduleProcessorAdapter.java         |   11 +-
 .../security/GridSecurityProcessor.java         |   19 +-
 .../processors/security/SecurityContext.java    |    5 +-
 .../security/os/GridOsSecurityProcessor.java    |   25 +-
 .../segmentation/GridSegmentationProcessor.java |    4 +-
 .../os/GridOsSegmentationProcessor.java         |    8 +-
 .../service/GridServiceAssignments.java         |   22 +-
 .../service/GridServiceAssignmentsKey.java      |    6 +-
 .../service/GridServiceDeployment.java          |   13 +-
 .../service/GridServiceDeploymentFuture.java    |    8 +-
 .../service/GridServiceDeploymentKey.java       |    6 +-
 .../GridServiceMethodNotFoundException.java     |    7 +-
 .../service/GridServiceMethodReflectKey.java    |    4 +-
 .../service/GridServiceNotFoundException.java   |    4 +-
 .../service/GridServiceProcessor.java           |  105 +-
 .../processors/service/GridServiceProxy.java    |   54 +-
 .../processors/service/ServiceContextImpl.java  |   20 +-
 .../service/ServiceDescriptorImpl.java          |   15 +-
 .../session/GridTaskSessionProcessor.java       |   28 +-
 .../internal/processors/task/GridInternal.java  |    8 +-
 .../processors/task/GridTaskEventListener.java  |    8 +-
 .../processors/task/GridTaskProcessor.java      |   99 +-
 .../task/GridTaskThreadContextKey.java          |    2 +-
 .../processors/task/GridTaskWorker.java         |  113 +-
 .../timeout/GridSpiTimeoutObject.java           |   10 +-
 .../processors/timeout/GridTimeoutObject.java   |    4 +-
 .../timeout/GridTimeoutObjectAdapter.java       |    6 +-
 .../timeout/GridTimeoutProcessor.java           |   29 +-
 .../internal/tck/TCKMBeanServerBuilder.java     |   14 +-
 .../IgniteTxHeuristicCheckedException.java      |    4 +-
 .../IgniteTxOptimisticCheckedException.java     |    4 +-
 .../IgniteTxRollbackCheckedException.java       |    4 +-
 .../IgniteTxTimeoutCheckedException.java        |    4 +-
 .../org/apache/ignite/internal/util/F0.java     |   29 +-
 .../internal/util/GridAnnotationsCache.java     |   17 +-
 .../ignite/internal/util/GridArgumentCheck.java |    7 +-
 .../internal/util/GridAtomicInitializer.java    |   12 +-
 .../ignite/internal/util/GridAtomicInteger.java |    7 +-
 .../ignite/internal/util/GridAtomicLong.java    |    7 +-
 .../GridBoundedConcurrentLinkedHashMap.java     |    8 +-
 .../GridBoundedConcurrentLinkedHashSet.java     |   18 +-
 .../util/GridBoundedConcurrentOrderedMap.java   |   18 +-
 .../util/GridBoundedConcurrentOrderedSet.java   |    9 +-
 .../internal/util/GridBoundedLinkedHashMap.java |    5 +-
 .../internal/util/GridBoundedLinkedHashSet.java |    7 +-
 .../ignite/internal/util/GridBusyLock.java      |    7 +-
 .../ignite/internal/util/GridByteArrayList.java |   26 +-
 .../internal/util/GridCircularBuffer.java       |   23 +-
 .../internal/util/GridClassLoaderCache.java     |   13 +-
 .../internal/util/GridClientByteUtils.java      |    7 +-
 .../util/GridCloseableIteratorAdapter.java      |   10 +-
 .../util/GridCloseableIteratorAdapterEx.java    |   12 +-
 .../ignite/internal/util/GridCollections.java   |   14 +-
 .../internal/util/GridConcurrentFactory.java    |   11 +-
 .../internal/util/GridConcurrentHashSet.java    |   13 +-
 .../util/GridConcurrentLinkedHashSet.java       |   16 +-
 .../util/GridConcurrentPhantomHashSet.java      |   25 +-
 .../util/GridConcurrentSkipListSet.java         |   22 +-
 .../util/GridConcurrentWeakHashSet.java         |   25 +-
 .../internal/util/GridConfigurationFinder.java  |   19 +-
 .../internal/util/GridConsistentHash.java       |   32 +-
 .../apache/ignite/internal/util/GridDebug.java  |   33 +-
 .../util/GridEmptyCloseableIterator.java        |    6 +-
 .../ignite/internal/util/GridEmptyIterator.java |    9 +-
 .../ignite/internal/util/GridEnumCache.java     |    7 +-
 .../internal/util/GridExecutionStatistics.java  |   19 +-
 .../internal/util/GridFixedSizeInputStream.java |    5 +-
 .../ignite/internal/util/GridHandleTable.java   |    7 +-
 .../ignite/internal/util/GridJavaProcess.java   |   25 +-
 .../ignite/internal/util/GridKeyLock.java       |   11 +-
 .../internal/util/GridLeanIdentitySet.java      |    7 +-
 .../ignite/internal/util/GridLeanMap.java       |   19 +-
 .../ignite/internal/util/GridLeanSet.java       |   10 +-
 .../ignite/internal/util/GridListSet.java       |   19 +-
 .../ignite/internal/util/GridLogThrottle.java   |   17 +-
 .../ignite/internal/util/GridLongList.java      |   26 +-
 .../apache/ignite/internal/util/GridMutex.java  |   10 +-
 .../apache/ignite/internal/util/GridQueue.java  |   16 +-
 .../apache/ignite/internal/util/GridRandom.java |    6 +-
 .../internal/util/GridReflectionCache.java      |   29 +-
 .../util/GridSerializableCollection.java        |    6 +-
 .../internal/util/GridSerializableIterable.java |    4 +-
 .../internal/util/GridSerializableIterator.java |    6 +-
 .../internal/util/GridSerializableList.java     |    6 +-
 .../internal/util/GridSerializableMap.java      |    6 +-
 .../internal/util/GridSerializableSet.java      |    7 +-
 .../ignite/internal/util/GridSetWrapper.java    |   12 +-
 .../ignite/internal/util/GridSnapshotLock.java  |    7 +-
 .../util/GridSpiCloseableIteratorWrapper.java   |    8 +-
 .../ignite/internal/util/GridSpinBusyLock.java  |    4 +-
 .../internal/util/GridSpinReadWriteLock.java    |   12 +-
 .../ignite/internal/util/GridStringBuilder.java |    7 +-
 .../internal/util/GridStringBuilderFactory.java |    4 +-
 .../ignite/internal/util/GridStripedLock.java   |   11 +-
 .../internal/util/GridStripedReadWriteLock.java |   14 +-
 .../internal/util/GridSynchronizedMap.java      |   12 +-
 .../apache/ignite/internal/util/GridTimer.java  |   10 +-
 .../ignite/internal/util/GridTimerTask.java     |    4 +-
 .../apache/ignite/internal/util/GridUnsafe.java |   11 +-
 .../ignite/internal/util/GridWeakIterator.java  |   10 +-
 .../internal/util/IgniteExceptionRegistry.java  |   27 +-
 .../ignite/internal/util/IgniteUtils.java       |  282 ++-
 .../ignite/internal/util/IgniteUuidCache.java   |    6 +-
 .../util/future/GridCompoundFuture.java         |   37 +-
 .../util/future/GridCompoundIdentityFuture.java |   10 +-
 .../util/future/GridEmbeddedFuture.java         |   16 +-
 .../util/future/GridFinishedFuture.java         |   17 +-
 .../internal/util/future/GridFutureAdapter.java |   27 +-
 .../util/future/GridFutureChainListener.java    |    9 +-
 .../util/future/IgniteFinishedFutureImpl.java   |    4 +-
 .../internal/util/future/IgniteFutureImpl.java  |   21 +-
 .../util/gridify/GridifyArgumentBuilder.java    |   20 +-
 .../util/gridify/GridifyJobAdapter.java         |   13 +-
 .../util/gridify/GridifyRangeArgument.java      |    9 +-
 .../internal/util/gridify/GridifyUtils.java     |   35 +-
 .../util/io/GridByteArrayInputStream.java       |    9 +-
 .../util/io/GridByteArrayOutputStream.java      |   13 +-
 .../ignite/internal/util/io/GridDataInput.java  |    6 +-
 .../ignite/internal/util/io/GridDataOutput.java |    6 +-
 .../internal/util/io/GridFilenameUtils.java     |   10 +-
 .../util/io/GridReversedLinesFileReader.java    |   12 +-
 .../internal/util/io/GridUnsafeDataInput.java   |   22 +-
 .../internal/util/io/GridUnsafeDataOutput.java  |   15 +-
 .../ignite/internal/util/ipc/IpcEndpoint.java   |    9 +-
 .../util/ipc/IpcEndpointBindException.java      |    4 +-
 .../internal/util/ipc/IpcEndpointFactory.java   |   13 +-
 .../internal/util/ipc/IpcEndpointType.java      |    2 +-
 .../internal/util/ipc/IpcServerEndpoint.java    |    9 +-
 .../internal/util/ipc/IpcToNioAdapter.java      |   31 +-
 .../util/ipc/loopback/IpcClientTcpEndpoint.java |   16 +-
 .../util/ipc/loopback/IpcServerTcpEndpoint.java |   23 +-
 .../shmem/IpcOutOfSystemResourcesException.java |    6 +-
 .../shmem/IpcSharedMemoryClientEndpoint.java    |   21 +-
 .../ipc/shmem/IpcSharedMemoryInitRequest.java   |    7 +-
 .../ipc/shmem/IpcSharedMemoryInitResponse.java  |   12 +-
 .../ipc/shmem/IpcSharedMemoryInputStream.java   |   10 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |   35 +-
 ...cSharedMemoryOperationTimedoutException.java |    6 +-
 .../ipc/shmem/IpcSharedMemoryOutputStream.java  |   10 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |   58 +-
 .../util/ipc/shmem/IpcSharedMemorySpace.java    |   19 +-
 .../util/ipc/shmem/IpcSharedMemoryUtils.java    |   18 +-
 .../internal/util/lang/GridAbsClosure.java      |    4 +-
 .../internal/util/lang/GridAbsClosureX.java     |    6 +-
 .../internal/util/lang/GridAbsPredicate.java    |    4 +-
 .../internal/util/lang/GridAbsPredicateX.java   |    6 +-
 .../util/lang/GridCloseableIterator.java        |    6 +-
 .../ignite/internal/util/lang/GridClosure3.java |    4 +-
 .../internal/util/lang/GridClosure3X.java       |    7 +-
 .../util/lang/GridClosureException.java         |    5 +-
 .../util/lang/GridFilteredIterator.java         |    5 +-
 .../ignite/internal/util/lang/GridFunc.java     |   76 +-
 .../internal/util/lang/GridInClosure3.java      |    5 +-
 .../ignite/internal/util/lang/GridIterable.java |    4 +-
 .../internal/util/lang/GridIterableAdapter.java |   10 +-
 .../ignite/internal/util/lang/GridIterator.java |   10 +-
 .../internal/util/lang/GridIteratorAdapter.java |    8 +-
 .../ignite/internal/util/lang/GridMapEntry.java |   13 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   18 +-
 .../internal/util/lang/GridNodePredicate.java   |   24 +-
 .../internal/util/lang/GridPeerDeployAware.java |    4 +-
 .../util/lang/GridPeerDeployAwareAdapter.java   |    4 +-
 .../internal/util/lang/GridPlainAbsClosure.java |    4 +-
 .../internal/util/lang/GridPlainCallable.java   |    4 +-
 .../internal/util/lang/GridPlainClosure.java    |    4 +-
 .../internal/util/lang/GridPlainClosure2.java   |    4 +-
 .../internal/util/lang/GridPlainInClosure.java  |    4 +-
 .../internal/util/lang/GridPlainOutClosure.java |    4 +-
 .../internal/util/lang/GridPlainRunnable.java   |    2 +-
 .../internal/util/lang/GridPredicate3.java      |    4 +-
 .../internal/util/lang/GridPredicate3X.java     |    7 +-
 .../ignite/internal/util/lang/GridTriple.java   |    7 +-
 .../ignite/internal/util/lang/GridTuple.java    |   17 +-
 .../ignite/internal/util/lang/GridTuple3.java   |   19 +-
 .../ignite/internal/util/lang/GridTuple4.java   |   19 +-
 .../ignite/internal/util/lang/GridTuple5.java   |   19 +-
 .../ignite/internal/util/lang/GridTuple6.java   |   19 +-
 .../ignite/internal/util/lang/GridTupleV.java   |   18 +-
 .../internal/util/lang/IgniteClosure2X.java     |    9 +-
 .../internal/util/lang/IgniteClosureX.java      |    9 +-
 .../internal/util/lang/IgniteInClosure2X.java   |    9 +-
 .../internal/util/lang/IgniteInClosureX.java    |    9 +-
 .../internal/util/lang/IgniteOutClosureX.java   |    8 +-
 .../ignite/internal/util/lang/IgnitePair.java   |    9 +-
 .../internal/util/lang/IgnitePredicate2X.java   |    9 +-
 .../internal/util/lang/IgnitePredicateX.java    |    9 +-
 .../internal/util/lang/IgniteReducer2.java      |    6 +-
 .../internal/util/lang/IgniteReducer2X.java     |    7 +-
 .../internal/util/lang/IgniteReducer3.java      |    6 +-
 .../internal/util/lang/IgniteReducer3X.java     |    7 +-
 .../internal/util/lang/IgniteReducerX.java      |    9 +-
 .../nio/GridAbstractCommunicationClient.java    |   10 +-
 .../internal/util/nio/GridBufferedParser.java   |   10 +-
 .../util/nio/GridCommunicationClient.java       |   21 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |   11 +-
 .../internal/util/nio/GridDelimitedParser.java  |    9 +-
 .../internal/util/nio/GridDirectParser.java     |   17 +-
 .../util/nio/GridNioAsyncNotifyFilter.java      |   13 +-
 .../util/nio/GridNioBackPressureControl.java    |    4 +-
 .../internal/util/nio/GridNioCodecFilter.java   |   15 +-
 .../util/nio/GridNioDelimitedBuffer.java        |    9 +-
 .../util/nio/GridNioEmbeddedFuture.java         |   12 +-
 .../internal/util/nio/GridNioException.java     |    6 +-
 .../ignite/internal/util/nio/GridNioFilter.java |    4 +-
 .../internal/util/nio/GridNioFilterAdapter.java |    4 +-
 .../internal/util/nio/GridNioFilterChain.java   |    7 +-
 .../util/nio/GridNioFinishedFuture.java         |   10 +-
 .../ignite/internal/util/nio/GridNioFuture.java |    8 +-
 .../internal/util/nio/GridNioFutureImpl.java    |   10 +-
 .../internal/util/nio/GridNioMessageReader.java |   12 +-
 .../util/nio/GridNioMessageTracker.java         |   12 +-
 .../internal/util/nio/GridNioMessageWriter.java |   14 +-
 .../util/nio/GridNioMetricsListener.java        |    2 +-
 .../ignite/internal/util/nio/GridNioParser.java |   11 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |   20 +-
 .../ignite/internal/util/nio/GridNioServer.java |   82 +-
 .../internal/util/nio/GridNioServerBuffer.java  |    9 +-
 .../util/nio/GridNioServerListener.java         |    4 +-
 .../util/nio/GridNioServerListenerAdapter.java  |    2 +-
 .../internal/util/nio/GridNioSession.java       |    7 +-
 .../internal/util/nio/GridNioSessionImpl.java   |   16 +-
 .../util/nio/GridNioSessionMetaKey.java         |    4 +-
 .../util/nio/GridSelectorNioSessionImpl.java    |   26 +-
 .../util/nio/GridShmemCommunicationClient.java  |   30 +-
 .../util/nio/GridTcpNioCommunicationClient.java |   30 +-
 .../util/nio/ssl/BlockingSslHandler.java        |   35 +-
 .../internal/util/nio/ssl/GridNioSslFilter.java |   30 +-
 .../util/nio/ssl/GridNioSslHandler.java         |   44 +-
 .../util/nodestart/IgniteNodeStartUtils.java    |   30 +-
 .../IgniteRemoteStartSpecification.java         |   11 +-
 .../util/nodestart/IgniteSshHelper.java         |    4 +-
 .../util/nodestart/StartNodeCallable.java       |    7 +-
 .../internal/util/offheap/GridOffHeapEvent.java |    4 +-
 .../util/offheap/GridOffHeapEventListener.java  |    2 +-
 .../util/offheap/GridOffHeapEvictListener.java  |    2 +-
 .../internal/util/offheap/GridOffHeapMap.java   |   11 +-
 .../util/offheap/GridOffHeapMapFactory.java     |    7 +-
 .../GridOffHeapOutOfMemoryException.java        |    2 +-
 .../util/offheap/GridOffHeapPartitionedMap.java |   14 +-
 .../offheap/unsafe/GridOffHeapSmartPointer.java |    2 +-
 .../unsafe/GridOffHeapSmartPointerFactory.java  |    2 +-
 .../offheap/unsafe/GridOffHeapSnapTreeMap.java  |   33 +-
 .../unsafe/GridUnsafeCompoundMemory.java        |    2 +-
 .../util/offheap/unsafe/GridUnsafeGuard.java    |   12 +-
 .../util/offheap/unsafe/GridUnsafeLru.java      |   15 +-
 .../offheap/unsafe/GridUnsafeLruPoller.java     |    2 +-
 .../util/offheap/unsafe/GridUnsafeMap.java      |   36 +-
 .../util/offheap/unsafe/GridUnsafeMemory.java   |   27 +-
 .../unsafe/GridUnsafePartitionedMap.java        |   26 +-
 .../util/portscanner/GridJmxPortFinder.java     |   15 +-
 .../util/snaptree/CopyOnWriteManager.java       |    6 +-
 .../ignite/internal/util/snaptree/Epoch.java    |    2 +-
 .../internal/util/snaptree/EpochNode.java       |    5 +-
 .../internal/util/snaptree/SnapTreeMap.java     |   22 +-
 .../util/spring/IgniteSpringHelper.java         |   19 +-
 .../internal/util/test/GridTestPrintStream.java |   11 +-
 .../util/test/GridTestPrintStreamFactory.java   |    4 +-
 .../util/tostring/GridToStringBuilder.java      |   33 +-
 .../tostring/GridToStringClassDescriptor.java   |    7 +-
 .../util/tostring/GridToStringExclude.java      |    8 +-
 .../tostring/GridToStringFieldDescriptor.java   |    2 +-
 .../util/tostring/GridToStringInclude.java      |    8 +-
 .../util/tostring/GridToStringOrder.java        |    8 +-
 .../util/tostring/GridToStringThreadLocal.java  |    4 +-
 .../apache/ignite/internal/util/typedef/C1.java |    6 +-
 .../apache/ignite/internal/util/typedef/C2.java |    6 +-
 .../apache/ignite/internal/util/typedef/C3.java |    5 +-
 .../apache/ignite/internal/util/typedef/CA.java |    5 +-
 .../ignite/internal/util/typedef/CAX.java       |    5 +-
 .../ignite/internal/util/typedef/CI1.java       |    6 +-
 .../ignite/internal/util/typedef/CI2.java       |    6 +-
 .../ignite/internal/util/typedef/CIX1.java      |    5 +-
 .../ignite/internal/util/typedef/CIX2.java      |    5 +-
 .../ignite/internal/util/typedef/CIX3.java      |    5 +-
 .../apache/ignite/internal/util/typedef/CO.java |    6 +-
 .../ignite/internal/util/typedef/COX.java       |    5 +-
 .../ignite/internal/util/typedef/CX1.java       |    5 +-
 .../ignite/internal/util/typedef/CX2.java       |    5 +-
 .../ignite/internal/util/typedef/CX3.java       |    5 +-
 .../apache/ignite/internal/util/typedef/F.java  |    4 +-
 .../apache/ignite/internal/util/typedef/G.java  |    4 +-
 .../apache/ignite/internal/util/typedef/P1.java |    6 +-
 .../apache/ignite/internal/util/typedef/P2.java |    6 +-
 .../apache/ignite/internal/util/typedef/P3.java |    5 +-
 .../apache/ignite/internal/util/typedef/PA.java |    5 +-
 .../ignite/internal/util/typedef/PAX.java       |    6 +-
 .../ignite/internal/util/typedef/PCE.java       |    9 +-
 .../apache/ignite/internal/util/typedef/PE.java |    8 +-
 .../ignite/internal/util/typedef/PKV.java       |    6 +-
 .../apache/ignite/internal/util/typedef/PN.java |    8 +-
 .../ignite/internal/util/typedef/PX1.java       |    5 +-
 .../ignite/internal/util/typedef/PX2.java       |    5 +-
 .../ignite/internal/util/typedef/PX3.java       |    5 +-
 .../apache/ignite/internal/util/typedef/R1.java |    6 +-
 .../apache/ignite/internal/util/typedef/R2.java |    5 +-
 .../apache/ignite/internal/util/typedef/R3.java |    5 +-
 .../ignite/internal/util/typedef/RX1.java       |    5 +-
 .../ignite/internal/util/typedef/RX2.java       |    5 +-
 .../ignite/internal/util/typedef/RX3.java       |    5 +-
 .../apache/ignite/internal/util/typedef/T1.java |    8 +-
 .../apache/ignite/internal/util/typedef/T2.java |   10 +-
 .../apache/ignite/internal/util/typedef/T3.java |    9 +-
 .../apache/ignite/internal/util/typedef/T4.java |    9 +-
 .../apache/ignite/internal/util/typedef/T5.java |    9 +-
 .../apache/ignite/internal/util/typedef/T6.java |    9 +-
 .../apache/ignite/internal/util/typedef/X.java  |   38 +-
 .../internal/util/typedef/internal/A.java       |    4 +-
 .../internal/util/typedef/internal/CU.java      |    4 +-
 .../internal/util/typedef/internal/D.java       |    4 +-
 .../internal/util/typedef/internal/GPC.java     |    4 +-
 .../internal/util/typedef/internal/GPR.java     |    4 +-
 .../internal/util/typedef/internal/LT.java      |    4 +-
 .../internal/util/typedef/internal/S.java       |    4 +-
 .../internal/util/typedef/internal/SB.java      |    4 +-
 .../internal/util/typedef/internal/U.java       |    4 +-
 .../ignite/internal/util/worker/GridWorker.java |   18 +-
 .../internal/util/worker/GridWorkerFuture.java  |    6 +-
 .../util/worker/GridWorkerListener.java         |    4 +-
 .../util/worker/GridWorkerListenerAdapter.java  |    2 +-
 .../internal/util/worker/GridWorkerPool.java    |   17 +-
 .../apache/ignite/internal/visor/VisorJob.java  |   17 +-
 .../internal/visor/VisorMultiNodeTask.java      |   31 +-
 .../ignite/internal/visor/VisorOneNodeTask.java |   11 +-
 .../internal/visor/VisorTaskArgument.java       |    8 +-
 .../ignite/internal/visor/cache/VisorCache.java |   44 +-
 .../cache/VisorCacheAffinityConfiguration.java  |   17 +-
 .../cache/VisorCacheAggregatedMetrics.java      |   14 +-
 .../visor/cache/VisorCacheClearTask.java        |   23 +-
 .../visor/cache/VisorCacheConfiguration.java    |   25 +-
 .../VisorCacheConfigurationCollectorJob.java    |   17 +-
 .../VisorCacheConfigurationCollectorTask.java   |   12 +-
 .../cache/VisorCacheDefaultConfiguration.java   |    9 +-
 .../cache/VisorCacheEvictionConfiguration.java  |   16 +-
 .../visor/cache/VisorCacheLoadTask.java         |   26 +-
 .../visor/cache/VisorCacheMetadataTask.java     |   21 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   16 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   25 +-
 .../cache/VisorCacheNearConfiguration.java      |   17 +-
 .../visor/cache/VisorCacheNodesTask.java        |   16 +-
 .../cache/VisorCacheQueryConfiguration.java     |    9 +-
 .../visor/cache/VisorCacheQueryMetrics.java     |    9 +-
 .../cache/VisorCacheRebalanceConfiguration.java |   11 +-
 .../visor/cache/VisorCacheRebalanceTask.java    |   21 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |   11 +-
 .../visor/cache/VisorCacheStartTask.java        |   33 +-
 .../visor/cache/VisorCacheStopTask.java         |   11 +-
 .../cache/VisorCacheStoreConfiguration.java     |   21 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |   28 +-
 .../cache/VisorCacheTypeFieldMetadata.java      |    9 +-
 .../visor/cache/VisorCacheTypeMetadata.java     |   20 +-
 .../compute/VisorComputeCancelSessionsTask.java |   24 +-
 .../compute/VisorComputeMonitoringHolder.java   |   14 +-
 .../compute/VisorComputeResetMetricsTask.java   |    9 +-
 .../VisorComputeToggleMonitoringTask.java       |   29 +-
 .../visor/debug/VisorThreadDumpTask.java        |   16 +-
 .../internal/visor/debug/VisorThreadInfo.java   |    6 +-
 .../visor/debug/VisorThreadLockInfo.java        |    6 +-
 .../visor/debug/VisorThreadMonitorInfo.java     |    4 +-
 .../visor/event/VisorGridDeploymentEvent.java   |   11 +-
 .../visor/event/VisorGridDiscoveryEvent.java    |   11 +-
 .../internal/visor/event/VisorGridEvent.java    |   13 +-
 .../visor/event/VisorGridEventsLost.java        |    9 +-
 .../internal/visor/event/VisorGridJobEvent.java |   11 +-
 .../visor/event/VisorGridTaskEvent.java         |   11 +-
 .../internal/visor/file/VisorFileBlock.java     |    7 +-
 .../internal/visor/file/VisorFileBlockTask.java |   26 +-
 .../visor/file/VisorLatestTextFilesTask.java    |   30 +-
 .../ignite/internal/visor/igfs/VisorIgfs.java   |   11 +-
 .../internal/visor/igfs/VisorIgfsEndpoint.java  |    9 +-
 .../visor/igfs/VisorIgfsFormatTask.java         |   11 +-
 .../internal/visor/igfs/VisorIgfsMetrics.java   |    9 +-
 .../internal/visor/igfs/VisorIgfsProfiler.java  |   10 +-
 .../visor/igfs/VisorIgfsProfilerClearTask.java  |   30 +-
 .../visor/igfs/VisorIgfsProfilerEntry.java      |   11 +-
 .../visor/igfs/VisorIgfsProfilerTask.java       |   51 +-
 .../VisorIgfsProfilerUniformityCounters.java    |   12 +-
 .../visor/igfs/VisorIgfsResetMetricsTask.java   |   14 +-
 .../visor/igfs/VisorIgfsSamplingStateTask.java  |   17 +-
 .../ignite/internal/visor/log/VisorLogFile.java |    8 +-
 .../visor/log/VisorLogSearchResult.java         |    9 +-
 .../internal/visor/log/VisorLogSearchTask.java  |   45 +-
 .../internal/visor/misc/VisorAckTask.java       |   16 +-
 .../visor/misc/VisorLatestVersionTask.java      |    9 +-
 .../internal/visor/misc/VisorNopTask.java       |   21 +-
 .../visor/misc/VisorResolveHostNameTask.java    |   23 +-
 .../visor/node/VisorAtomicConfiguration.java    |   11 +-
 .../visor/node/VisorBasicConfiguration.java     |   34 +-
 .../node/VisorExecutorServiceConfiguration.java |   10 +-
 .../visor/node/VisorGridConfiguration.java      |   19 +-
 .../visor/node/VisorIgfsConfiguration.java      |   29 +-
 .../visor/node/VisorLifecycleConfiguration.java |   13 +-
 .../visor/node/VisorMetricsConfiguration.java   |    9 +-
 .../VisorNodeConfigurationCollectorJob.java     |    6 +-
 .../VisorNodeConfigurationCollectorTask.java    |    6 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   41 +-
 .../node/VisorNodeDataCollectorJobResult.java   |   15 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |   30 +-
 .../node/VisorNodeDataCollectorTaskArg.java     |    4 +-
 .../node/VisorNodeDataCollectorTaskResult.java  |   21 +-
 .../node/VisorNodeEventsCollectorTask.java      |   46 +-
 .../internal/visor/node/VisorNodeGcTask.java    |   24 +-
 .../internal/visor/node/VisorNodePingTask.java  |   21 +-
 .../visor/node/VisorNodeRestartTask.java        |   18 +-
 .../internal/visor/node/VisorNodeStopTask.java  |   18 +-
 .../node/VisorNodeSuppressedErrorsTask.java     |   26 +-
 .../node/VisorPeerToPeerConfiguration.java      |   13 +-
 .../visor/node/VisorRestConfiguration.java      |   22 +-
 .../node/VisorSegmentationConfiguration.java    |   15 +-
 .../visor/node/VisorSpisConfiguration.java      |   27 +-
 .../node/VisorTransactionConfiguration.java     |   12 +-
 .../internal/visor/query/VisorQueryArg.java     |    4 +-
 .../visor/query/VisorQueryCleanupTask.java      |   32 +-
 .../internal/visor/query/VisorQueryCursor.java  |   14 +-
 .../internal/visor/query/VisorQueryField.java   |    9 +-
 .../internal/visor/query/VisorQueryJob.java     |   43 +-
 .../visor/query/VisorQueryNextPageTask.java     |   21 +-
 .../internal/visor/query/VisorQueryResult.java  |    9 +-
 .../visor/query/VisorQueryResultEx.java         |    9 +-
 .../internal/visor/query/VisorQueryTask.java    |   10 +-
 .../internal/visor/query/VisorQueryUtils.java   |   17 +-
 .../util/VisorClusterGroupEmptyException.java   |    4 +-
 .../internal/visor/util/VisorEventMapper.java   |   24 +-
 .../visor/util/VisorExceptionWrapper.java       |    2 +-
 .../internal/visor/util/VisorMimeTypes.java     |   13 +-
 .../internal/visor/util/VisorTaskUtils.java     |   97 +-
 .../apache/ignite/lang/IgniteAsyncSupport.java  |    2 +-
 .../ignite/lang/IgniteAsyncSupported.java       |    8 +-
 .../org/apache/ignite/lang/IgniteBiClosure.java |    4 +-
 .../apache/ignite/lang/IgniteBiInClosure.java   |    4 +-
 .../apache/ignite/lang/IgniteBiPredicate.java   |    4 +-
 .../org/apache/ignite/lang/IgniteBiTuple.java   |   24 +-
 .../org/apache/ignite/lang/IgniteCallable.java  |    6 +-
 .../org/apache/ignite/lang/IgniteClosure.java   |    4 +-
 .../org/apache/ignite/lang/IgniteFuture.java    |    8 +-
 .../lang/IgniteFutureCancelledException.java    |    6 +-
 .../lang/IgniteFutureTimeoutException.java      |    6 +-
 .../org/apache/ignite/lang/IgniteInClosure.java |    4 +-
 .../ignite/lang/IgniteNotPeerDeployable.java    |    8 +-
 .../apache/ignite/lang/IgniteOutClosure.java    |    4 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |    4 +-
 .../ignite/lang/IgniteProductVersion.java       |   21 +-
 .../org/apache/ignite/lang/IgniteReducer.java   |    9 +-
 .../org/apache/ignite/lang/IgniteRunnable.java  |    4 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |   20 +-
 .../apache/ignite/lifecycle/LifecycleAware.java |    4 +-
 .../apache/ignite/lifecycle/LifecycleBean.java  |    4 +-
 .../ignite/lifecycle/LifecycleEventType.java    |    4 +-
 .../apache/ignite/logger/LoggerNodeIdAware.java |    4 +-
 .../org/apache/ignite/logger/NullLogger.java    |    6 +-
 .../apache/ignite/logger/java/JavaLogger.java   |   40 +-
 .../logger/java/JavaLoggerFileHandler.java      |   22 +-
 .../ignite/logger/java/JavaLoggerFormatter.java |   14 +-
 .../ignite/marshaller/AbstractMarshaller.java   |   13 +-
 .../apache/ignite/marshaller/Marshaller.java    |   12 +-
 .../ignite/marshaller/MarshallerContext.java    |    4 +-
 .../ignite/marshaller/MarshallerExclusions.java |   27 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |   20 +-
 .../jdk/JdkMarshallerDummySerializable.java     |    4 +-
 .../jdk/JdkMarshallerInputStreamWrapper.java    |    5 +-
 .../jdk/JdkMarshallerObjectInputStream.java     |    9 +-
 .../jdk/JdkMarshallerObjectOutputStream.java    |   10 +-
 .../jdk/JdkMarshallerOutputStreamWrapper.java   |    5 +-
 .../optimized/OptimizedClassDescriptor.java     |   83 +-
 .../optimized/OptimizedFieldType.java           |    2 +-
 .../optimized/OptimizedMarshaller.java          |   28 +-
 .../optimized/OptimizedMarshallerIdMapper.java  |    2 +-
 .../optimized/OptimizedMarshallerUtils.java     |   32 +-
 .../optimized/OptimizedObjectInputStream.java   |   91 +-
 .../optimized/OptimizedObjectOutputStream.java  |   58 +-
 .../OptimizedObjectStreamRegistry.java          |   17 +-
 .../marshaller/portable/PortableMarshaller.java |   35 +-
 .../ignite/messaging/MessagingListenActor.java  |   22 +-
 .../ignite/mxbean/CacheMetricsMXBean.java       |   10 +-
 .../mxbean/ClusterLocalNodeMetricsMXBean.java   |    4 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |    7 +-
 .../apache/ignite/mxbean/IgnitionMXBean.java    |    2 +-
 .../apache/ignite/mxbean/MXBeanDescription.java |    8 +-
 .../mxbean/MXBeanParametersDescriptions.java    |    8 +-
 .../ignite/mxbean/MXBeanParametersNames.java    |    8 +-
 .../apache/ignite/mxbean/ThreadPoolMXBean.java  |    2 +-
 .../ignite/plugin/CachePluginConfiguration.java |    5 +-
 .../ignite/plugin/CachePluginContext.java       |   10 +-
 .../ignite/plugin/CachePluginProvider.java      |   10 +-
 .../org/apache/ignite/plugin/Extension.java     |    2 +-
 .../apache/ignite/plugin/ExtensionRegistry.java |    2 +-
 .../org/apache/ignite/plugin/IgnitePlugin.java  |    2 +-
 .../ignite/plugin/PluginConfiguration.java      |    2 +-
 .../org/apache/ignite/plugin/PluginContext.java |   16 +-
 .../ignite/plugin/PluginNotFoundException.java  |    4 +-
 .../apache/ignite/plugin/PluginProvider.java    |   16 +-
 .../plugin/PluginValidationException.java       |    7 +-
 .../plugin/extensions/communication/IoPool.java |    7 +-
 .../extensions/communication/Message.java       |    6 +-
 .../MessageCollectionItemType.java              |    4 +-
 .../communication/MessageFactory.java           |    6 +-
 .../communication/MessageFormatter.java         |    4 +-
 .../extensions/communication/MessageReader.java |   13 +-
 .../extensions/communication/MessageWriter.java |   12 +-
 .../plugin/security/AuthenticationContext.java  |    6 +-
 .../plugin/security/SecurityCredentials.java    |   16 +-
 .../SecurityCredentialsBasicProvider.java       |    4 +-
 .../security/SecurityCredentialsProvider.java   |    4 +-
 .../plugin/security/SecurityException.java      |    6 +-
 .../plugin/security/SecurityPermission.java     |    4 +-
 .../plugin/security/SecurityPermissionSet.java  |   10 +-
 .../ignite/plugin/security/SecuritySubject.java |    8 +-
 .../plugin/security/SecuritySubjectType.java    |    6 +-
 .../plugin/segmentation/SegmentationPolicy.java |    2 +-
 .../segmentation/SegmentationResolver.java      |    9 +-
 .../apache/ignite/portable/PortableBuilder.java |    7 +-
 .../ignite/portable/PortableException.java      |    7 +-
 .../ignite/portable/PortableIdMapper.java       |    4 +-
 .../portable/PortableInvalidClassException.java |    4 +-
 .../ignite/portable/PortableMarshalAware.java   |    2 +-
 .../ignite/portable/PortableMetadata.java       |   10 +-
 .../apache/ignite/portable/PortableObject.java  |   17 +-
 .../portable/PortableProtocolVersion.java       |    4 +-
 .../ignite/portable/PortableRawReader.java      |   13 +-
 .../ignite/portable/PortableRawWriter.java      |   13 +-
 .../apache/ignite/portable/PortableReader.java  |   13 +-
 .../ignite/portable/PortableSerializer.java     |    4 +-
 .../portable/PortableTypeConfiguration.java     |   11 +-
 .../apache/ignite/portable/PortableWriter.java  |   13 +-
 .../ignite/resources/CacheNameResource.java     |    8 +-
 .../resources/CacheStoreSessionResource.java    |    8 +-
 .../resources/IgniteInstanceResource.java       |    8 +-
 .../ignite/resources/JobContextResource.java    |    8 +-
 .../ignite/resources/LoadBalancerResource.java  |    8 +-
 .../apache/ignite/resources/LoggerResource.java |    8 +-
 .../ignite/resources/MBeanServerResource.java   |   10 +-
 .../ignite/resources/ServiceResource.java       |    8 +-
 .../SpringApplicationContextResource.java       |   10 +-
 .../apache/ignite/resources/SpringResource.java |   10 +-
 .../resources/TaskContinuousMapperResource.java |    8 +-
 .../ignite/resources/TaskSessionResource.java   |    8 +-
 .../apache/ignite/resources/package-info.java   |    2 +-
 .../ignite/scheduler/SchedulerFuture.java       |   14 +-
 .../org/apache/ignite/services/Service.java     |    4 +-
 .../ignite/services/ServiceConfiguration.java   |   13 +-
 .../apache/ignite/services/ServiceContext.java  |    9 +-
 .../ignite/services/ServiceDescriptor.java      |   10 +-
 .../ignite/spi/IgniteNodeValidationResult.java  |    4 +-
 .../apache/ignite/spi/IgnitePortProtocol.java   |    4 +-
 .../java/org/apache/ignite/spi/IgniteSpi.java   |    9 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   68 +-
 .../ignite/spi/IgniteSpiCloseableIterator.java  |    9 +-
 .../ignite/spi/IgniteSpiConfiguration.java      |    8 +-
 .../ignite/spi/IgniteSpiConsistencyChecked.java |    8 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   27 +-
 .../apache/ignite/spi/IgniteSpiException.java   |    4 +-
 .../ignite/spi/IgniteSpiManagementMBean.java    |    7 +-
 .../ignite/spi/IgniteSpiMultiException.java     |   11 +-
 .../spi/IgniteSpiMultipleInstancesSupport.java  |    9 +-
 .../org/apache/ignite/spi/IgniteSpiNoop.java    |    8 +-
 .../spi/IgniteSpiOperationTimeoutException.java |   10 +-
 .../spi/IgniteSpiOperationTimeoutHelper.java    |   10 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  |   10 +-
 .../ignite/spi/IgniteSpiThreadFactory.java      |    7 +-
 .../ignite/spi/IgniteSpiTimeoutObject.java      |    4 +-
 .../spi/IgniteSpiVersionCheckException.java     |    2 +-
 .../spi/checkpoint/CheckpointListener.java      |    2 +-
 .../ignite/spi/checkpoint/CheckpointSpi.java    |    7 +-
 .../checkpoint/cache/CacheCheckpointSpi.java    |   37 +-
 .../cache/CacheCheckpointSpiMBean.java          |    6 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |   32 +-
 .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java |    6 +-
 .../spi/checkpoint/noop/NoopCheckpointSpi.java  |   19 +-
 .../sharedfs/SharedFsCheckpointData.java        |    7 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |   42 +-
 .../sharedfs/SharedFsCheckpointSpiMBean.java    |    9 +-
 .../checkpoint/sharedfs/SharedFsTimeData.java   |    4 +-
 .../sharedfs/SharedFsTimeoutTask.java           |   23 +-
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |   17 +-
 .../ignite/spi/collision/CollisionContext.java  |    4 +-
 .../collision/CollisionExternalListener.java    |    4 +-
 .../spi/collision/CollisionJobContext.java      |    6 +-
 .../ignite/spi/collision/CollisionSpi.java      |    6 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |   23 +-
 .../fifoqueue/FifoQueueCollisionSpiMBean.java   |    6 +-
 .../jobstealing/JobStealingCollisionSpi.java    |   69 +-
 .../JobStealingCollisionSpiMBean.java           |   11 +-
 .../jobstealing/JobStealingDisabled.java        |    8 +-
 .../jobstealing/JobStealingRequest.java         |   13 +-
 .../spi/collision/noop/NoopCollisionSpi.java    |   15 +-
 .../PriorityQueueCollisionSpi.java              |   39 +-
 .../PriorityQueueCollisionSpiMBean.java         |    6 +-
 .../communication/CommunicationListener.java    |    9 +-
 .../spi/communication/CommunicationSpi.java     |   14 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  162 +-
 .../tcp/TcpCommunicationSpiMBean.java           |    6 +-
 .../spi/deployment/DeploymentListener.java      |    2 +-
 .../spi/deployment/DeploymentResource.java      |    2 +-
 .../deployment/DeploymentResourceAdapter.java   |    4 +-
 .../ignite/spi/deployment/DeploymentSpi.java    |    7 +-
 .../IgnoreIfPeerClassLoadingDisabled.java       |    9 +-
 .../deployment/local/LocalDeploymentSpi.java    |   44 +-
 .../local/LocalDeploymentSpiMBean.java          |    6 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |   11 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |   20 +-
 .../discovery/DiscoverySpiCustomMessage.java    |    7 +-
 .../spi/discovery/DiscoverySpiDataExchange.java |    7 +-
 .../discovery/DiscoverySpiHistorySupport.java   |    9 +-
 .../spi/discovery/DiscoverySpiListener.java     |   12 +-
 .../DiscoverySpiNodeAuthenticator.java          |   10 +-
 .../spi/discovery/DiscoverySpiOrderSupport.java |    9 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |  123 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  160 +-
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |   36 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  110 +-
 .../spi/discovery/tcp/TcpDiscoverySpiMBean.java |   12 +-
 .../tcp/internal/TcpDiscoveryNode.java          |   50 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java     |   33 +-
 .../tcp/internal/TcpDiscoverySpiState.java      |    2 +-
 .../tcp/internal/TcpDiscoveryStatistics.java    |   26 +-
 .../tcp/ipfinder/TcpDiscoveryIpFinder.java      |   10 +-
 .../ipfinder/TcpDiscoveryIpFinderAdapter.java   |   23 +-
 .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java |   42 +-
 .../TcpDiscoveryMulticastIpFinder.java          |   56 +-
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |   37 +-
 .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java |   31 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |   14 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |   14 +-
 .../TcpDiscoveryCheckFailedMessage.java         |    7 +-
 .../messages/TcpDiscoveryClientAckResponse.java |   10 +-
 .../TcpDiscoveryClientHeartbeatMessage.java     |   11 +-
 .../messages/TcpDiscoveryClientPingRequest.java |    9 +-
 .../TcpDiscoveryClientPingResponse.java         |    9 +-
 .../TcpDiscoveryClientReconnectMessage.java     |   12 +-
 .../TcpDiscoveryConnectionCheckMessage.java     |   12 +-
 .../TcpDiscoveryCustomEventMessage.java         |   15 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |    9 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |    9 +-
 .../messages/TcpDiscoveryEnsureDelivery.java    |    8 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |    7 +-
 .../messages/TcpDiscoveryHandshakeResponse.java |    7 +-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |   30 +-
 .../TcpDiscoveryJoinRequestMessage.java         |    9 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |    8 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |   12 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |   20 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |    9 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |    7 +-
 .../tcp/messages/TcpDiscoveryPingRequest.java   |    9 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |    7 +-
 .../messages/TcpDiscoveryRedirectToClient.java  |    8 +-
 .../TcpDiscoveryStatusCheckMessage.java         |    9 +-
 .../spi/eventstorage/EventStorageSpi.java       |   12 +-
 .../memory/MemoryEventStorageSpi.java           |   34 +-
 .../memory/MemoryEventStorageSpiMBean.java      |    6 +-
 .../ignite/spi/failover/FailoverContext.java    |   18 +-
 .../apache/ignite/spi/failover/FailoverSpi.java |    9 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |   33 +-
 .../failover/always/AlwaysFailoverSpiMBean.java |    6 +-
 .../jobstealing/JobStealingFailoverSpi.java     |   37 +-
 .../JobStealingFailoverSpiMBean.java            |    6 +-
 .../spi/failover/never/NeverFailoverSpi.java    |   23 +-
 .../failover/never/NeverFailoverSpiMBean.java   |    6 +-
 .../spi/indexing/IndexingQueryFilter.java       |    6 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |   15 +-
 .../spi/indexing/noop/NoopIndexingSpi.java      |   17 +-
 .../spi/loadbalancing/LoadBalancingSpi.java     |   14 +-
 .../adaptive/AdaptiveCpuLoadProbe.java          |    8 +-
 .../adaptive/AdaptiveJobCountLoadProbe.java     |    7 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |   69 +-
 .../adaptive/AdaptiveLoadBalancingSpiMBean.java |    6 +-
 .../adaptive/AdaptiveLoadProbe.java             |    4 +-
 .../AdaptiveProcessingTimeLoadProbe.java        |    7 +-
 .../RoundRobinGlobalLoadBalancer.java           |   39 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |   50 +-
 .../RoundRobinLoadBalancingSpiMBean.java        |    6 +-
 .../RoundRobinPerTaskLoadBalancer.java          |   10 +-
 .../WeightedRandomLoadBalancingSpi.java         |   57 +-
 .../WeightedRandomLoadBalancingSpiMBean.java    |    6 +-
 .../ignite/spi/swapspace/SwapContext.java       |    4 +-
 .../apache/ignite/spi/swapspace/SwapKey.java    |    9 +-
 .../ignite/spi/swapspace/SwapSpaceSpi.java      |   16 +-
 .../spi/swapspace/SwapSpaceSpiListener.java     |    4 +-
 .../spi/swapspace/file/FileSwapArray.java       |    7 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   83 +-
 .../swapspace/file/FileSwapSpaceSpiMBean.java   |    6 +-
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |   33 +-
 .../apache/ignite/ssl/SslContextFactory.java    |   29 +-
 .../ignite/startup/BasicWarmupClosure.java      |   45 +-
 .../ignite/startup/cmdline/AboutDialog.java     |   41 +-
 .../CommandLineRandomNumberGenerator.java       |    4 +-
 .../startup/cmdline/CommandLineStartup.java     |   53 +-
 .../startup/cmdline/CommandLineTransformer.java |    7 +-
 .../org/apache/ignite/startup/package-info.java |    2 +-
 .../org/apache/ignite/stream/StreamAdapter.java |    6 +-
 .../apache/ignite/stream/StreamReceiver.java    |   12 +-
 .../apache/ignite/stream/StreamTransformer.java |   15 +-
 .../ignite/stream/StreamTupleExtractor.java     |    4 +-
 .../org/apache/ignite/stream/StreamVisitor.java |   11 +-
 .../org/apache/ignite/stream/package-info.java  |    2 +-
 .../stream/socket/SocketMessageConverter.java   |    2 +-
 .../ignite/stream/socket/SocketStreamer.java    |   35 +-
 .../thread/IgniteStripedThreadPoolExecutor.java |   18 +-
 .../org/apache/ignite/thread/IgniteThread.java  |    9 +-
 .../ignite/thread/IgniteThreadFactory.java      |    7 +-
 .../ignite/thread/IgniteThreadPoolExecutor.java |   13 +-
 .../apache/ignite/transactions/Transaction.java |   12 +-
 .../transactions/TransactionConcurrency.java    |    4 +-
 .../TransactionHeuristicException.java          |    4 +-
 .../transactions/TransactionIsolation.java      |    4 +-
 .../ignite/transactions/TransactionMetrics.java |    4 +-
 .../TransactionOptimisticException.java         |    4 +-
 .../TransactionRollbackException.java           |    4 +-
 .../ignite/transactions/TransactionState.java   |    4 +-
 .../TransactionTimeoutException.java            |    4 +-
 .../java/org/jetbrains/annotations/NotNull.java |    8 +-
 .../java/org/jsr166/ConcurrentHashMap8.java     |   20 +-
 .../java/org/jsr166/ConcurrentLinkedDeque8.java |   18 +-
 .../org/jsr166/ConcurrentLinkedHashMap.java     |   28 +-
 .../src/main/java/org/jsr166/LongAdder8.java    |    8 +-
 .../src/main/java/org/jsr166/Striped64_8.java   |    4 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   20 +-
 .../ignite/GridSuppressedExceptionSelfTest.java |    9 +-
 .../java/org/apache/ignite/GridTestIoUtils.java |   28 +-
 .../java/org/apache/ignite/GridTestJob.java     |    6 +-
 .../org/apache/ignite/GridTestJobContext.java   |   12 +-
 .../org/apache/ignite/GridTestJobResult.java    |   11 +-
 .../org/apache/ignite/GridTestNodeStartup.java  |    7 +-
 .../apache/ignite/GridTestStoreNodeStartup.java |    8 +-
 .../java/org/apache/ignite/GridTestTask.java    |   13 +-
 .../org/apache/ignite/GridTestTaskSession.java  |   20 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |   30 +-
 .../IgniteExternalizableAbstractTest.java       |   16 +-
 .../cache/IgniteWarmupClosureSelfTest.java      |   15 +-
 .../affinity/IgniteClientNodeAffinityTest.java  |   34 +-
 .../GridFairAffinityFunctionNodesSelfTest.java  |   25 +-
 .../fair/GridFairAffinityFunctionSelfTest.java  |   26 +-
 .../IgniteFairAffinityDynamicCacheSelfTest.java |   25 +-
 ...cheStoreSessionListenerAbstractSelfTest.java |   36 +-
 ...heStoreSessionListenerLifecycleSelfTest.java |   40 +-
 .../store/GridCacheBalancingStoreSelfTest.java  |   34 +-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |   18 +-
 .../cache/store/GridGeneratingTestStore.java    |   19 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     |   39 +-
 .../CacheJdbcPojoStoreMultitreadedSelfTest.java |    4 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   57 +-
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |   67 +-
 .../CacheJdbcStoreSessionListenerSelfTest.java  |   28 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |   55 +-
 .../jdbc/GridCacheJdbcBlobStoreSelfTest.java    |    9 +-
 .../cache/store/jdbc/model/Organization.java    |    3 +-
 .../cache/store/jdbc/model/OrganizationKey.java |    3 +-
 .../ignite/cache/store/jdbc/model/Person.java   |    3 +-
 .../store/jdbc/model/PersonComplexKey.java      |    4 +-
 .../cache/store/jdbc/model/PersonKey.java       |    3 +-
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |   64 +-
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |   30 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   23 +-
 .../igfs/IgfsFragmentizerTopologySelfTest.java  |    4 +-
 .../apache/ignite/igfs/IgfsPathSelfTest.java    |   26 +-
 .../ignite/igfs/IgfsTestInputGenerator.java     |    7 +-
 .../internal/ClusterGroupAbstractTest.java      |   64 +-
 .../internal/ClusterGroupHostsSelfTest.java     |   24 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |   21 +-
 .../ignite/internal/ClusterMetricsSelfTest.java |   34 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |   41 +-
 .../ignite/internal/GridAffinityMappedTest.java |   33 +-
 .../internal/GridAffinityP2PSelfTest.java       |   41 +-
 .../ignite/internal/GridAffinitySelfTest.java   |   34 +-
 .../GridAlwaysFailoverSpiFailSelfTest.java      |   32 +-
 .../internal/GridCancelOnGridStopSelfTest.java  |   27 +-
 .../internal/GridCancelUnusedJobSelfTest.java   |   39 +-
 .../GridCancelledJobsMetricsSelfTest.java       |   47 +-
 .../GridCollisionJobsContextSelfTest.java       |   28 +-
 .../internal/GridCommunicationSelfTest.java     |   19 +-
 .../GridContinuousJobAnnotationSelfTest.java    |   36 +-
 .../GridContinuousJobSiblingsSelfTest.java      |   29 +-
 .../internal/GridContinuousTaskSelfTest.java    |   44 +-
 .../GridDeploymentMultiThreadedSelfTest.java    |   29 +-
 .../ignite/internal/GridDeploymentSelfTest.java |   43 +-
 .../internal/GridDiscoveryEventSelfTest.java    |   48 +-
 .../ignite/internal/GridDiscoverySelfTest.java  |   60 +-
 .../GridEventStorageCheckAllEventsSelfTest.java |   67 +-
 ...ventStorageRuntimeConfigurationSelfTest.java |   38 +-
 .../internal/GridEventStorageSelfTest.java      |   38 +-
 .../internal/GridFactoryVmShutdownTest.java     |   21 +-
 ...ridFailFastNodeFailureDetectionSelfTest.java |   37 +-
 .../GridFailedInputParametersSelfTest.java      |   14 +-
 .../GridFailoverCustomTopologySelfTest.java     |   38 +-
 .../ignite/internal/GridFailoverSelfTest.java   |   36 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |   41 +-
 .../internal/GridFailoverTopologySelfTest.java  |   34 +-
 .../ignite/internal/GridHomePathSelfTest.java   |   13 +-
 .../GridJobCheckpointCleanupSelfTest.java       |   35 +-
 .../GridJobCollisionCancelSelfTest.java         |   41 +-
 .../ignite/internal/GridJobContextSelfTest.java |   26 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |   71 +-
 .../internal/GridJobStealingSelfTest.java       |   51 +-
 .../GridJobStealingZeroActiveJobsSelfTest.java  |   36 +-
 .../internal/GridJobSubjectIdSelfTest.java      |   32 +-
 .../GridKernalConcurrentAccessStopSelfTest.java |   12 +-
 .../ignite/internal/GridKernalTestUtils.java    |    4 +-
 .../internal/GridLifecycleAwareSelfTest.java    |   28 +-
 .../internal/GridLifecycleBeanSelfTest.java     |   37 +-
 .../internal/GridListenActorSelfTest.java       |   21 +-
 .../GridLocalEventListenerSelfTest.java         |   18 +-
 .../internal/GridMultipleJobsSelfTest.java      |   41 +-
 .../internal/GridMultipleSpisSelfTest.java      |   40 +-
 .../GridMultipleVersionsDeploymentSelfTest.java |   48 +-
 .../GridMultithreadedJobStealingSelfTest.java   |   41 +-
 .../ignite/internal/GridNodeFilterSelfTest.java |   13 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |   17 +-
 .../GridNodeVisorAttributesSelfTest.java        |   11 +-
 .../internal/GridNonHistoryMetricsSelfTest.java |   37 +-
 .../GridProjectionForCachesSelfTest.java        |   36 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |   33 +-
 .../ignite/internal/GridReduceSelfTest.java     |   20 +-
 .../internal/GridReleaseTypeSelfTest.java       |   22 +-
 .../internal/GridRuntimeExceptionSelfTest.java  |   40 +-
 .../internal/GridSameVmStartupSelfTest.java     |   29 +-
 .../apache/ignite/internal/GridSelfTest.java    |   24 +-
 .../internal/GridSpiExceptionSelfTest.java      |   33 +-
 .../ignite/internal/GridStartStopSelfTest.java  |   31 +-
 .../apache/ignite/internal/GridStartupMain.java |    9 +-
 .../apache/ignite/internal/GridStartupTest.java |   12 +-
 .../internal/GridStopWithCancelSelfTest.java    |   28 +-
 .../internal/GridStopWithWaitSelfTest.java      |   46 +-
 .../GridTaskCancelSingleNodeSelfTest.java       |   41 +-
 .../GridTaskContinuousMapperSelfTest.java       |   31 +-
 .../GridTaskExecutionContextSelfTest.java       |   34 +-
 .../internal/GridTaskExecutionSelfTest.java     |   11 +-
 .../GridTaskFailoverAffinityRunTest.java        |   38 +-
 .../internal/GridTaskFailoverSelfTest.java      |   25 +-
 .../GridTaskFutureImplStopGridSelfTest.java     |   34 +-
 .../GridTaskInstanceExecutionSelfTest.java      |   23 +-
 .../internal/GridTaskInstantiationSelfTest.java |   26 +-
 .../internal/GridTaskJobRejectSelfTest.java     |   46 +-
 .../internal/GridTaskListenerSelfTest.java      |   28 +-
 .../internal/GridTaskMapAsyncSelfTest.java      |   33 +-
 .../GridTaskNameAnnotationSelfTest.java         |   30 +-
 .../internal/GridTaskResultCacheSelfTest.java   |   23 +-
 .../internal/GridTaskTimeoutSelfTest.java       |   42 +-
 .../GridTopicExternalizableSelfTest.java        |   14 +-
 .../internal/GridUpdateNotifierSelfTest.java    |   23 +-
 .../ignite/internal/GridVersionSelfTest.java    |   10 +-
 .../IgniteClientReconnectAbstractTest.java      |   66 +-
 .../IgniteClientReconnectApiExceptionTest.java  |   57 +-
 .../IgniteClientReconnectAtomicsTest.java       |   18 +-
 .../IgniteClientReconnectCacheTest.java         |  102 +-
 .../IgniteClientReconnectCollectionsTest.java   |   26 +-
 .../IgniteClientReconnectComputeTest.java       |   17 +-
 ...eClientReconnectContinuousProcessorTest.java |   29 +-
 ...IgniteClientReconnectDiscoveryStateTest.java |   24 +-
 ...niteClientReconnectFailoverAbstractTest.java |   38 +-
 .../IgniteClientReconnectFailoverTest.java      |   34 +-
 .../IgniteClientReconnectServicesTest.java      |   23 +-
 .../internal/IgniteClientReconnectStopTest.java |   21 +-
 .../IgniteClientReconnectStreamerTest.java      |   28 +-
 .../IgniteComputeEmptyClusterGroupTest.java     |   35 +-
 .../IgniteComputeTopologyExceptionTest.java     |   25 +-
 .../internal/IgniteExecutorServiceTest.java     |   25 +-
 ...gniteExplicitImplicitDeploymentSelfTest.java |   43 +-
 .../internal/IgniteInternalCacheRemoveTest.java |    6 +-
 .../IgniteSlowClientDetectionSelfTest.java      |   47 +-
 .../managers/GridManagerStopSelfTest.java       |   64 +-
 .../managers/GridNoopManagerSelfTest.java       |   19 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |   77 +-
 .../GridCheckpointManagerSelfTest.java          |    4 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |   49 +-
 ...idCommunicationManagerListenersSelfTest.java |   26 +-
 .../GridCommunicationSendMessageSelfTest.java   |   35 +-
 .../communication/GridIoManagerSelfTest.java    |   45 +-
 .../GridDeploymentManagerStopSelfTest.java      |   25 +-
 .../GridDeploymentMessageCountSelfTest.java     |   45 +-
 .../managers/deployment/GridTestDeployment.java |    6 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |   49 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |   69 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |   29 +-
 .../IgniteTopologyPrintFormatSelfTest.java      |   32 +-
 .../events/GridEventStorageManagerSelfTest.java |   24 +-
 .../GridSwapSpaceCustomLocalValue.java          |    7 +-
 .../swapspace/GridSwapSpaceManagerSelfTest.java |   38 +-
 .../GridPortableAffinityKeySelfTest.java        |   45 +-
 .../GridPortableBuilderAdditionalSelfTest.java  |   63 +-
 .../portable/GridPortableBuilderSelfTest.java   |   45 +-
 ...eBuilderStringAsCharsAdditionalSelfTest.java |    2 +-
 ...ridPortableBuilderStringAsCharsSelfTest.java |    2 +-
 ...idPortableMarshallerCtxDisabledSelfTest.java |   14 +-
 .../GridPortableMarshallerSelfTest.java         |   77 +-
 .../GridPortableMetaDataDisabledSelfTest.java   |   19 +-
 .../portable/GridPortableMetaDataSelfTest.java  |   27 +-
 .../portable/GridPortableWildcardsSelfTest.java |   18 +-
 .../GridPortableMarshalerAwareTestClass.java    |   13 +-
 .../mutabletest/GridPortableTestClasses.java    |   23 +-
 .../portable/test/GridPortableTestClass1.java   |    2 +-
 .../portable/test/GridPortableTestClass2.java   |    2 +-
 .../test/subpackage/GridPortableTestClass3.java |    2 +-
 .../GridCacheTxLoadFromStoreOnLockSelfTest.java |   36 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |   32 +-
 ...GridAffinityProcessorRendezvousSelfTest.java |    6 +-
 .../cache/CacheAffinityCallSelfTest.java        |   42 +-
 .../cache/CacheClientStoreSelfTest.java         |   33 +-
 ...cheDhtLocalPartitionAfterRemoveSelfTest.java |   13 +-
 .../cache/CacheFutureExceptionSelfTest.java     |   32 +-
 .../processors/cache/CacheGetFromJobTest.java   |   19 +-
 .../CacheMetricsForClusterGroupSelfTest.java    |   31 +-
 ...cheNearUpdateTopologyChangeAbstractTest.java |   27 +-
 .../cache/CacheOffheapMapEntrySelfTest.java     |   36 +-
 .../CacheReadThroughAtomicRestartSelfTest.java  |    6 +-
 ...heReadThroughLocalAtomicRestartSelfTest.java |    6 +-
 .../CacheReadThroughLocalRestartSelfTest.java   |    6 +-
 ...dThroughReplicatedAtomicRestartSelfTest.java |    6 +-
 ...cheReadThroughReplicatedRestartSelfTest.java |    6 +-
 .../cache/CacheReadThroughRestartSelfTest.java  |   28 +-
 .../cache/CacheRemoveAllSelfTest.java           |   17 +-
 .../cache/CacheStopAndDestroySelfTest.java      |   50 +-
 .../CacheStoreUsageMultinodeAbstractTest.java   |   64 +-
 ...eUsageMultinodeDynamicStartAbstractTest.java |    8 +-
 ...oreUsageMultinodeDynamicStartAtomicTest.java |    6 +-
 ...heStoreUsageMultinodeDynamicStartTxTest.java |    6 +-
 ...reUsageMultinodeStaticStartAbstractTest.java |    9 +-
 ...toreUsageMultinodeStaticStartAtomicTest.java |    6 +-
 ...cheStoreUsageMultinodeStaticStartTxTest.java |    6 +-
 .../cache/CrossCacheTxRandomOperationsTest.java |   59 +-
 ...ridCacheAbstractByteArrayValuesSelfTest.java |   12 +-
 .../GridCacheAbstractFailoverSelfTest.java      |   42 +-
 .../GridCacheAbstractFailoverTxSelfTest.java    |    9 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |   35 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  132 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |   14 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |   73 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |   42 +-
 .../GridCacheAbstractRemoveFailureTest.java     |   45 +-
 .../cache/GridCacheAbstractSelfTest.java        |   70 +-
 .../cache/GridCacheAbstractTxReadTest.java      |   14 +-
 ...acheAbstractUsersAffinityMapperSelfTest.java |   37 +-
 .../cache/GridCacheAffinityApiSelfTest.java     |   34 +-
 .../cache/GridCacheAffinityMapperSelfTest.java  |   14 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |   45 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java    |   11 +-
 .../GridCacheAsyncOperationsLimitSelfTest.java  |   15 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |   49 +-
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |    7 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |   50 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   47 +-
 ...acheBasicStoreMultithreadedAbstractTest.java |   29 +-
 .../cache/GridCacheClearAllSelfTest.java        |   31 +-
 .../cache/GridCacheClearLocallySelfTest.java    |   42 +-
 ...dCacheColocatedTxStoreExceptionSelfTest.java |    8 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |   35 +-
 .../cache/GridCacheConcurrentMapTest.java       |   28 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   97 +-
 ...idCacheConfigurationConsistencySelfTest.java |   85 +-
 ...ridCacheConfigurationValidationSelfTest.java |   27 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |   35 +-
 .../GridCacheDeploymentOffHeapSelfTest.java     |    9 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   42 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   47 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |   37 +-
 .../GridCacheEvictionEventAbstractTest.java     |   39 +-
 .../GridCacheFinishPartitionsSelfTest.java      |   42 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |   29 +-
 .../cache/GridCacheGenericTestStore.java        |   29 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |   40 +-
 .../cache/GridCacheIncrementTransformTest.java  |   46 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |   57 +-
 ...cheInterceptorAtomicNearEnabledSelfTest.java |    4 +-
 ...erceptorAtomicPrimaryWriteOrderSelfTest.java |   14 +-
 ...omicReplicatedPrimaryWriteOrderSelfTest.java |   14 +-
 ...acheInterceptorAtomicReplicatedSelfTest.java |   14 +-
 .../GridCacheInterceptorAtomicSelfTest.java     |   14 +-
 ...ceptorAtomicWithStoreReplicatedSelfTest.java |    2 +-
 ...CacheInterceptorAtomicWithStoreSelfTest.java |    2 +-
 ...GridCacheInterceptorLocalAtomicSelfTest.java |   14 +-
 ...InterceptorLocalAtomicWithStoreSelfTest.java |    2 +-
 .../GridCacheInterceptorLocalSelfTest.java      |    9 +-
 ...dCacheInterceptorLocalWithStoreSelfTest.java |    2 +-
 ...GridCacheInterceptorNearEnabledSelfTest.java |    6 +-
 .../GridCacheInterceptorReplicatedSelfTest.java |    9 +-
 ...eInterceptorReplicatedWithStoreSelfTest.java |    2 +-
 .../cache/GridCacheInterceptorSelfTest.java     |    9 +-
 .../GridCacheInterceptorWithStoreSelfTest.java  |    2 +-
 .../cache/GridCacheIteratorPerformanceTest.java |   27 +-
 .../GridCacheKeyCheckNearEnabledSelfTest.java   |    4 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |   25 +-
 .../processors/cache/GridCacheLeakTest.java     |   33 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   52 +-
 .../GridCacheLocalTxStoreExceptionSelfTest.java |    6 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |   42 +-
 .../GridCacheMarshallerTxAbstractTest.java      |   28 +-
 .../GridCacheMarshallingNodeJoinSelfTest.java   |   50 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |   37 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |   33 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |   47 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |   46 +-
 ...ridCacheMultinodeUpdateAbstractSelfTest.java |   26 +-
 ...ultinodeUpdateAtomicNearEnabledSelfTest.java |    8 +-
 .../GridCacheMultinodeUpdateAtomicSelfTest.java |    8 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |    4 +-
 ...CacheMultinodeUpdateNearEnabledSelfTest.java |    8 +-
 .../cache/GridCacheMultinodeUpdateSelfTest.java |    8 +-
 .../cache/GridCacheMvccFlagsTest.java           |   16 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |   31 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |   29 +-
 .../processors/cache/GridCacheMvccSelfTest.java |   30 +-
 .../GridCacheNearTxStoreExceptionSelfTest.java  |    6 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |   40 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |   41 +-
 ...ffHeapAtomicMultiThreadedUpdateSelfTest.java |    6 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |   34 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |   18 +-
 .../processors/cache/GridCacheOffHeapTest.java  |   35 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   49 +-
 .../GridCacheOffHeapTieredAtomicSelfTest.java   |    6 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |   34 +-
 ...acheOffHeapTieredEvictionAtomicSelfTest.java |    6 +-
 .../GridCacheOffHeapTieredEvictionSelfTest.java |    6 +-
 .../cache/GridCacheOffHeapTieredSelfTest.java   |    6 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |   26 +-
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |   40 +-
 .../GridCacheOnCopyFlagAtomicSelfTest.java      |    9 +-
 .../cache/GridCacheOnCopyFlagLocalSelfTest.java |    9 +-
 .../GridCacheOnCopyFlagReplicatedSelfTest.java  |    9 +-
 ...ridCacheOnCopyFlagTxPartitionedSelfTest.java |    9 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |   29 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   50 +-
 .../GridCachePartitionedAffinitySpreadTest.java |   19 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |   42 +-
 .../GridCachePartitionedLocalStoreSelfTest.java |   11 +-
 ...chePartitionedOffHeapLocalStoreSelfTest.java |   11 +-
 ...hePartitionedProjectionAffinitySelfTest.java |   31 +-
 .../cache/GridCachePartitionedWritesTest.java   |   28 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |   61 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |   79 +-
 .../processors/cache/GridCachePutAllTask.java   |   37 +-
 .../cache/GridCacheQueryEmbeddedValue.java      |    9 +-
 .../GridCacheQueryIndexingDisabledSelfTest.java |   20 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |   33 +-
 .../GridCacheReferenceCleanupSelfTest.java      |   45 +-
 .../cache/GridCacheReloadSelfTest.java          |   29 +-
 .../GridCacheReplicatedLocalStoreSelfTest.java  |   11 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |   50 +-
 ...CacheReplicatedTxStoreExceptionSelfTest.java |    8 +-
 ...heReplicatedUsersAffinityMapperSelfTest.java |    7 +-
 .../GridCacheReturnValueTransferSelfTest.java   |   35 +-
 .../cache/GridCacheSlowTxWarnTest.java          |   26 +-
 .../processors/cache/GridCacheStopSelfTest.java |   35 +-
 .../cache/GridCacheStorePutxSelfTest.java       |   39 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |   24 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |   46 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |   54 +-
 ...acheTcpClientDiscoveryMultiThreadedTest.java |   31 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   32 +-
 .../processors/cache/GridCacheTestKey.java      |    7 +-
 .../processors/cache/GridCacheTestStore.java    |   45 +-
 .../processors/cache/GridCacheTestValue.java    |    9 +-
 .../processors/cache/GridCacheTestValue2.java   |   11 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |   22 +-
 .../cache/GridCacheTtlManagerLoadTest.java      |   23 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |   35 +-
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |   11 +-
 .../GridCacheTxUsersAffinityMapperSelfTest.java |    7 +-
 .../cache/GridCacheUtilsSelfTest.java           |   18 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |   26 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |   37 +-
 ...istencyTransactionalNearEnabledSelfTest.java |    4 +-
 ...heValueConsistencyTransactionalSelfTest.java |    6 +-
 .../GridCacheVariableTopologySelfTest.java      |   43 +-
 .../cache/GridCacheVersionMultinodeTest.java    |   39 +-
 .../cache/GridCacheVersionSelfTest.java         |   16 +-
 ...ProjectionForCachesOnDaemonNodeSelfTest.java |   20 +-
 ...teAtomicCacheEntryProcessorNodeJoinTest.java |    6 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |   62 +-
 .../cache/IgniteCacheAbstractTest.java          |   47 +-
 ...IgniteCacheAtomicCopyOnReadDisabledTest.java |    6 +-
 .../cache/IgniteCacheAtomicInvokeTest.java      |   14 +-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |   11 +-
 .../IgniteCacheAtomicLocalPeekModesTest.java    |    9 +-
 .../IgniteCacheAtomicLocalStoreValueTest.java   |   11 +-
 ...niteCacheAtomicLocalWithStoreInvokeTest.java |    7 +-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |    4 +-
 ...iteCacheAtomicNearEnabledStoreValueTest.java |    4 +-
 .../IgniteCacheAtomicNearPeekModesTest.java     |    2 +-
 .../cache/IgniteCacheAtomicPeekModesTest.java   |   12 +-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |   14 +-
 ...maryWriteOrderNearEnabledStoreValueTest.java |    4 +-
 ...heAtomicPrimaryWriteOrderStoreValueTest.java |    6 +-
 ...micPrimaryWriteOrderWithStoreInvokeTest.java |    7 +-
 ...IgniteCacheAtomicPutAllFailoverSelfTest.java |    6 +-
 ...gniteCacheAtomicReplicatedPeekModesTest.java |    6 +-
 .../IgniteCacheAtomicStopBusySelfTest.java      |    6 +-
 .../cache/IgniteCacheAtomicStoreValueTest.java  |   14 +-
 ...teCacheConfigurationDefaultTemplateTest.java |   16 +-
 .../IgniteCacheConfigurationTemplateTest.java   |   36 +-
 .../IgniteCacheContainsKeyAbstractSelfTest.java |   23 +-
 ...niteCacheCopyOnReadDisabledAbstractTest.java |   12 +-
 .../cache/IgniteCacheDynamicStopSelfTest.java   |   18 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |   71 +-
 ...IgniteCacheEntryListenerAtomicLocalTest.java |   11 +-
 ...eCacheEntryListenerAtomicReplicatedTest.java |    6 +-
 .../IgniteCacheEntryListenerAtomicTest.java     |   14 +-
 ...eCacheEntryListenerEagerTtlDisabledTest.java |    6 +-
 .../IgniteCacheEntryListenerTxLocalTest.java    |   11 +-
 ...gniteCacheEntryListenerTxReplicatedTest.java |    6 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |   11 +-
 .../IgniteCacheEntryProcessorNodeJoinTest.java  |   49 +-
 .../IgniteCacheInterceptorSelfTestSuite.java    |    4 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |   47 +-
 .../cache/IgniteCacheInvokeReadThroughTest.java |   22 +-
 .../IgniteCacheManyAsyncOperationsTest.java     |   26 +-
 .../cache/IgniteCacheNearLockValueSelfTest.java |   45 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |   23 +-
 ...gniteCacheP2pUnmarshallingNearErrorTest.java |    7 +-
 ...CacheP2pUnmarshallingRebalanceErrorTest.java |    9 +-
 .../IgniteCacheP2pUnmarshallingTxErrorTest.java |   25 +-
 .../IgniteCachePartitionMapUpdateTest.java      |   32 +-
 .../cache/IgniteCachePeekModesAbstractTest.java |   53 +-
 .../cache/IgniteCachePutAllRestartTest.java     |   40 +-
 .../cache/IgniteCacheStartStopLoadTest.java     |   20 +-
 .../IgniteCacheStoreValueAbstractTest.java      |   46 +-
 .../IgniteCacheTopologySafeGetSelfTest.java     |   44 +-
 ...gniteCacheTransactionalStopBusySelfTest.java |    4 +-
 .../IgniteCacheTxCopyOnReadDisabledTest.java    |    6 +-
 .../cache/IgniteCacheTxInvokeTest.java          |   11 +-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |   11 +-
 .../cache/IgniteCacheTxLocalPeekModesTest.java  |    9 +-
 .../cache/IgniteCacheTxLocalStoreValueTest.java |   11 +-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |    4 +-
 .../IgniteCacheTxNearEnabledStoreValueTest.java |    4 +-
 .../cache/IgniteCacheTxNearPeekModesTest.java   |    2 +-
 .../cache/IgniteCacheTxPeekModesTest.java       |   12 +-
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   40 +-
 .../IgniteCacheTxReplicatedPeekModesTest.java   |    6 +-
 .../cache/IgniteCacheTxStoreValueTest.java      |   11 +-
 .../cache/IgniteCachingProviderSelfTest.java    |   18 +-
 .../IgniteClientAffinityAssignmentSelfTest.java |   34 +-
 .../IgniteDaemonNodeMarshallerCacheTest.java    |   31 +-
 .../cache/IgniteDynamicCacheAndNodeStop.java    |   95 +
 ...eDynamicCacheStartNoExchangeTimeoutTest.java |   55 +-
 .../cache/IgniteDynamicCacheStartSelfTest.java  |   57 +-
 ...niteDynamicCacheWithConfigStartSelfTest.java |   15 +-
 .../IgniteDynamicClientCacheStartSelfTest.java  |   38 +-
 .../cache/IgniteExchangeFutureHistoryTest.java  |   17 +-
 .../cache/IgniteInternalCacheTypesTest.java     |   30 +-
 .../cache/IgnitePutAllLargeBatchSelfTest.java   |   37 +-
 ...tAllUpdateNonPreloadedPartitionSelfTest.java |   26 +-
 ...teStartCacheInTransactionAtomicSelfTest.java |    6 +-
 .../IgniteStartCacheInTransactionSelfTest.java  |   28 +-
 .../cache/IgniteStaticCacheStartSelfTest.java   |   14 +-
 .../cache/IgniteSystemCacheOnClientTest.java    |   25 +-
 ...gniteTopologyValidatorAbstractCacheTest.java |   20 +-
 ...iteTopologyValidatorAbstractTxCacheTest.java |   12 +-
 ...ValidatorNearPartitionedAtomicCacheTest.java |    4 +-
 ...logyValidatorNearPartitionedTxCacheTest.java |    4 +-
 ...logyValidatorPartitionedAtomicCacheTest.java |   12 +-
 ...TopologyValidatorPartitionedTxCacheTest.java |    4 +-
 ...ologyValidatorReplicatedAtomicCacheTest.java |   12 +-
 ...eTopologyValidatorReplicatedTxCacheTest.java |    4 +-
 .../processors/cache/IgniteTxAbstractTest.java  |   48 +-
 .../IgniteTxConcurrentGetAbstractTest.java      |   33 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |   49 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |   65 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |   36 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |   51 +-
 .../IgniteTxSingleThreadedAbstractTest.java     |   11 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |   48 +-
 .../cache/OffHeapTieredTransactionSelfTest.java |   40 +-
 ...IgniteCacheAbstractExecutionContextTest.java |   17 +-
 .../IgniteCacheAtomicExecutionContextTest.java  |   12 +-
 ...niteCacheContinuousExecutionContextTest.java |    5 +-
 ...IgniteCacheIsolatedExecutionContextTest.java |    5 +-
 ...niteCacheP2PDisableExecutionContextTest.java |    4 +-
 ...iteCachePartitionedExecutionContextTest.java |   12 +-
 .../IgniteCachePrivateExecutionContextTest.java |    5 +-
 ...niteCacheReplicatedExecutionContextTest.java |   12 +-
 .../IgniteCacheSharedExecutionContextTest.java  |    5 +-
 .../IgniteCacheTxExecutionContextTest.java      |   12 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |   41 +-
 ...actQueueFailoverDataConsistencySelfTest.java |   41 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |    8 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |   11 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |    8 +-
 .../GridCacheMultiNodeDataStructureTest.java    |   11 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |   31 +-
 .../GridCacheQueueCleanupSelfTest.java          |   41 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |   36 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |   38 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |   34 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |   28 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   43 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |   27 +-
 .../GridCacheSetAbstractSelfTest.java           |   45 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   36 +-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |   17 +-
 .../IgniteAtomicsAbstractTest.java              |   15 +-
 .../IgniteClientDataStructuresAbstractTest.java |   30 +-
 .../IgniteClientDataStructuresTest.java         |    2 +-
 ...IgniteClientDiscoveryDataStructuresTest.java |    2 +-
 .../IgniteCollectionAbstractTest.java           |   30 +-
 .../IgniteCountDownLatchAbstractSelfTest.java   |   44 +-
 .../IgniteDataStructureUniqueNameTest.java      |   42 +-
 .../IgniteDataStructureWithJobTest.java         |   28 +-
 .../GridCacheLocalAtomicOffheapSetSelfTest.java |    6 +-
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |    9 +-
 .../local/GridCacheLocalAtomicSetSelfTest.java  |   14 +-
 .../GridCacheLocalOffheapQueueApiSelfTest.java  |    6 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |   14 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |    8 +-
 .../local/GridCacheLocalSetSelfTest.java        |   14 +-
 .../local/IgniteLocalAtomicLongApiSelfTest.java |    8 +-
 .../IgniteLocalCountDownLatchSelfTest.java      |   24 +-
 ...artitionedAtomicOffheapQueueApiSelfTest.java |    6 +-
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |    6 +-
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java |    6 +-
 ...dCachePartitionedAtomicQueueApiSelfTest.java |    9 +-
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |    9 +-
 ...micQueueFailoverDataConsistencySelfTest.java |   11 +-
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |    9 +-
 ...itionedAtomicQueueRotativeMultiNodeTest.java |    9 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |   10 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |   10 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   23 +-
 ...chePartitionedAtomicSetFailoverSelfTest.java |   11 +-
 .../GridCachePartitionedAtomicSetSelfTest.java  |    6 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |   10 +-
 ...rtitionedDataStructuresFailoverSelfTest.java |   14 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |   39 +-
 ...artitionedOffHeapValuesQueueApiSelfTest.java |    6 +-
 ...achePartitionedOffHeapValuesSetSelfTest.java |    6 +-
 ...edOffheapDataStructuresFailoverSelfTest.java |    6 +-
 ...hePartitionedOffheapSetFailoverSelfTest.java |    6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   14 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   46 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   50 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |   11 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |   14 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |   14 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |   14 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |   10 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |   10 +-
 ...GridCachePartitionedSetFailoverSelfTest.java |   11 +-
 .../GridCachePartitionedSetSelfTest.java        |   14 +-
 .../IgnitePartitionedAtomicLongApiSelfTest.java |    8 +-
 ...IgnitePartitionedCountDownLatchSelfTest.java |    8 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |   16 +-
 ...cheReplicatedAtomicReferenceApiSelfTest.java |    8 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |    8 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |    8 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |   14 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |   14 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |   14 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |   14 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |    8 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |   10 +-
 .../GridCacheReplicatedSetSelfTest.java         |   14 +-
 .../IgniteReplicatedAtomicLongApiSelfTest.java  |    8 +-
 .../IgniteReplicatedCountDownLatchSelfTest.java |    8 +-
 ...acheAsyncOperationsFailoverAbstractTest.java |   40 +-
 .../CacheAsyncOperationsFailoverAtomicTest.java |    6 +-
 .../CacheAsyncOperationsFailoverTxTest.java     |    6 +-
 .../distributed/CacheAsyncOperationsTest.java   |   43 +-
 ...CacheAtomicNearUpdateTopologyChangeTest.java |   11 +-
 .../CacheGetFutureHangsSelfTest.java            |   35 +-
 ...CacheLoadingConcurrentGridStartSelfTest.java |   40 +-
 .../CacheNoValueClassOnServerNodeTest.java      |   30 +-
 .../CacheTxNearUpdateTopologyChangeTest.java    |    8 +-
 ...tractDistributedByteArrayValuesSelfTest.java |   32 +-
 .../GridCacheAbstractJobExecutionTest.java      |   44 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |   57 +-
 ...tractPartitionedByteArrayValuesSelfTest.java |   17 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |   32 +-
 .../GridCacheBasicOpAbstractTest.java           |   45 +-
 .../GridCacheClientModesAbstractSelfTest.java   |   30 +-
 ...ientModesTcpClientDiscoveryAbstractTest.java |   13 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |   31 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |   19 +-
 .../distributed/GridCacheEventAbstractTest.java |   51 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |   36 +-
 .../distributed/GridCacheLockAbstractTest.java  |   50 +-
 .../distributed/GridCacheMixedModeSelfTest.java |   15 +-
 .../GridCacheModuloAffinityFunction.java        |   21 +-
 .../GridCacheMultiNodeAbstractTest.java         |   46 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |   47 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |   79 +-
 .../GridCacheNodeFailureAbstractTest.java       |   59 +-
 ...ridCachePartitionNotLoadedEventSelfTest.java |   43 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |   38 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |   51 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |   41 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |   30 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |   40 +-
 .../GridCacheTransformEventSelfTest.java        |   69 +-
 .../distributed/IgniteCache150ClientsTest.java  |   44 +-
 .../IgniteCacheAtomicMessageRecoveryTest.java   |    6 +-
 .../IgniteCacheAtomicNodeJoinTest.java          |   11 +-
 .../IgniteCacheAtomicNodeRestartTest.java       |    8 +-
 ...niteCacheClientNodeChangingTopologyTest.java |  120 +-
 .../IgniteCacheClientNodeConcurrentStart.java   |   25 +-
 ...teCacheClientNodePartitionsExchangeTest.java |   72 +-
 .../IgniteCacheClientReconnectTest.java         |   36 +-
 .../distributed/IgniteCacheManyClientsTest.java |   49 +-
 .../IgniteCacheMessageRecoveryAbstractTest.java |   45 +-
 .../IgniteCacheNearOffheapGetSelfTest.java      |   29 +-
 .../IgniteCacheNodeJoinAbstractTest.java        |   26 +-
 .../IgniteCachePutGetRestartAbstractTest.java   |   42 +-
 .../IgniteCacheServerNodeConcurrentStart.java   |   18 +-
 .../IgniteCacheSizeFailoverTest.java            |   35 +-
 .../IgniteCacheSystemTransactionsSelfTest.java  |   39 +-
 .../IgniteCacheTxFairAffinityNodeJoinTest.java  |    6 +-
 .../IgniteCacheTxMessageRecoveryTest.java       |    6 +-
 ...arDisabledFairAffinityPutGetRestartTest.java |    6 +-
 ...iteCacheTxNearDisabledPutGetRestartTest.java |    4 +-
 .../distributed/IgniteCacheTxNodeJoinTest.java  |    8 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        |   39 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |   47 +-
 .../distributed/IgniteTxGetAfterStopTest.java   |   22 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |   57 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |   68 +-
 .../IgniteTxPreloadAbstractTest.java            |   41 +-
 .../IgniteTxTimeoutAbstractTest.java            |   30 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |   18 +-
 ...heAbstractTransformWriteThroughSelfTest.java |   42 +-
 ...acheAtomicExpiredEntriesPreloadSelfTest.java |   13 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |   29 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |   58 +-
 ...idCacheAtomicNearEnabledFullApiSelfTest.java |    4 +-
 ...EnabledPrimaryWriteOrderFullApiSelfTest.java |    4 +-
 ...eAtomicPrimaryWriteOrderFullApiSelfTest.java |    6 +-
 ...tomicPrimaryWriteOrderReloadAllSelfTest.java |    6 +-
 .../dht/GridCacheAtomicReloadAllSelfTest.java   |    8 +-
 .../dht/GridCacheClientOnlySelfTest.java        |   15 +-
 .../dht/GridCacheColocatedDebugTest.java        |   64 +-
 .../dht/GridCacheColocatedFailoverSelfTest.java |   10 +-
 ...eColocatedOptimisticTransactionSelfTest.java |   34 +-
 ...ridCacheColocatedPreloadRestartSelfTest.java |    4 +-
 .../GridCacheColocatedPrimarySyncSelfTest.java  |    6 +-
 .../GridCacheColocatedReloadAllSelfTest.java    |    4 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |   10 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |   17 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |   26 +-
 .../GridCacheDaemonNodePartitionedSelfTest.java |    6 +-
 ...cheDhtAtomicEvictionNearReadersSelfTest.java |    6 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |   13 +-
 .../GridCacheDhtClientRemoveFailureTest.java    |    2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   47 +-
 .../dht/GridCacheDhtEntrySetSelfTest.java       |   10 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   52 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   53 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |   24 +-
 ...idCacheDhtExpiredEntriesPreloadSelfTest.java |   10 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |   43 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |   30 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |   18 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   39 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   65 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   56 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |   50 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |   34 +-
 .../dht/GridCacheDhtPreloadOffHeapSelfTest.java |    8 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |   44 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |   74 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |   50 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   40 +-
 .../dht/GridCacheDhtRemoveFailureTest.java      |   10 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   42 +-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |   10 +-
 .../dht/GridCacheGlobalLoadTest.java            |   39 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |    6 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |    6 +-
 ...ePartitionedNearDisabledFullApiSelfTest.java |    6 +-
 ...achePartitionedNearDisabledLockSelfTest.java |    6 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   18 +-
 ...nedNearDisabledMultiNodeFullApiSelfTest.java |    6 +-
 ...bledMultiNodeP2PDisabledFullApiSelfTest.java |    6 +-
 ...ionedNearDisabledOffHeapFullApiSelfTest.java |    6 +-
 ...DisabledOffHeapMultiNodeFullApiSelfTest.java |    6 +-
 ...abledOffHeapTieredAtomicFullApiSelfTest.java |   13 +-
 ...earDisabledOffHeapTieredFullApiSelfTest.java |    6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |    6 +-
 ...NearDisabledOptimisticTxNodeRestartTest.java |    4 +-
 ...isabledTxOriginatingNodeFailureSelfTest.java |    4 +-
 ...dOnlyP2PDisabledByteArrayValuesSelfTest.java |    2 +-
 ...edOnlyP2PEnabledByteArrayValuesSelfTest.java |    2 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |   37 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   65 +-
 ...ransformWriteThroughBatchUpdateSelfTest.java |    2 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |   19 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |   42 +-
 ...IgniteCacheContainsKeyColocatedSelfTest.java |    8 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   64 +-
 .../dht/IgniteCacheLockFailoverSelfTest.java    |   24 +-
 .../dht/IgniteCacheMultiTxLockSelfTest.java     |   42 +-
 ...rDisabledPrimaryNodeFailureRecoveryTest.java |    4 +-
 ...rtitionedPrimaryNodeFailureRecoveryTest.java |    4 +-
 ...woBackupsPrimaryNodeFailureRecoveryTest.java |    4 +-
 ...ePrimaryNodeFailureRecoveryAbstractTest.java |   72 +-
 .../IgniteCachePutRetryAbstractSelfTest.java    |  325 ++-
 .../dht/IgniteCachePutRetryAtomicSelfTest.java  |   83 +-
 ...gniteCachePutRetryTransactionalSelfTest.java |   58 +-
 ...teTxConsistencyColocatedRestartSelfTest.java |    8 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |   15 +-
 ...cClientInvalidPartitionHandlingSelfTest.java |    2 +-
 .../GridCacheAtomicClientRemoveFailureTest.java |    2 +-
 .../atomic/GridCacheAtomicFailoverSelfTest.java |   16 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   81 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |   40 +-
 ...AtomicPrimaryWriteOrderFailoverSelfTest.java |    6 +-
 ...tomicPrimaryWriteOrderRemoveFailureTest.java |   16 +-
 .../GridCacheAtomicRemoveFailureTest.java       |   16 +-
 ...idCacheAtomicReplicatedFailoverSelfTest.java |    8 +-
 ...lueConsistencyAtomicNearEnabledSelfTest.java |    4 +-
 ...micPrimaryWriteOrderNearEnabledSelfTest.java |    8 +-
 ...sistencyAtomicPrimaryWriteOrderSelfTest.java |    6 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |    8 +-
 ...CacheContainsKeyColocatedAtomicSelfTest.java |    9 +-
 ...gniteCacheContainsKeyNearAtomicSelfTest.java |    7 +-
 ...PutRetryAtomicPrimaryWriteOrderSelfTest.java |    8 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |    6 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |   43 +-
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java |    6 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |   43 +-
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |    4 +-
 ...micFairAffinityMultiNodeFullApiSelfTest.java |    6 +-
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |   14 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |   12 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |    6 +-
 ...omicNearEnabledMultiNodeFullApiSelfTest.java |    4 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    4 +-
 ...ridCacheAtomicNearEvictionEventSelfTest.java |   11 +-
 .../GridCacheAtomicNearEvictionSelfTest.java    |    6 +-
 .../GridCacheAtomicNearMultiNodeSelfTest.java   |    6 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |   27 +-
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 .../GridCacheAtomicNearReadersSelfTest.java     |    6 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |   14 +-
 .../GridCacheAtomicOffHeapFullApiSelfTest.java  |   12 +-
 ...heAtomicOffHeapMultiNodeFullApiSelfTest.java |   12 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |    6 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |   16 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |    9 +-
 ...derFairAffinityMultiNodeFullApiSelfTest.java |    6 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    6 +-
 ...rderMultiNodeP2PDisabledFullApiSelfTest.java |    6 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |   14 +-
 ...PrimaryWriteOrderOffHeapFullApiSelfTest.java |    6 +-
 ...yWriteOrderOffHeapTieredFullApiSelfTest.java |    6 +-
 ...ityOrderOffHeapMultiNodeFullApiSelfTest.java |    6 +-
 ...erOffHeapTieredMultiNodeFullApiSelfTest.java |    6 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |   43 +-
 .../GridCacheNearEvictionEventSelfTest.java     |    9 +-
 .../near/GridCacheNearEvictionSelfTest.java     |   41 +-
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |    8 +-
 .../near/GridCacheNearJobExecutionSelfTest.java |   13 +-
 .../near/GridCacheNearMetricsSelfTest.java      |   16 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |   49 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   79 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |   40 +-
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java |    6 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   61 +-
 ...OnlyMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 .../near/GridCacheNearOnlySelfTest.java         |   16 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |   43 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |   35 +-
 ...ionedP2PDisabledByteArrayValuesSelfTest.java |    2 +-
 ...tionedP2PEnabledByteArrayValuesSelfTest.java |    2 +-
 .../GridCacheNearPreloadRestartSelfTest.java    |    4 +-
 .../near/GridCacheNearPrimarySyncSelfTest.java  |    6 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |   34 +-
 .../near/GridCacheNearReadersSelfTest.java      |   59 +-
 .../near/GridCacheNearReloadAllSelfTest.java    |    4 +-
 .../near/GridCacheNearRemoveFailureTest.java    |   11 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |    8 +-
 .../near/GridCacheNearTxForceKeyTest.java       |   25 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |   55 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |   15 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |   11 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |   35 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |   30 +-
 .../GridCachePartitionedAffinitySelfTest.java   |   57 +-
 ...ionedAtomicGetAndTransformStoreSelfTest.java |    6 +-
 .../near/GridCachePartitionedBasicApiTest.java  |   12 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |   14 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   42 +-
 .../GridCachePartitionedBasicStoreSelfTest.java |    8 +-
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |   19 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |    4 +-
 .../GridCachePartitionedEntryLockSelfTest.java  |    9 +-
 .../near/GridCachePartitionedEventSelfTest.java |   15 +-
 .../GridCachePartitionedEvictionSelfTest.java   |   50 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   42 +-
 .../GridCachePartitionedFailoverSelfTest.java   |    8 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |   32 +-
 ...PartitionedFullApiMultithreadedSelfTest.java |    8 +-
 .../GridCachePartitionedFullApiSelfTest.java    |   23 +-
 ...PartitionedGetAndTransformStoreSelfTest.java |    8 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |   40 +-
 .../GridCachePartitionedIteratorsSelfTest.java  |    8 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |   36 +-
 .../near/GridCachePartitionedLockSelfTest.java  |   14 +-
 .../GridCachePartitionedMetricsSelfTest.java    |   13 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |   72 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   47 +-
 ...idCachePartitionedMultiNodeLockSelfTest.java |   13 +-
 ...onedMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 .../GridCachePartitionedMultiNodeSelfTest.java  |   13 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |   44 +-
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |    4 +-
 ...itionedNearOnlyNoPrimaryFullApiSelfTest.java |    4 +-
 .../near/GridCachePartitionedNestedTxTest.java  |   11 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |   13 +-
 .../GridCachePartitionedNodeRestartTest.java    |   15 +-
 ...dCachePartitionedOffHeapFullApiSelfTest.java |    6 +-
 ...titionedOffHeapMultiNodeFullApiSelfTest.java |    6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |    9 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |   18 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |   42 +-
 .../GridCachePartitionedStorePutSelfTest.java   |   34 +-
 ...GridCachePartitionedTxConcurrentGetTest.java |   11 +-
 ...GridCachePartitionedTxMultiNodeSelfTest.java |   11 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |   22 +-
 .../near/GridCachePartitionedTxReadTest.java    |    6 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   49 +-
 ...achePartitionedTxSingleThreadedSelfTest.java |   26 +-
 .../GridCachePartitionedTxTimeoutSelfTest.java  |   18 +-
 .../near/GridCachePutArrayValueSelfTest.java    |   21 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |   28 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |    6 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |   34 +-
 .../IgniteCacheContainsKeyNearSelfTest.java     |    6 +-
 .../near/IgniteCacheNearOnlyTxTest.java         |   34 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |   19 +-
 .../near/IgniteCacheNearTxRollbackTest.java     |   39 +-
 .../near/IgniteTxReentryNearSelfTest.java       |   15 +-
 .../near/NoneRebalanceModeSelfTest.java         |   15 +-
 ...stractReplicatedByteArrayValuesSelfTest.java |   16 +-
 ...ridCacheAtomicReplicatedMetricsSelfTest.java |   12 +-
 .../GridCacheDaemonNodeReplicatedSelfTest.java  |    6 +-
 ...nedFairAffinityMultiNodeFullApiSelfTest.java |    8 +-
 ...ridCacheReplicatedAtomicFullApiSelfTest.java |    6 +-
 ...catedAtomicGetAndTransformStoreSelfTest.java |    6 +-
 ...eplicatedAtomicMultiNodeFullApiSelfTest.java |   11 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    6 +-
 .../GridCacheReplicatedBasicApiTest.java        |    9 +-
 .../GridCacheReplicatedBasicOpSelfTest.java     |    9 +-
 .../GridCacheReplicatedBasicStoreSelfTest.java  |    8 +-
 .../GridCacheReplicatedEntrySetSelfTest.java    |    8 +-
 .../GridCacheReplicatedEventSelfTest.java       |    8 +-
 ...ridCacheReplicatedEvictionEventSelfTest.java |    9 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |   31 +-
 .../GridCacheReplicatedFailoverSelfTest.java    |   10 +-
 ...eReplicatedFullApiMultithreadedSelfTest.java |    8 +-
 ...ReplicatedFullApiMultithreadedSelfTest1.java |    4 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |   12 +-
 ...eReplicatedGetAndTransformStoreSelfTest.java |    8 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |   56 +-
 .../GridCacheReplicatedIteratorsSelfTest.java   |    8 +-
 .../GridCacheReplicatedJobExecutionTest.java    |   11 +-
 .../GridCacheReplicatedLockSelfTest.java        |    8 +-
 .../GridCacheReplicatedMarshallerTxTest.java    |   11 +-
 .../GridCacheReplicatedMetricsSelfTest.java     |    9 +-
 ...CacheReplicatedMultiNodeFullApiSelfTest.java |    2 +-
 ...ridCacheReplicatedMultiNodeLockSelfTest.java |    8 +-
 ...atedMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 .../GridCacheReplicatedMultiNodeSelfTest.java   |    9 +-
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |    8 +-
 .../GridCacheReplicatedNodeFailureSelfTest.java |   11 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |   13 +-
 ...idCacheReplicatedOffHeapFullApiSelfTest.java |    6 +-
 ...plicatedOffHeapMultiNodeFullApiSelfTest.java |    6 +-
 ...eReplicatedOffHeapTieredFullApiSelfTest.java |    6 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |    6 +-
 ...catedP2PDisabledByteArrayValuesSelfTest.java |    2 +-
 ...icatedP2PEnabledByteArrayValuesSelfTest.java |    2 +-
 ...ridCacheReplicatedPreloadEventsSelfTest.java |    8 +-
 .../GridCacheReplicatedTxConcurrentGetTest.java |   11 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java |   10 +-
 ...GridCacheReplicatedTxMultiNodeBasicTest.java |   10 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |   23 +-
 ...licatedTxOriginatingNodeFailureSelfTest.java |    7 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |   18 +-
 .../GridCacheReplicatedTxReadTest.java          |    6 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |   22 +-
 .../GridCacheReplicatedTxTimeoutSelfTest.java   |   15 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |   43 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |   34 +-
 .../replicated/GridReplicatedTxPreloadTest.java |    8 +-
 ...acheAtomicReplicatedNodeRestartSelfTest.java |   11 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   48 +-
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |    6 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   66 +-
 ...eplicatedPreloadStartStopEventsSelfTest.java |   29 +-
 ...GridCacheReplicatedPreloadUndeploysTest.java |   13 +-
 .../cache/eviction/EvictionAbstractTest.java    |   71 +-
 .../GridCacheBatchEvictUnswapSelfTest.java      |   30 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   52 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |   44 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |   45 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |   44 +-
 .../GridCacheEmptyEntriesLocalSelfTest.java     |    6 +-
 ...ridCacheEmptyEntriesPartitionedSelfTest.java |    6 +-
 .../GridCacheEvictionFilterSelfTest.java        |   45 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |   46 +-
 .../GridCacheEvictionTouchSelfTest.java         |   51 +-
 .../cache/eviction/GridCacheMockEntry.java      |   15 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |   37 +-
 .../fifo/FifoEvictionPolicySelfTest.java        |    6 +-
 .../eviction/lru/LruEvictionPolicySelfTest.java |   10 +-
 .../lru/LruNearEvictionPolicySelfTest.java      |   38 +-
 .../LruNearOnlyNearEvictionPolicySelfTest.java  |   38 +-
 .../RandomEvictionPolicyCacheSizeSelfTest.java  |   13 +-
 .../random/RandomEvictionPolicySelfTest.java    |   16 +-
 .../SortedEvictionPolicyPerformanceTest.java    |   26 +-
 .../sorted/SortedEvictionPolicySelfTest.java    |    6 +-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |   14 +-
 ...iteCacheAtomicExpiryPolicyWithStoreTest.java |   12 +-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |   11 +-
 ...AtomicPrimaryWriteOrderExpiryPolicyTest.java |    6 +-
 ...maryWriteOrderWithStoreExpiryPolicyTest.java |    7 +-
 ...teCacheAtomicReplicatedExpiryPolicyTest.java |    6 +-
 ...iteCacheAtomicWithStoreExpiryPolicyTest.java |    7 +-
 .../IgniteCacheClientNearCacheExpiryTest.java   |   29 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   72 +-
 .../IgniteCacheExpiryPolicyTestSuite.java       |    6 +-
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |   35 +-
 .../expiry/IgniteCacheTtlCleanupSelfTest.java   |   26 +-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |   11 +-
 .../IgniteCacheTxExpiryPolicyWithStoreTest.java |    9 +-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |   11 +-
 ...IgniteCacheTxReplicatedExpiryPolicyTest.java |    6 +-
 .../IgniteCacheTxWithStoreExpiryPolicyTest.java |    7 +-
 .../IgniteCacheAtomicLoadAllTest.java           |   14 +-
 .../IgniteCacheAtomicLoaderWriterTest.java      |   14 +-
 .../IgniteCacheAtomicLocalLoadAllTest.java      |   11 +-
 ...CacheAtomicLocalNoLoadPreviousValueTest.java |   11 +-
 ...IgniteCacheAtomicLocalNoReadThroughTest.java |   11 +-
 ...gniteCacheAtomicLocalNoWriteThroughTest.java |   11 +-
 ...tomicNearEnabledNoLoadPreviousValueTest.java |    4 +-
 ...CacheAtomicNearEnabledNoReadThroughTest.java |    4 +-
 ...acheAtomicNearEnabledNoWriteThroughTest.java |    4 +-
 ...gniteCacheAtomicNoLoadPreviousValueTest.java |   14 +-
 .../IgniteCacheAtomicNoReadThroughTest.java     |   14 +-
 .../IgniteCacheAtomicNoWriteThroughTest.java    |   14 +-
 .../IgniteCacheAtomicStoreSessionTest.java      |   14 +-
 ...eCacheAtomicStoreSessionWriteBehindTest.java |    9 +-
 ...IgniteCacheJdbcBlobStoreNodeRestartTest.java |   14 +-
 .../IgniteCacheLoadAllAbstractTest.java         |   33 +-
 .../IgniteCacheLoaderWriterAbstractTest.java    |   35 +-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |   30 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |   40 +-
 .../IgniteCacheNoWriteThroughAbstractTest.java  |   33 +-
 ...IgniteCacheStoreNodeRestartAbstractTest.java |   12 +-
 .../IgniteCacheStoreSessionAbstractTest.java    |   44 +-
 ...acheStoreSessionWriteBehindAbstractTest.java |   35 +-
 .../integration/IgniteCacheTxLoadAllTest.java   |   11 +-
 .../IgniteCacheTxLoaderWriterTest.java          |   11 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |   11 +-
 ...niteCacheTxLocalNoLoadPreviousValueTest.java |   11 +-
 .../IgniteCacheTxLocalNoReadThroughTest.java    |   11 +-
 .../IgniteCacheTxLocalNoWriteThroughTest.java   |   11 +-
 ...cheTxNearEnabledNoLoadPreviousValueTest.java |    4 +-
 ...niteCacheTxNearEnabledNoReadThroughTest.java |    4 +-
 ...iteCacheTxNearEnabledNoWriteThroughTest.java |    4 +-
 .../IgniteCacheTxNoLoadPreviousValueTest.java   |   11 +-
 .../IgniteCacheTxNoReadThroughTest.java         |   11 +-
 .../IgniteCacheTxNoWriteThroughTest.java        |   11 +-
 .../IgniteCacheTxStoreSessionTest.java          |   30 +-
 ...gniteCacheTxStoreSessionWriteBehindTest.java |    6 +-
 ...CacheLocalOffHeapAndSwapMetricsSelfTest.java |   17 +-
 ...dCacheAtomicLocalMetricsNoStoreSelfTest.java |    4 +-
 .../GridCacheAtomicLocalMetricsSelfTest.java    |   12 +-
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |    9 +-
 .../local/GridCacheDaemonNodeLocalSelfTest.java |    9 +-
 .../GridCacheLocalAtomicBasicStoreSelfTest.java |    6 +-
 .../GridCacheLocalAtomicFullApiSelfTest.java    |    6 +-
 ...LocalAtomicGetAndTransformStoreSelfTest.java |    6 +-
 ...dCacheLocalAtomicOffHeapFullApiSelfTest.java |    6 +-
 ...LocalAtomicOffHeapTieredFullApiSelfTest.java |    6 +-
 .../local/GridCacheLocalBasicApiSelfTest.java   |    9 +-
 ...cheLocalBasicStoreMultithreadedSelfTest.java |    6 +-
 .../local/GridCacheLocalBasicStoreSelfTest.java |    8 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |   40 +-
 .../local/GridCacheLocalEventSelfTest.java      |    8 +-
 .../GridCacheLocalEvictionEventSelfTest.java    |    9 +-
 ...dCacheLocalFullApiMultithreadedSelfTest.java |    8 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |   25 +-
 ...dCacheLocalGetAndTransformStoreSelfTest.java |    8 +-
 .../GridCacheLocalIsolatedNodesSelfTest.java    |   18 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |    8 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |   27 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |   29 +-
 .../local/GridCacheLocalMetricsSelfTest.java    |    9 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |   36 +-
 .../GridCacheLocalOffHeapFullApiSelfTest.java   |    4 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |    8 +-
 .../GridCacheLocalTxMultiThreadedSelfTest.java  |   13 +-
 .../cache/local/GridCacheLocalTxReadTest.java   |    6 +-
 .../GridCacheLocalTxSingleThreadedSelfTest.java |   13 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |   36 +-
 ...OnlyFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 ...AtomicClientOnlyMultiJvmFullApiSelfTest.java |    4 +-
 ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...pyOnReadDisabledMultiJvmFullApiSelfTest.java |    4 +-
 ...omicFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 .../GridCacheAtomicMultiJvmFullApiSelfTest.java |    4 +-
 ...tomicMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 ...tomicNearEnabledMultiJvmFullApiSelfTest.java |    4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |    4 +-
 ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java |    4 +-
 ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java |    4 +-
 ...micOffHeapTieredMultiJvmFullApiSelfTest.java |    4 +-
 ...rderFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |    4 +-
 ...OrderMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...rityOrderOffHeapMultiJvmFullApiSelfTest.java |    4 +-
 ...derOffHeapTieredMultiJvmFullApiSelfTest.java |    4 +-
 ...OnlyFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java |    4 +-
 ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...pyOnReadDisabledMultiJvmFullApiSelfTest.java |    4 +-
 ...onedFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 ...CachePartitionedMultiJvmFullApiSelfTest.java |    4 +-
 ...ionedMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...micOffHeapTieredMultiJvmFullApiSelfTest.java |    4 +-
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |    4 +-
 ...onedNearDisabledMultiJvmFullApiSelfTest.java |    4 +-
 ...abledMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...rDisabledOffHeapMultiJvmFullApiSelfTest.java |    4 +-
 ...ledOffHeapTieredMultiJvmFullApiSelfTest.java |    4 +-
 ...rtitionedOffHeapMultiJvmFullApiSelfTest.java |    4 +-
 ...nedOffHeapTieredMultiJvmFullApiSelfTest.java |    4 +-
 ...ReplicatedAtomicMultiJvmFullApiSelfTest.java |    4 +-
 ...rimaryWriteOrderMultiJvmFullApiSelfTest.java |    4 +-
 ...dCacheReplicatedMultiJvmFullApiSelfTest.java |    4 +-
 ...catedMultiJvmP2PDisabledFullApiSelfTest.java |    4 +-
 ...plicatedNearOnlyMultiJvmFullApiSelfTest.java |    4 +-
 ...eplicatedOffHeapMultiJvmFullApiSelfTest.java |    4 +-
 ...tedOffHeapTieredMultiJvmFullApiSelfTest.java |    4 +-
 ...ClientNodePortableMetadataMultinodeTest.java |   47 +-
 ...GridCacheClientNodePortableMetadataTest.java |   32 +-
 ...ableObjectsAbstractDataStreamerSelfTest.java |   41 +-
 ...bleObjectsAbstractMultiThreadedSelfTest.java |   45 +-
 ...ridCachePortableObjectsAbstractSelfTest.java |   80 +-
 .../GridCachePortableStoreAbstractSelfTest.java |   33 +-
 .../GridCachePortableStoreObjectsSelfTest.java  |    4 +-
 ...GridCachePortableStorePortablesSelfTest.java |    7 +-
 ...ridPortableCacheEntryMemorySizeSelfTest.java |   19 +-
 ...leDuplicateIndexObjectsAbstractSelfTest.java |   27 +-
 .../DataStreamProcessorPortableSelfTest.java    |   19 +-
 .../GridDataStreamerImplSelfTest.java           |   47 +-
 ...ridCacheAffinityRoutingPortableSelfTest.java |   13 +-
 ...lyPortableDataStreamerMultiNodeSelfTest.java |    2 +-
 ...rtableDataStreamerMultithreadedSelfTest.java |   13 +-
 ...artitionedOnlyPortableMultiNodeSelfTest.java |    2 +-
 ...tionedOnlyPortableMultithreadedSelfTest.java |   13 +-
 .../GridCacheMemoryModePortableSelfTest.java    |    8 +-
 ...acheOffHeapTieredAtomicPortableSelfTest.java |   11 +-
 ...eapTieredEvictionAtomicPortableSelfTest.java |   13 +-
 ...heOffHeapTieredEvictionPortableSelfTest.java |   13 +-
 .../GridCacheOffHeapTieredPortableSelfTest.java |   11 +-
 ...ateIndexObjectPartitionedAtomicSelfTest.java |    7 +-
 ...xObjectPartitionedTransactionalSelfTest.java |   11 +-
 ...AtomicNearDisabledOffheapTieredSelfTest.java |    2 +-
 ...rtableObjectsAtomicNearDisabledSelfTest.java |   13 +-
 ...tableObjectsAtomicOffheapTieredSelfTest.java |    2 +-
 .../GridCachePortableObjectsAtomicSelfTest.java |   13 +-
 ...tionedNearDisabledOffheapTieredSelfTest.java |    2 +-
 ...eObjectsPartitionedNearDisabledSelfTest.java |   13 +-
 ...ObjectsPartitionedOffheapTieredSelfTest.java |    2 +-
 ...CachePortableObjectsPartitionedSelfTest.java |   13 +-
 ...sNearPartitionedByteArrayValuesSelfTest.java |    8 +-
 ...sPartitionedOnlyByteArrayValuesSelfTest.java |    8 +-
 ...dCachePortableObjectsReplicatedSelfTest.java |   13 +-
 ...CachePortableObjectsAtomicLocalSelfTest.java |    6 +-
 ...rtableObjectsLocalOffheapTieredSelfTest.java |    2 +-
 .../GridCachePortableObjectsLocalSelfTest.java  |   13 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   45 +-
 .../query/GridCacheSwapScanQuerySelfTest.java   |    2 +-
 .../cache/query/GridCircularQueueTest.java      |    9 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |  103 +-
 ...ontinuousQueryAtomicNearEnabledSelfTest.java |    4 +-
 ...ontinuousQueryAtomicP2PDisabledSelfTest.java |    2 +-
 .../GridCacheContinuousQueryAtomicSelfTest.java |    8 +-
 ...CacheContinuousQueryLocalAtomicSelfTest.java |    6 +-
 .../GridCacheContinuousQueryLocalSelfTest.java  |    6 +-
 ...eContinuousQueryPartitionedOnlySelfTest.java |    8 +-
 ...uousQueryPartitionedP2PDisabledSelfTest.java |    2 +-
 ...CacheContinuousQueryPartitionedSelfTest.java |    6 +-
 ...ContinuousQueryReplicatedAtomicSelfTest.java |    6 +-
 ...nuousQueryReplicatedP2PDisabledSelfTest.java |    2 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |   27 +-
 .../IgniteCacheContinuousQueryClientTest.java   |   40 +-
 ...idCacheWriteBehindStoreAbstractSelfTest.java |   25 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |   46 +-
 .../GridCacheWriteBehindStoreLocalTest.java     |    4 +-
 ...heWriteBehindStoreMultithreadedSelfTest.java |   10 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |   43 +-
 ...ridCacheWriteBehindStorePartitionedTest.java |    4 +-
 ...GridCacheWriteBehindStoreReplicatedTest.java |    4 +-
 .../GridCacheWriteBehindStoreSelfTest.java      |   22 +-
 ...CacheClientWriteBehindStoreAbstractTest.java |   22 +-
 ...teCacheClientWriteBehindStoreAtomicTest.java |    9 +-
 .../IgnteCacheClientWriteBehindStoreTxTest.java |    6 +-
 .../CacheVersionedEntryAbstractTest.java        |   21 +-
 ...nedEntryLocalAtomicSwapDisabledSelfTest.java |    5 +-
 ...ersionedEntryLocalTransactionalSelfTest.java |    5 +-
 ...edEntryPartitionedAtomicOffHeapSelfTest.java |    6 +-
 ...VersionedEntryPartitionedAtomicSelfTest.java |    5 +-
 ...PartitionedTransactionalOffHeapSelfTest.java |    6 +-
 ...edEntryPartitionedTransactionalSelfTest.java |    5 +-
 ...nedEntryReplicatedAtomicOffHeapSelfTest.java |    6 +-
 ...eVersionedEntryReplicatedAtomicSelfTest.java |    5 +-
 ...yReplicatedTransactionalOffHeapSelfTest.java |    6 +-
 ...nedEntryReplicatedTransactionalSelfTest.java |    5 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |   29 +-
 .../closure/GridClosureProcessorRemoteTest.java |   21 +-
 .../closure/GridClosureProcessorSelfTest.java   |   51 +-
 .../continuous/GridEventConsumeSelfTest.java    |   69 +-
 .../continuous/GridMessageListenSelfTest.java   |   43 +-
 .../DataStreamProcessorSelfTest.java            |   83 +-
 .../datastreamer/DataStreamerImplSelfTest.java  |   36 +-
 .../DataStreamerMultiThreadedSelfTest.java      |   38 +-
 .../DataStreamerMultinodeCreateCacheTest.java   |   25 +-
 .../IgniteDataStreamerPerformanceTest.java      |   34 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |   95 +-
 .../processors/igfs/IgfsAttributesSelfTest.java |   21 +-
 .../igfs/IgfsBackupFailoverSelfTest.java        |   52 +-
 .../igfs/IgfsBackupsDualAsyncSelfTest.java      |    6 +-
 .../igfs/IgfsBackupsDualSyncSelfTest.java       |    6 +-
 .../igfs/IgfsBackupsPrimarySelfTest.java        |    6 +-
 ...sCachePerBlockLruEvictionPolicySelfTest.java |   55 +-
 .../processors/igfs/IgfsCacheSelfTest.java      |   37 +-
 .../igfs/IgfsClientCacheSelfTest.java           |   22 +-
 .../processors/igfs/IgfsCommonAbstractTest.java |    8 +-
 .../igfs/IgfsDataManagerSelfTest.java           |   57 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |   36 +-
 .../processors/igfs/IgfsDualAsyncSelfTest.java  |    4 +-
 .../processors/igfs/IgfsDualSyncSelfTest.java   |    4 +-
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |   12 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |   20 +-
 .../processors/igfs/IgfsFileMapSelfTest.java    |   21 +-
 ...IgfsGroupDataBlockKeyMapperHashSelfTest.java |   10 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |   50 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    |   44 +-
 .../igfs/IgfsModeResolverSelfTest.java          |   17 +-
 .../processors/igfs/IgfsModesSelfTest.java      |   48 +-
 .../processors/igfs/IgfsOneClientNodeTest.java  |   27 +-
 .../igfs/IgfsPrimaryOffheapTieredSelfTest.java  |    6 +-
 .../igfs/IgfsPrimaryOffheapValuesSelfTest.java  |    6 +-
 .../processors/igfs/IgfsPrimarySelfTest.java    |    4 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |   70 +-
 .../igfs/IgfsProcessorValidationSelfTest.java   |   40 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |   47 +-
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |   10 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |   19 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |   76 +-
 .../processors/igfs/IgfsStartCacheTest.java     |   45 +-
 .../processors/igfs/IgfsStreamsSelfTest.java    |   66 +-
 .../processors/igfs/IgfsTaskSelfTest.java       |   64 +-
 .../processors/igfs/IgfsTestInputStream.java    |    5 +-
 .../igfs/UniversalFileSystemAdapter.java        |    8 +-
 .../IgfsAbstractRecordResolverSelfTest.java     |   41 +-
 ...IgfsByteDelimiterRecordResolverSelfTest.java |   10 +-
 .../IgfsFixedLengthRecordResolverSelfTest.java  |   10 +-
 ...sNewLineDelimiterRecordResolverSelfTest.java |   13 +-
 ...fsStringDelimiterRecordResolverSelfTest.java |   14 +-
 .../GridJobMetricsProcessorLoadTest.java        |   10 +-
 .../port/GridPortProcessorSelfTest.java         |   16 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   45 +-
 .../service/ClosureServiceClientsNodesTest.java |   34 +-
 .../processors/service/DummyService.java        |   13 +-
 .../service/GridServiceClientNodeTest.java      |   18 +-
 .../GridServiceProcessorAbstractSelfTest.java   |   49 +-
 ...ServiceProcessorMultiNodeConfigSelfTest.java |   13 +-
 .../GridServiceProcessorMultiNodeSelfTest.java  |   12 +-
 .../GridServiceProcessorProxySelfTest.java      |   16 +-
 .../GridServiceProcessorSingleNodeSelfTest.java |    5 +-
 .../GridServiceReassignmentSelfTest.java        |   22 +-
 .../timeout/GridTimeoutProcessorSelfTest.java   |   25 +-
 .../product/GridProductVersionSelfTest.java     |   12 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |   35 +-
 ...dStartupWithUndefinedIgniteHomeSelfTest.java |   31 +-
 .../internal/util/GridTestClockTimer.java       |    2 +-
 .../util/IgniteExceptionRegistrySelfTest.java   |   15 +-
 .../internal/util/IgniteUtilsSelfTest.java      |   66 +-
 .../util/future/GridCompoundFutureSelfTest.java |   17 +-
 .../util/future/GridEmbeddedFutureSelfTest.java |   25 +-
 .../util/future/GridFutureAdapterSelfTest.java  |   29 +-
 .../future/GridFutureListenPerformanceTest.java |   19 +-
 .../util/future/GridFutureQueueTest.java        |   10 +-
 .../util/future/IgniteFutureImplTest.java       |   23 +-
 .../nio/GridNioEmbeddedFutureSelfTest.java      |    9 +-
 .../util/future/nio/GridNioFutureSelfTest.java  |   24 +-
 ...GridUnsafeDataOutputArraySizingSelfTest.java |    6 +-
 .../ipc/shmem/IgfsSharedMemoryTestClient.java   |   15 +-
 .../ipc/shmem/IgfsSharedMemoryTestServer.java   |   18 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |   34 +-
 .../ipc/shmem/IpcSharedMemoryFakeClient.java    |    6 +-
 .../IpcSharedMemoryNativeLoaderSelfTest.java    |   15 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |   28 +-
 .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java |   26 +-
 .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java |   11 +-
 .../LoadWithCorruptedLibFileTestRunner.java     |    6 +-
 .../IpcSharedMemoryBenchmarkParty.java          |    4 +-
 .../IpcSharedMemoryBenchmarkReader.java         |   22 +-
 .../IpcSharedMemoryBenchmarkWriter.java         |   21 +-
 .../nio/GridNioDelimitedBufferSelfTest.java     |    8 +-
 .../internal/util/nio/GridNioSelfTest.java      |   59 +-
 .../util/nio/GridNioSessionMetaKeySelfTest.java |   13 +-
 .../internal/util/nio/GridNioSslSelfTest.java   |   17 +-
 .../internal/util/nio/GridRoundTripTest.java    |   20 +-
 .../nio/impl/GridNioFilterChainSelfTest.java    |   27 +-
 .../util/offheap/GridByteArrayWrapper.java      |    4 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |   31 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |   12 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |   31 +-
 ...apPartitionedMapPerformanceAbstractTest.java |   25 +-
 .../unsafe/GridOffheapSnapTreeSelfTest.java     |   20 +-
 .../unsafe/GridUnsafeMapPerformanceTest.java    |    6 +-
 .../offheap/unsafe/GridUnsafeMapSelfTest.java   |    6 +-
 .../unsafe/GridUnsafeMemorySelfTest.java        |   23 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |    8 +-
 .../GridUnsafePartitionedMapSelfTest.java       |    6 +-
 .../unsafe/GridUnsafeStripedLruSefTest.java     |   10 +-
 .../tostring/GridToStringBuilderSelfTest.java   |   17 +-
 .../ignite/jvmtest/BlockingQueueTest.java       |   17 +-
 .../ignite/jvmtest/ConcurrentMapTest.java       |   27 +-
 .../org/apache/ignite/jvmtest/FileIOTest.java   |   15 +-
 .../apache/ignite/jvmtest/FileLocksTest.java    |   12 +-
 .../ignite/jvmtest/LinkedHashMapTest.java       |   10 +-
 .../ignite/jvmtest/MultipleFileIOTest.java      |   11 +-
 .../ignite/jvmtest/NetworkFailureTest.java      |   29 +-
 .../QueueSizeCounterMultiThreadedTest.java      |   22 +-
 .../jvmtest/ReadWriteLockMultiThreadedTest.java |   18 +-
 .../org/apache/ignite/jvmtest/RegExpTest.java   |   12 +-
 .../jvmtest/ServerSocketMultiThreadedTest.java  |   23 +-
 .../ignite/lang/GridBasicPerformanceTest.java   |   49 +-
 .../ignite/lang/GridByteArrayListSelfTest.java  |   17 +-
 .../ignite/lang/GridFuncPerformanceTest.java    |   13 +-
 .../lang/GridFutureListenPerformanceTest.java   |   20 +-
 .../GridMetadataAwareAdapterLoadSelfTest.java   |   13 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  |   10 +-
 .../ignite/lang/GridSetWrapperSelfTest.java     |   16 +-
 .../lang/GridSystemCurrentTimeMillisTest.java   |    2 +-
 .../ignite/lang/GridThreadPriorityTest.java     |    4 +-
 .../apache/ignite/lang/GridTupleSelfTest.java   |   15 +-
 .../org/apache/ignite/lang/GridXSelfTest.java   |   16 +-
 .../apache/ignite/lang/IgniteUuidSelfTest.java  |   20 +-
 ...dBoundedConcurrentLinkedHashMapSelfTest.java |   10 +-
 ...GridBoundedConcurrentOrderedMapSelfTest.java |   14 +-
 .../GridCircularBufferPerformanceTest.java      |   18 +-
 .../lang/utils/GridCircularBufferSelfTest.java  |   13 +-
 .../utils/GridConcurrentHashMapSelfTest.java    |   13 +-
 .../GridConcurrentLinkedHashMapSelfTest.java    |   14 +-
 .../GridConcurrentWeakHashSetSelfTest.java      |   20 +-
 .../lang/utils/GridConsistentHashSelfTest.java  |   23 +-
 .../lang/utils/GridLeanIdentitySetSelfTest.java |   10 +-
 .../lang/utils/GridLeanMapPerformanceTest.java  |    9 +-
 .../ignite/lang/utils/GridLeanMapSelfTest.java  |   16 +-
 .../ignite/lang/utils/GridListSetSelfTest.java  |   15 +-
 .../lang/utils/GridStripedLockSelfTest.java     |   16 +-
 .../ignite/loadtest/GridLoadTestStatistics.java |   16 +-
 .../loadtest/GridSingleExecutionTest.java       |   59 +-
 ...idFileSwapSpaceSpiMultithreadedLoadTest.java |   33 +-
 .../loadtests/GridCacheLoadPopulationTask.java  |   20 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |   25 +-
 .../cache/GridCacheAbstractLoadTest.java        |   58 +-
 .../loadtests/cache/GridCacheBenchmark.java     |   20 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |   32 +-
 .../loadtests/cache/GridCacheLoadTest.java      |   19 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |   39 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |   33 +-
 .../capacity/GridCapacityLoadTest.java          |   17 +-
 .../colocation/GridTestCacheStore.java          |   24 +-
 .../loadtests/colocation/GridTestConstants.java |    2 +-
 .../loadtests/colocation/GridTestKey.java       |   11 +-
 .../colocation/GridTestLifecycleBean.java       |   10 +-
 .../loadtests/colocation/GridTestMain.java      |   33 +-
 .../communication/GridIoManagerBenchmark.java   |   54 +-
 .../communication/GridIoManagerBenchmark0.java  |   57 +-
 .../GridTcpCommunicationBenchmark.java          |    2 +-
 .../communication/GridTestMessage.java          |   18 +-
 .../GridContinuousOperationsLoadTest.java       |   60 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |   42 +-
 .../direct/multisplit/GridLoadTestJob.java      |   11 +-
 .../multisplit/GridLoadTestJobTarget.java       |    2 +-
 .../direct/multisplit/GridLoadTestTask.java     |   23 +-
 .../multisplit/GridMultiSplitsLoadTest.java     |   31 +-
 .../GridMultiSplitsRedeployLoadTest.java        |   22 +-
 .../GridSingleSplitNewNodesTestJobTarget.java   |    6 +-
 .../GridSingleSplitNewNodesTestTask.java        |   24 +-
 ...ridSingleSplitsNewNodesAbstractLoadTest.java |   27 +-
 ...idSingleSplitsNewNodesMulticastLoadTest.java |   10 +-
 .../GridSingleSplitsRedeployLoadTest.java       |   32 +-
 .../direct/session/GridSessionLoadTest.java     |   20 +-
 .../direct/session/GridSessionLoadTestJob.java  |   13 +-
 .../direct/session/GridSessionLoadTestTask.java |   25 +-
 .../direct/stealing/GridStealingLoadTest.java   |   31 +-
 .../stealing/GridStealingLoadTestJob.java       |   17 +-
 .../stealing/GridStealingLoadTestTask.java      |   20 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |   13 +-
 .../ignite/loadtests/dsi/GridDsiClient.java     |   40 +-
 .../loadtests/dsi/GridDsiLifecycleBean.java     |   13 +-
 .../ignite/loadtests/dsi/GridDsiMessage.java    |    6 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   44 +-
 .../ignite/loadtests/dsi/GridDsiRequest.java    |    7 +-
 .../loadtests/dsi/GridDsiRequestTask.java       |   13 +-
 .../ignite/loadtests/dsi/GridDsiResponse.java   |    7 +-
 .../loadtests/dsi/GridDsiResponseTask.java      |   13 +-
 .../ignite/loadtests/dsi/GridDsiSession.java    |    7 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |    8 +-
 ...dBoundedConcurrentLinkedHashSetLoadTest.java |   29 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   45 +-
 .../loadtests/hashmap/GridHashMapLoadTest.java  |   20 +-
 .../job/GridJobExecutionLoadTestClient.java     |   31 +-
 ...GridJobExecutionLoadTestClientSemaphore.java |   40 +-
 .../job/GridJobExecutionLoadTestJob.java        |   10 +-
 .../job/GridJobExecutionLoadTestServer.java     |    4 +-
 .../job/GridJobExecutionLoadTestTask.java       |   20 +-
 .../job/GridJobExecutionSingleNodeLoadTest.java |   44 +-
 ...JobExecutionSingleNodeSemaphoreLoadTest.java |   50 +-
 .../ignite/loadtests/job/GridJobLoadTest.java   |   29 +-
 .../loadtests/job/GridJobLoadTestJob.java       |   23 +-
 .../loadtests/job/GridJobLoadTestParams.java    |    2 +-
 .../loadtests/job/GridJobLoadTestSubmitter.java |   16 +-
 .../loadtests/job/GridJobLoadTestTask.java      |   20 +-
 .../GridConcurrentLinkedHashMapBenchmark.java   |   13 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |    8 +-
 .../mapper/GridContinuousMapperLoadTest2.java   |   13 +-
 .../mapper/GridContinuousMapperTask1.java       |   32 +-
 .../mapper/GridContinuousMapperTask2.java       |   26 +-
 .../loadtests/mapper/GridNodeStartup.java       |   11 +-
 .../ignite/loadtests/mapper/TestObject.java     |    7 +-
 .../mergesort/GridMergeSortLoadTask.java        |   24 +-
 .../mergesort/GridMergeSortLoadTest.java        |   19 +-
 .../loadtests/nio/GridNioBenchmarkClient.java   |   17 +-
 .../loadtests/nio/GridNioBenchmarkTest.java     |   25 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |   16 +-
 ...apPartitionedMapPerformanceAbstractTest.java |   28 +-
 .../unsafe/GridUnsafeMapPerformanceTest.java    |    6 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |    8 +-
 .../swap/GridSwapEvictAllBenchmark.java         |   45 +-
 .../loadtests/util/GridCumulativeAverage.java   |    2 +-
 .../ignite/loadtests/util/GridLoadTestArgs.java |   14 +-
 .../ignite/logger/java/JavaLoggerTest.java      |   15 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   82 +-
 .../GridMarshallerExternalizableBean.java       |   10 +-
 .../GridMarshallerPerformanceTest.java          |   43 +-
 .../marshaller/GridMarshallerResourceBean.java  |   37 +-
 .../GridMarshallerTestAbstractBean.java         |    2 +-
 .../marshaller/GridMarshallerTestBean.java      |    9 +-
 .../GridMarshallerTestInheritedBean.java        |    2 +-
 .../marshaller/MarshallerContextTestImpl.java   |   15 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |    7 +-
 .../OptimizedMarshallerEnumSelfTest.java        |    6 +-
 .../OptimizedMarshallerNodeFailoverTest.java    |   39 +-
 .../optimized/OptimizedMarshallerSelfTest.java  |   21 +-
 ...arshallerSerialPersistentFieldsSelfTest.java |   12 +-
 .../optimized/OptimizedMarshallerTest.java      |   40 +-
 .../OptimizedObjectStreamSelfTest.java          |   73 +-
 .../TestTcpDiscoveryIpFinderAdapter.java        |   11 +-
 ...GridMessagingNoPeerClassLoadingSelfTest.java |   20 +-
 .../ignite/messaging/GridMessagingSelfTest.java |   62 +-
 .../IgniteMessagingWithClientTest.java          |   39 +-
 .../p2p/GridAbstractMultinodeRedeployTest.java  |   24 +-
 ...MultinodeRedeployContinuousModeSelfTest.java |    6 +-
 ...idMultinodeRedeployIsolatedModeSelfTest.java |    6 +-
 ...ridMultinodeRedeployPrivateModeSelfTest.java |    6 +-
 ...GridMultinodeRedeploySharedModeSelfTest.java |    6 +-
 .../ignite/p2p/GridP2PClassLoadingSelfTest.java |   36 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |   25 +-
 .../GridP2PDifferentClassLoaderSelfTest.java    |   19 +-
 .../p2p/GridP2PDoubleDeploymentSelfTest.java    |   23 +-
 .../p2p/GridP2PHotRedeploymentSelfTest.java     |   15 +-
 .../p2p/GridP2PJobClassLoaderSelfTest.java      |   22 +-
 .../p2p/GridP2PLocalDeploymentSelfTest.java     |   33 +-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |   31 +-
 .../ignite/p2p/GridP2PNodeLeftSelfTest.java     |   17 +-
 .../p2p/GridP2PRecursionTaskSelfTest.java       |   25 +-
 .../p2p/GridP2PRemoteClassLoadersSelfTest.java  |   32 +-
 .../p2p/GridP2PSameClassLoaderSelfTest.java     |   19 +-
 .../org/apache/ignite/p2p/GridP2PTestJob.java   |   17 +-
 .../org/apache/ignite/p2p/GridP2PTestTask.java  |   22 +-
 .../p2p/GridP2PTestTaskExecutionTest.java       |   12 +-
 .../ignite/p2p/GridP2PTimeoutSelfTest.java      |   22 +-
 .../ignite/p2p/GridP2PUndeploySelfTest.java     |   27 +-
 .../ignite/p2p/GridSwapSpaceCustomKey.java      |    7 +-
 .../ignite/p2p/GridSwapSpaceCustomValue.java    |    7 +-
 ...SessionCancelSiblingsFromFutureSelfTest.java |   44 +-
 ...ridSessionCancelSiblingsFromJobSelfTest.java |   49 +-
 ...idSessionCancelSiblingsFromTaskSelfTest.java |   47 +-
 .../GridSessionCheckpointAbstractSelfTest.java  |   36 +-
 .../session/GridSessionCheckpointSelfTest.java  |   15 +-
 .../GridSessionCollisionSpiSelfTest.java        |   37 +-
 ...idSessionFutureWaitJobAttributeSelfTest.java |   37 +-
 ...dSessionFutureWaitTaskAttributeSelfTest.java |   38 +-
 .../session/GridSessionJobFailoverSelfTest.java |   31 +-
 ...GridSessionJobWaitTaskAttributeSelfTest.java |   41 +-
 .../ignite/session/GridSessionLoadSelfTest.java |   42 +-
 .../GridSessionSetFutureAttributeSelfTest.java  |   44 +-
 ...nSetFutureAttributeWaitListenerSelfTest.java |   42 +-
 .../GridSessionSetJobAttribute2SelfTest.java    |   28 +-
 ...GridSessionSetJobAttributeOrderSelfTest.java |   31 +-
 .../GridSessionSetJobAttributeSelfTest.java     |   41 +-
 ...sionSetJobAttributeWaitListenerSelfTest.java |   43 +-
 .../GridSessionSetTaskAttributeSelfTest.java    |   35 +-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |   35 +-
 .../GridSessionWaitAttributeSelfTest.java       |   43 +-
 .../ignite/session/GridThreadSerialNumber.java  |    2 +-
 .../spi/GridSpiLocalHostInjectionTest.java      |   16 +-
 .../spi/GridSpiStartStopAbstractTest.java       |    4 +-
 .../org/apache/ignite/spi/GridTcpForwarder.java |   15 +-
 .../spi/GridTcpSpiForwardingSelfTest.java       |   35 +-
 .../GridCheckpointSpiAbstractTest.java          |    6 +-
 .../spi/checkpoint/GridCheckpointTestState.java |    4 +-
 .../cache/CacheCheckpointSpiConfigSelfTest.java |    5 +-
 .../CacheCheckpointSpiSecondCacheSelfTest.java  |   19 +-
 .../cache/CacheCheckpointSpiSelfTest.java       |    6 +-
 .../CacheCheckpointSpiStartStopSelfTest.java    |    6 +-
 .../jdbc/JdbcCheckpointSpiConfigSelfTest.java   |   19 +-
 .../JdbcCheckpointSpiCustomConfigSelfTest.java  |    8 +-
 .../JdbcCheckpointSpiDefaultConfigSelfTest.java |    8 +-
 .../JdbcCheckpointSpiStartStopSelfTest.java     |    8 +-
 ...GridSharedFsCheckpointSpiConfigSelfTest.java |    8 +-
 ...redFsCheckpointSpiMultiThreadedSelfTest.java |   26 +-
 ...heckpointSpiMultipleDirectoriesSelfTest.java |   19 +-
 .../GridSharedFsCheckpointSpiSelfTest.java      |   15 +-
 ...dSharedFsCheckpointSpiStartStopSelfTest.java |    6 +-
 .../spi/collision/GridCollisionTestContext.java |    5 +-
 .../collision/GridTestCollisionJobContext.java  |   12 +-
 .../collision/GridTestCollisionTaskSession.java |   15 +-
 ...GridFifoQueueCollisionSpiConfigSelfTest.java |    5 +-
 .../GridFifoQueueCollisionSpiSelfTest.java      |   17 +-
 ...dFifoQueueCollisionSpiStartStopSelfTest.java |    6 +-
 ...bStealingCollisionSpiAttributesSelfTest.java |   36 +-
 ...idJobStealingCollisionSpiConfigSelfTest.java |    5 +-
 ...alingCollisionSpiCustomTopologySelfTest.java |   42 +-
 .../GridJobStealingCollisionSpiSelfTest.java    |   47 +-
 ...obStealingCollisionSpiStartStopSelfTest.java |   18 +-
 ...PriorityQueueCollisionSpiConfigSelfTest.java |    5 +-
 .../GridPriorityQueueCollisionSpiSelfTest.java  |   27 +-
 ...orityQueueCollisionSpiStartStopSelfTest.java |    6 +-
 .../GridAbstractCommunicationSelfTest.java      |   47 +-
 .../communication/GridCacheMessageSelfTest.java |   46 +-
 .../spi/communication/GridTestMessage.java      |   13 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |   53 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |   20 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   59 +-
 .../GridTcpCommunicationSpiConfigSelfTest.java  |    5 +-
 .../tcp/GridTcpCommunicationSpiLanTest.java     |   41 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   68 +-
 ...pCommunicationSpiMultithreadedShmemTest.java |    2 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   51 +-
 ...tionSpiRecoveryFailureDetectionSelfTest.java |    4 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   56 +-
 .../GridTcpCommunicationSpiShmemSelfTest.java   |    4 +-
 .../tcp/GridTcpCommunicationSpiSslSelfTest.java |    4 +-
 ...ridTcpCommunicationSpiStartStopSelfTest.java |    9 +-
 ...unicationSpiTcpFailureDetectionSelfTest.java |    6 +-
 ...cpCommunicationSpiTcpNoDelayOffSelfTest.java |    2 +-
 .../tcp/GridTcpCommunicationSpiTcpSelfTest.java |    4 +-
 .../tcp/IgniteCacheSslStartStopSelfTest.java    |   19 +-
 ...CommunicationRecoveryAckClosureSelfTest.java |   54 +-
 .../local/GridLocalDeploymentSpiSelfTest.java   |   27 +-
 ...GridLocalDeploymentSpiStartStopSelfTest.java |    6 +-
 .../AbstractDiscoveryRandomStartStopTest.java   |   23 +-
 .../discovery/AbstractDiscoverySelfTest.java    |   53 +-
 .../spi/discovery/AbstractDiscoveryTest.java    |   22 +-
 ...ClusterMetricsSnapshotSerializeSelfTest.java |    9 +-
 ...pClientDiscoveryMarshallerCheckSelfTest.java |   18 +-
 ...lientDiscoverySpiFailureTimeoutSelfTest.java |   18 +-
 .../tcp/TcpClientDiscoverySpiMulticastTest.java |   17 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |   94 +-
 .../tcp/TcpDiscoveryConcurrentStartTest.java    |   19 +-
 .../TcpDiscoveryMarshallerCheckSelfTest.java    |   18 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |   37 +-
 ...DiscoveryNodeConfigConsistentIdSelfTest.java |   13 +-
 .../TcpDiscoveryNodeConsistentIdSelfTest.java   |   14 +-
 .../discovery/tcp/TcpDiscoveryRestartTest.java  |   41 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   85 +-
 .../tcp/TcpDiscoverySnapshotHistoryTest.java    |   15 +-
 .../tcp/TcpDiscoverySpiConfigSelfTest.java      |    6 +-
 .../TcpDiscoverySpiFailureTimeoutSelfTest.java  |   34 +-
 .../tcp/TcpDiscoverySpiRandomStartStopTest.java |   10 +-
 .../discovery/tcp/TcpDiscoverySpiSelfTest.java  |   11 +-
 .../tcp/TcpDiscoverySpiSslSelfTest.java         |    2 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   20 +-
 .../tcp/TcpDiscoverySpiWildcardSelfTest.java    |   10 +-
 .../discovery/tcp/TcpDiscoverySslSelfTest.java  |    6 +-
 .../TcpDiscoveryIpFinderAbstractSelfTest.java   |   19 +-
 .../jdbc/TcpDiscoveryJdbcIpFinderSelfTest.java  |    8 +-
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |   12 +-
 .../TcpDiscoverySharedFsIpFinderSelfTest.java   |    9 +-
 .../vm/TcpDiscoveryVmIpFinderSelfTest.java      |   10 +-
 ...MemoryEventStorageMultiThreadedSelfTest.java |   17 +-
 ...GridMemoryEventStorageSpiConfigSelfTest.java |    5 +-
 .../GridMemoryEventStorageSpiSelfTest.java      |   17 +-
 ...dMemoryEventStorageSpiStartStopSelfTest.java |    6 +-
 .../spi/failover/GridFailoverTestContext.java   |   11 +-
 .../GridAlwaysFailoverSpiConfigSelfTest.java    |    5 +-
 .../always/GridAlwaysFailoverSpiSelfTest.java   |   26 +-
 .../GridAlwaysFailoverSpiStartStopSelfTest.java |    8 +-
 ...ridJobStealingFailoverSpiConfigSelfTest.java |    5 +-
 ...idJobStealingFailoverSpiOneNodeSelfTest.java |   25 +-
 .../GridJobStealingFailoverSpiSelfTest.java     |   35 +-
 ...JobStealingFailoverSpiStartStopSelfTest.java |   18 +-
 .../never/GridNeverFailoverSpiSelfTest.java     |   19 +-
 .../GridNeverFailoverSpiStartStopSelfTest.java  |    8 +-
 ...dAdaptiveLoadBalancingSpiConfigSelfTest.java |    5 +-
 ...iveLoadBalancingSpiMultipleNodeSelfTest.java |   22 +-
 .../GridAdaptiveLoadBalancingSpiSelfTest.java   |   23 +-
 ...aptiveLoadBalancingSpiStartStopSelfTest.java |    6 +-
 ...alancingNotPerTaskMultithreadedSelfTest.java |   28 +-
 ...dRobinLoadBalancingSpiLocalNodeSelfTest.java |   15 +-
 ...inLoadBalancingSpiMultipleNodesSelfTest.java |   28 +-
 ...RobinLoadBalancingSpiNotPerTaskSelfTest.java |   34 +-
 ...dRobinLoadBalancingSpiStartStopSelfTest.java |    6 +-
 ...nLoadBalancingSpiTopologyChangeSelfTest.java |   26 +-
 .../roundrobin/GridRoundRobinTestUtils.java     |   15 +-
 ...tedRandomLoadBalancingSpiConfigSelfTest.java |    5 +-
 ...dWeightedRandomLoadBalancingSpiSelfTest.java |   18 +-
 ...RandomLoadBalancingSpiStartStopSelfTest.java |    6 +-
 ...dRandomLoadBalancingSpiWeightedSelfTest.java |   28 +-
 .../GridSwapSpaceSpiAbstractSelfTest.java       |   40 +-
 .../file/GridFileSwapCompactionSelfTest.java    |   18 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |   34 +-
 .../inmemory/GridTestSwapSpaceSpi.java          |   40 +-
 .../noop/GridNoopSwapSpaceSpiSelfTest.java      |   14 +-
 .../startup/GridRandomCommandLineLoader.java    |   54 +-
 .../ignite/startup/GridVmNodesStarter.java      |   47 +-
 .../cmdline/GridCommandLineLoaderTest.java      |   17 +-
 .../GridCommandLineTransformerSelfTest.java     |    9 +-
 .../startup/servlet/GridServletLoaderTest.java  |   21 +-
 .../stream/socket/SocketStreamerSelfTest.java   |   52 +-
 .../ignite/testframework/GridFileLock.java      |   16 +-
 .../testframework/GridJarClassLoader.java       |   18 +-
 .../ignite/testframework/GridLoadTestUtils.java |   22 +-
 .../testframework/GridSpiTestContext.java       |   64 +-
 .../ignite/testframework/GridStringLogger.java  |    8 +-
 .../testframework/GridTestClassLoader.java      |   13 +-
 .../GridTestExternalClassLoader.java            |   19 +-
 .../ignite/testframework/GridTestNode.java      |   24 +-
 .../GridTestSafeThreadFactory.java              |   26 +-
 .../ignite/testframework/GridTestThread.java    |    4 +-
 .../ignite/testframework/GridTestUtils.java     |  104 +-
 .../config/GridTestProperties.java              |   24 +-
 .../http/GridEmbeddedHttpServer.java            |   20 +-
 .../testframework/junits/GridAbstractTest.java  |  123 +-
 .../junits/GridTestKernalContext.java           |   24 +-
 .../ignite/testframework/junits/IgniteMock.java |   49 +-
 .../junits/IgniteTestResources.java             |   38 +-
 .../cache/GridAbstractCacheStoreSelfTest.java   |   44 +-
 .../junits/cache/TestCacheSession.java          |   13 +-
 .../cache/TestThreadLocalCacheSession.java      |   11 +-
 .../junits/common/GridAbstractExamplesTest.java |    9 +-
 .../GridAbstractLifecycleAwareSelfTest.java     |   14 +-
 .../junits/common/GridCommonAbstractTest.java   |   96 +-
 .../junits/common/GridCommonTest.java           |    9 +-
 .../logger/GridLog4jRollingFileAppender.java    |   18 +-
 .../junits/logger/GridTestLog4jLogger.java      |   49 +-
 .../junits/multijvm/AffinityProcessProxy.java   |   18 +-
 .../multijvm/IgniteCacheProcessProxy.java       |   50 +-
 .../multijvm/IgniteClusterProcessProxy.java     |   31 +-
 .../multijvm/IgniteEventsProcessProxy.java      |   22 +-
 .../junits/multijvm/IgniteNodeRunner.java       |   46 +-
 .../junits/multijvm/IgniteProcessProxy.java     |   83 +-
 .../junits/spi/GridSpiAbstractConfigTest.java   |   13 +-
 .../junits/spi/GridSpiAbstractTest.java         |   66 +-
 .../testframework/junits/spi/GridSpiTest.java   |   16 +-
 .../junits/spi/GridSpiTestConfig.java           |    8 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   47 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   67 +-
 .../IgniteCacheEvictionSelfTestSuite.java       |   32 +-
 .../IgniteCacheFailoverTestSuite.java           |   38 +-
 .../IgniteCacheFailoverTestSuite2.java          |   21 +-
 ...IgniteCacheFullApiMultiJvmSelfTestSuite.java |   46 +-
 .../IgniteCacheFullApiSelfTestSuite.java        |   86 +-
 .../IgniteCacheIteratorsSelfTestSuite.java      |   10 +-
 .../IgniteCacheMetricsSelfTestSuite.java        |   21 +-
 .../IgniteCacheNearOnlySelfTestSuite.java       |    9 +-
 ...niteCacheP2pUnmarshallingErrorTestSuite.java |   14 +-
 .../testsuites/IgniteCacheRestartTestSuite.java |   18 +-
 .../IgniteCacheTcpClientDiscoveryTestSuite.java |    8 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |  125 +-
 .../testsuites/IgniteCacheTestSuite2.java       |  110 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   68 +-
 .../testsuites/IgniteCacheTestSuite4.java       |  110 +-
 .../IgniteCacheTxRecoverySelfTestSuite.java     |   16 +-
 .../IgniteCacheWriteBehindTestSuite.java        |   15 +-
 .../testsuites/IgniteClientNodesTestSuite.java  |    8 +-
 .../IgniteClientReconnectTestSuite.java         |   16 +-
 .../testsuites/IgniteClientTestSuite.java       |    6 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |   62 +-
 .../IgniteContinuousTaskSelfTestSuite.java      |    9 +-
 .../IgniteExternalizableSelfTestSuite.java      |    6 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   43 +-
 .../IgniteIpcSharedMemorySelfTestSuite.java     |    9 +-
 .../IgniteJobMetricsSelfTestSuite.java          |    6 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |   55 +-
 .../testsuites/IgniteLangSelfTestSuite.java     |   34 +-
 .../testsuites/IgniteLoggingSelfTestSuite.java  |    5 +-
 .../IgniteMarshallerSelfTestSuite.java          |   20 +-
 .../testsuites/IgniteP2PSelfTestSuite.java      |   21 +-
 .../IgnitePortableCacheFullApiTestSuite.java    |    9 +-
 .../IgnitePortableCacheTestSuite.java           |   43 +-
 .../IgnitePortableObjectsTestSuite.java         |   36 +-
 .../testsuites/IgniteRestHandlerTestSuite.java  |    6 +-
 .../IgniteSpiCheckpointSelfTestSuite.java       |   19 +-
 .../IgniteSpiCollisionSelfTestSuite.java        |   18 +-
 .../IgniteSpiCommunicationSelfTestSuite.java    |   18 +-
 .../IgniteSpiDeploymentSelfTestSuite.java       |    7 +-
 .../IgniteSpiDiscoverySelfTestSuite.java        |   31 +-
 .../IgniteSpiEventStorageSelfTestSuite.java     |    9 +-
 .../IgniteSpiFailoverSelfTestSuite.java         |   16 +-
 .../IgniteSpiIndexingSelfTestSuite.java         |    6 +-
 .../IgniteSpiLoadBalancingSelfTestSuite.java    |   22 +-
 .../IgniteSpiSwapSpaceSelfTestSuite.java        |    9 +-
 .../ignite/testsuites/IgniteSpiTestSuite.java   |    6 +-
 .../testsuites/IgniteStartUpTestSuite.java      |    6 +-
 .../testsuites/IgniteStreamSelfTestSuite.java   |    7 +-
 .../IgniteTaskSessionSelfTestSuite.java         |   24 +-
 .../IgniteTimeoutProcessorSelfTestSuite.java    |    7 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |   41 +-
 .../GridThreadPoolExecutorServiceSelfTest.java  |   21 +-
 .../apache/ignite/thread/GridThreadTest.java    |    9 +-
 ...dConcurrentLinkedDequeMultiThreadedTest.java |   19 +-
 .../util/GridConcurrentLinkedDequeSelfTest.java |   11 +-
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |   34 +-
 .../apache/ignite/util/GridIndexFillTest.java   |   21 +-
 .../apache/ignite/util/GridLogThrottleTest.java |    7 +-
 .../ignite/util/GridLongListSelfTest.java       |    8 +-
 .../apache/ignite/util/GridQueueSelfTest.java   |    9 +-
 .../apache/ignite/util/GridRandomSelfTest.java  |   13 +-
 .../ignite/util/GridSnapshotLockSelfTest.java   |   20 +-
 .../util/GridSpinReadWriteLockSelfTest.java     |   14 +-
 .../util/GridStringBuilderFactorySelfTest.java  |    9 +-
 .../util/GridTopologyHeapSizeSelfTest.java      |   30 +-
 .../apache/ignite/util/GridTransientTest.java   |   12 +-
 .../ignite/util/TestTcpCommunicationSpi.java    |   17 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |   17 +-
 modules/docker/download_ignite.sh               |    2 +-
 .../tests/p2p/CacheDeploymentTestKey.java       |    2 +-
 .../tests/p2p/CacheDeploymentTestTask1.java     |   23 +-
 .../tests/p2p/CacheDeploymentTestTask2.java     |   22 +-
 .../tests/p2p/CacheDeploymentTestTask3.java     |   23 +-
 .../tests/p2p/CacheDeploymentTestValue.java     |    4 +-
 .../tests/p2p/CacheDeploymentTestValue2.java    |    2 +-
 .../ignite/tests/p2p/ExcludeNodeFilter.java     |   11 +-
 .../p2p/GridCacheDeploymentTestValue3.java      |    7 +-
 .../tests/p2p/GridEventConsumeFilter.java       |    6 +-
 .../GridEventConsumeProjectionPredicate.java    |    6 +-
 .../tests/p2p/GridExternalAffinityFunction.java |   21 +-
 .../p2p/GridExternalAffinityKeyMapper.java      |    4 +-
 .../tests/p2p/GridP2PAwareTestUserResource.java |   11 +-
 .../p2p/GridP2PContinuousDeploymentTask1.java   |   20 +-
 .../p2p/GridP2PContinuousDeploymentTask2.java   |   16 +-
 .../p2p/GridP2PEventFilterExternalPath1.java    |   11 +-
 .../p2p/GridP2PEventFilterExternalPath2.java    |   11 +-
 .../tests/p2p/GridSingleSplitTestJobTarget.java |    2 +-
 .../tests/p2p/GridTestMessageListener.java      |   15 +-
 .../ignite/tests/p2p/GridTestMessageTopic.java  |    4 +-
 .../ignite/tests/p2p/JobStealingTask.java       |   27 +-
 .../tests/p2p/P2PTestTaskExternalPath1.java     |   31 +-
 .../tests/p2p/P2PTestTaskExternalPath2.java     |   31 +-
 .../ignite/tests/p2p/SingleSplitTestTask.java   |   14 +-
 .../ignite/tests/p2p/TestUserResource.java      |    4 +-
 .../CacheNoValueClassOnServerTestClient.java    |   17 +-
 .../apache/ignite/tests/p2p/cache/Person.java   |    4 +-
 .../p2p/startcache/CacheAllNodesFilter.java     |    6 +-
 .../CacheConfigurationP2PTestClient.java        |   20 +-
 .../tests/p2p/startcache/Organization1.java     |    9 +-
 .../tests/p2p/startcache/Organization2.java     |    9 +-
 .../deployment/uri/tasks/GarHelloWorldBean.java |   10 +-
 .../deployment/uri/tasks/GarHelloWorldTask.java |   24 +-
 .../GridUriDeploymentAbstractTestTask.java      |   10 +-
 .../uri/tasks/GridUriDeploymentDependency1.java |   10 +-
 .../uri/tasks/GridUriDeploymentDependency2.java |   10 +-
 .../tasks/GridUriDeploymentInnerTestTask.java   |   10 +-
 .../GridUriDeploymentInterfaceTestTask.java     |    4 +-
 .../GridUriDeploymentNonePublicTestTask.java    |   10 +-
 .../uri/tasks/GridUriDeploymentTestTask0.java   |   10 +-
 .../uri/tasks/GridUriDeploymentTestTask1.java   |   15 +-
 .../uri/tasks/GridUriDeploymentTestTask2.java   |   15 +-
 .../uri/tasks/GridUriDeploymentTestTask3.java   |   10 +-
 .../uri/tasks/GridUriDeploymentTestTask4.java   |   10 +-
 .../uri/tasks/GridUriDeploymentTestTask5.java   |   10 +-
 .../uri/tasks/GridUriDeploymentTestTask6.java   |   10 +-
 .../GridUriDeploymentTestWithNameTask0.java     |   11 +-
 .../GridUriDeploymentTestWithNameTask3.java     |   11 +-
 .../GridUriDeploymentTestWithNameTask4.java     |   11 +-
 .../GridUriDeploymentTestWithNameTask5.java     |   11 +-
 .../GridUriDeploymentTestWithNameTask6.java     |   11 +-
 .../GridUriDeploymentTestWithNameTask7.java     |   11 +-
 .../gce/TcpDiscoveryGoogleStorageIpFinder.java  |   53 +-
 ...pDiscoveryGoogleStorageIpFinderSelfTest.java |   11 +-
 .../ignite/testsuites/IgniteGCETestSuite.java   |    6 +-
 .../query/h2/opt/GridH2SpatialIndex.java        |   43 +-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |   40 +-
 .../testsuites/GeoSpatialIndexingTestSuite.java |    6 +-
 .../fs/IgniteHadoopFileSystemCounterWriter.java |   31 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |   65 +-
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |   97 +-
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    |  102 +-
 .../IgniteHadoopClientProtocolProvider.java     |   40 +-
 .../mapreduce/IgniteHadoopMapReducePlanner.java |   51 +-
 .../processors/hadoop/HadoopClassLoader.java    |   47 +-
 .../processors/hadoop/HadoopComponent.java      |    5 +-
 .../processors/hadoop/HadoopContext.java        |   25 +-
 .../processors/hadoop/HadoopDefaultJobInfo.java |   20 +-
 .../internal/processors/hadoop/HadoopImpl.java  |   12 +-
 .../hadoop/HadoopMapReduceCounterGroup.java     |   14 +-
 .../hadoop/HadoopMapReduceCounters.java         |   30 +-
 .../processors/hadoop/HadoopProcessor.java      |   32 +-
 .../internal/processors/hadoop/HadoopSetup.java |   37 +-
 .../hadoop/HadoopTaskCancelledException.java    |    4 +-
 .../internal/processors/hadoop/HadoopUtils.java |   32 +-
 .../hadoop/SecondaryFileSystemProvider.java     |   29 +-
 .../hadoop/counter/HadoopCounterAdapter.java    |   12 +-
 .../hadoop/counter/HadoopCountersImpl.java      |   23 +-
 .../hadoop/counter/HadoopLongCounter.java       |    7 +-
 .../counter/HadoopPerformanceCounter.java       |   29 +-
 .../hadoop/fs/HadoopFileSystemCacheUtils.java   |   23 +-
 .../hadoop/fs/HadoopFileSystemsUtils.java       |    8 +-
 .../hadoop/fs/HadoopLazyConcurrentMap.java      |   18 +-
 .../hadoop/fs/HadoopLocalFileSystemV1.java      |    8 +-
 .../hadoop/fs/HadoopLocalFileSystemV2.java      |   18 +-
 .../processors/hadoop/fs/HadoopParameters.java  |    2 +-
 .../hadoop/fs/HadoopRawLocalFileSystem.java     |   30 +-
 .../processors/hadoop/igfs/HadoopIgfs.java      |   20 +-
 .../igfs/HadoopIgfsCommunicationException.java  |    4 +-
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |   21 +-
 .../processors/hadoop/igfs/HadoopIgfsEx.java    |    9 +-
 .../hadoop/igfs/HadoopIgfsFuture.java           |    6 +-
 .../hadoop/igfs/HadoopIgfsInProc.java           |   38 +-
 .../hadoop/igfs/HadoopIgfsInputStream.java      |   23 +-
 .../processors/hadoop/igfs/HadoopIgfsIo.java    |   10 +-
 .../processors/hadoop/igfs/HadoopIgfsIpcIo.java |   53 +-
 .../hadoop/igfs/HadoopIgfsIpcIoListener.java    |    2 +-
 .../hadoop/igfs/HadoopIgfsJclLogger.java        |   13 +-
 .../hadoop/igfs/HadoopIgfsOutProc.java          |   61 +-
 .../hadoop/igfs/HadoopIgfsOutputStream.java     |   14 +-
 .../hadoop/igfs/HadoopIgfsProperties.java       |   13 +-
 .../hadoop/igfs/HadoopIgfsProxyInputStream.java |   12 +-
 .../igfs/HadoopIgfsProxyOutputStream.java       |   10 +-
 ...fsSecondaryFileSystemPositionedReadable.java |   13 +-
 .../hadoop/igfs/HadoopIgfsStreamDelegate.java   |    4 +-
 .../igfs/HadoopIgfsStreamEventListener.java     |    4 +-
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |   21 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |   43 +-
 .../hadoop/jobtracker/HadoopJobMetadata.java    |   30 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |  108 +-
 .../hadoop/message/HadoopMessage.java           |    4 +-
 .../planner/HadoopDefaultMapReducePlan.java     |   12 +-
 .../hadoop/proto/HadoopClientProtocol.java      |   59 +-
 .../proto/HadoopProtocolJobCountersTask.java    |   12 +-
 .../proto/HadoopProtocolJobStatusTask.java      |   19 +-
 .../hadoop/proto/HadoopProtocolKillJobTask.java |   12 +-
 .../proto/HadoopProtocolNextTaskIdTask.java     |    7 +-
 .../proto/HadoopProtocolSubmitJobTask.java      |   16 +-
 .../hadoop/proto/HadoopProtocolTaskAdapter.java |   31 +-
 .../proto/HadoopProtocolTaskArguments.java      |   13 +-
 .../hadoop/shuffle/HadoopShuffle.java           |   37 +-
 .../hadoop/shuffle/HadoopShuffleAck.java        |   15 +-
 .../hadoop/shuffle/HadoopShuffleJob.java        |   64 +-
 .../hadoop/shuffle/HadoopShuffleMessage.java    |   25 +-
 .../HadoopConcurrentHashMultimap.java           |   29 +-
 .../shuffle/collections/HadoopHashMultimap.java |   12 +-
 .../collections/HadoopHashMultimapBase.java     |   15 +-
 .../shuffle/collections/HadoopMultimap.java     |   13 +-
 .../shuffle/collections/HadoopMultimapBase.java |   33 +-
 .../shuffle/collections/HadoopSkipList.java     |   29 +-
 .../shuffle/streams/HadoopDataInStream.java     |   11 +-
 .../shuffle/streams/HadoopDataOutStream.java    |   13 +-
 .../shuffle/streams/HadoopOffheapBuffer.java    |    2 +-
 .../HadoopEmbeddedTaskExecutor.java             |   25 +-
 .../taskexecutor/HadoopExecutorService.java     |   27 +-
 .../hadoop/taskexecutor/HadoopRunnableTask.java |   36 +-
 .../taskexecutor/HadoopTaskExecutorAdapter.java |   14 +-
 .../hadoop/taskexecutor/HadoopTaskState.java    |    2 +-
 .../hadoop/taskexecutor/HadoopTaskStatus.java   |   14 +-
 .../external/HadoopExternalTaskExecutor.java    |   70 +-
 .../external/HadoopExternalTaskMetadata.java    |    9 +-
 .../external/HadoopJobInfoUpdateRequest.java    |   18 +-
 .../external/HadoopPrepareForJobRequest.java    |   18 +-
 .../external/HadoopProcessDescriptor.java       |    9 +-
 .../external/HadoopProcessStartedAck.java       |   11 +-
 .../external/HadoopTaskExecutionRequest.java    |   20 +-
 .../external/HadoopTaskFinishedMessage.java     |   16 +-
 .../child/HadoopChildProcessRunner.java         |   58 +-
 .../child/HadoopExternalProcessStarter.java     |   31 +-
 .../HadoopAbstractCommunicationClient.java      |    8 +-
 .../HadoopCommunicationClient.java              |    8 +-
 .../HadoopExternalCommunication.java            |   74 +-
 .../HadoopHandshakeTimeoutException.java        |    6 +-
 .../communication/HadoopIpcToNioAdapter.java    |   27 +-
 .../communication/HadoopMarshallerFilter.java   |   12 +-
 .../communication/HadoopMessageListener.java    |    6 +-
 .../HadoopTcpNioCommunicationClient.java        |   14 +-
 .../hadoop/v1/HadoopV1CleanupTask.java          |   16 +-
 .../processors/hadoop/v1/HadoopV1Counter.java   |   15 +-
 .../processors/hadoop/v1/HadoopV1MapTask.java   |   25 +-
 .../hadoop/v1/HadoopV1OutputCollector.java      |   21 +-
 .../hadoop/v1/HadoopV1Partitioner.java          |   10 +-
 .../hadoop/v1/HadoopV1ReduceTask.java           |   18 +-
 .../processors/hadoop/v1/HadoopV1Reporter.java  |   10 +-
 .../processors/hadoop/v1/HadoopV1SetupTask.java |   14 +-
 .../processors/hadoop/v1/HadoopV1Splitter.java  |   25 +-
 .../processors/hadoop/v1/HadoopV1Task.java      |   18 +-
 .../processors/hadoop/v2/HadoopDaemon.java      |    5 +-
 .../hadoop/v2/HadoopExternalSplit.java          |   10 +-
 .../hadoop/v2/HadoopNativeCodeLoader.java       |    6 +-
 .../hadoop/v2/HadoopSerializationWrapper.java   |   19 +-
 .../hadoop/v2/HadoopShutdownHookManager.java    |    8 +-
 .../hadoop/v2/HadoopSplitWrapper.java           |   11 +-
 .../hadoop/v2/HadoopV2CleanupTask.java          |   13 +-
 .../processors/hadoop/v2/HadoopV2Context.java   |   33 +-
 .../processors/hadoop/v2/HadoopV2Counter.java   |   11 +-
 .../processors/hadoop/v2/HadoopV2Job.java       |   85 +-
 .../hadoop/v2/HadoopV2JobResourceManager.java   |   39 +-
 .../processors/hadoop/v2/HadoopV2MapTask.java   |   19 +-
 .../hadoop/v2/HadoopV2Partitioner.java          |   10 +-
 .../hadoop/v2/HadoopV2ReduceTask.java           |   14 +-
 .../processors/hadoop/v2/HadoopV2SetupTask.java |   13 +-
 .../processors/hadoop/v2/HadoopV2Splitter.java  |   28 +-
 .../processors/hadoop/v2/HadoopV2Task.java      |   20 +-
 .../hadoop/v2/HadoopV2TaskContext.java          |   83 +-
 .../hadoop/v2/HadoopWritableSerialization.java  |   17 +-
 .../HadoopClientProtocolEmbeddedSelfTest.java   |    4 +-
 .../hadoop/HadoopClientProtocolSelfTest.java    |   59 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |   25 +-
 .../igfs/Hadoop1OverIgfsDualAsyncTest.java      |    2 +-
 .../igfs/Hadoop1OverIgfsDualSyncTest.java       |    2 +-
 ...oopFileSystemUniversalFileSystemAdapter.java |   19 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   99 +-
 ...Igfs20FileSystemLoopbackPrimarySelfTest.java |    8 +-
 ...oopIgfs20FileSystemShmemPrimarySelfTest.java |    8 +-
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |   62 +-
 .../igfs/HadoopIgfsDualAsyncSelfTest.java       |    4 +-
 .../ignite/igfs/HadoopIgfsDualSyncSelfTest.java |    4 +-
 ...oopSecondaryFileSystemConfigurationTest.java |   70 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   25 +-
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |   50 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |  106 +-
 .../IgniteHadoopFileSystemClientSelfTest.java   |   57 +-
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |   52 +-
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |   51 +-
 .../IgniteHadoopFileSystemLoggerSelfTest.java   |   42 +-
 ...niteHadoopFileSystemLoggerStateSelfTest.java |   46 +-
 ...adoopFileSystemLoopbackAbstractSelfTest.java |    6 +-
 ...SystemLoopbackEmbeddedDualAsyncSelfTest.java |    4 +-
 ...eSystemLoopbackEmbeddedDualSyncSelfTest.java |    4 +-
 ...leSystemLoopbackEmbeddedPrimarySelfTest.java |    4 +-
 ...SystemLoopbackEmbeddedSecondarySelfTest.java |    4 +-
 ...SystemLoopbackExternalDualAsyncSelfTest.java |    4 +-
 ...eSystemLoopbackExternalDualSyncSelfTest.java |    4 +-
 ...leSystemLoopbackExternalPrimarySelfTest.java |    4 +-
 ...SystemLoopbackExternalSecondarySelfTest.java |    4 +-
 ...teHadoopFileSystemSecondaryModeSelfTest.java |   47 +-
 ...teHadoopFileSystemShmemAbstractSelfTest.java |   19 +-
 ...ileSystemShmemEmbeddedDualAsyncSelfTest.java |    4 +-
 ...FileSystemShmemEmbeddedDualSyncSelfTest.java |    4 +-
 ...pFileSystemShmemEmbeddedPrimarySelfTest.java |    4 +-
 ...ileSystemShmemEmbeddedSecondarySelfTest.java |    4 +-
 ...ileSystemShmemExternalDualAsyncSelfTest.java |    4 +-
 ...FileSystemShmemExternalDualSyncSelfTest.java |    4 +-
 ...pFileSystemShmemExternalPrimarySelfTest.java |    4 +-
 ...ileSystemShmemExternalSecondarySelfTest.java |    4 +-
 .../hadoop/HadoopAbstractSelfTest.java          |   38 +-
 .../hadoop/HadoopAbstractWordCountTest.java     |   19 +-
 .../hadoop/HadoopClassLoaderTest.java           |    6 +-
 .../hadoop/HadoopCommandLineTest.java           |   48 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   62 +-
 .../hadoop/HadoopFileSystemsTest.java           |   21 +-
 .../processors/hadoop/HadoopGroupingTest.java   |   43 +-
 .../hadoop/HadoopJobTrackerSelfTest.java        |   44 +-
 .../hadoop/HadoopMapReduceEmbeddedSelfTest.java |   34 +-
 .../processors/hadoop/HadoopMapReduceTest.java  |   78 +-
 .../hadoop/HadoopPopularWordsTest.java          |   40 +-
 .../HadoopSerializationWrapperSelfTest.java     |   21 +-
 .../processors/hadoop/HadoopSharedMap.java      |    7 +-
 .../hadoop/HadoopSortingExternalTest.java       |    7 +-
 .../processors/hadoop/HadoopSortingTest.java    |   50 +-
 .../hadoop/HadoopSplitWrapperSelfTest.java      |   22 +-
 .../processors/hadoop/HadoopStartup.java        |    6 +-
 .../hadoop/HadoopTaskExecutionSelfTest.java     |   60 +-
 .../hadoop/HadoopTasksAllVersionsTest.java      |   22 +-
 .../processors/hadoop/HadoopTasksV1Test.java    |   15 +-
 .../processors/hadoop/HadoopTasksV2Test.java    |   26 +-
 .../hadoop/HadoopTestRoundRobinMrPlanner.java   |   19 +-
 .../hadoop/HadoopTestTaskContext.java           |   25 +-
 .../processors/hadoop/HadoopTestUtils.java      |   19 +-
 .../processors/hadoop/HadoopV2JobSelfTest.java  |   30 +-
 .../hadoop/HadoopValidationSelfTest.java        |    4 +-
 .../hadoop/examples/HadoopWordCount1.java       |   14 +-
 .../hadoop/examples/HadoopWordCount1Map.java    |   17 +-
 .../hadoop/examples/HadoopWordCount1Reduce.java |   16 +-
 .../hadoop/examples/HadoopWordCount2.java       |   18 +-
 .../hadoop/examples/HadoopWordCount2Mapper.java |   15 +-
 .../examples/HadoopWordCount2Reducer.java       |   13 +-
 .../collections/HadoopAbstractMapTest.java      |   29 +-
 .../HadoopConcurrentHashMultimapSelftest.java   |   41 +-
 .../collections/HadoopHashMapSelfTest.java      |   25 +-
 .../collections/HadoopSkipListSelfTest.java     |   46 +-
 .../streams/HadoopDataStreamSelfTest.java       |   11 +-
 .../taskexecutor/HadoopExecutorServiceTest.java |   15 +-
 .../HadoopExternalTaskExecutionSelfTest.java    |   46 +-
 .../HadoopExternalCommunicationSelfTest.java    |   30 +-
 .../testsuites/IgniteHadoopTestSuite.java       |   85 +-
 .../IgniteIgfsLinuxAndMacOSTestSuite.java       |   20 +-
 .../HibernateAbstractRegionAccessStrategy.java  |    9 +-
 .../HibernateAccessStrategyAdapter.java         |   33 +-
 .../hibernate/HibernateCollectionRegion.java    |   14 +-
 .../cache/hibernate/HibernateEntityRegion.java  |   15 +-
 .../hibernate/HibernateGeneralDataRegion.java   |   15 +-
 .../hibernate/HibernateNaturalIdRegion.java     |   15 +-
 .../HibernateNonStrictAccessStrategy.java       |   23 +-
 .../hibernate/HibernateQueryResultsRegion.java  |   10 +-
 .../HibernateReadOnlyAccessStrategy.java        |   14 +-
 .../HibernateReadWriteAccessStrategy.java       |   26 +-
 .../ignite/cache/hibernate/HibernateRegion.java |   14 +-
 .../cache/hibernate/HibernateRegionFactory.java |   31 +-
 .../hibernate/HibernateTimestampsRegion.java    |    8 +-
 .../HibernateTransactionalAccessStrategy.java   |   14 +-
 .../HibernateTransactionalDataRegion.java       |   22 +-
 .../hibernate/CacheHibernateBlobStore.java      |   57 +-
 .../hibernate/CacheHibernateBlobStoreEntry.java |    7 +-
 .../CacheHibernateBlobStoreFactory.java         |   26 +-
 .../CacheHibernateStoreSessionListener.java     |   32 +-
 .../HibernateL2CacheConfigurationSelfTest.java  |   57 +-
 .../hibernate/HibernateL2CacheSelfTest.java     |   78 +-
 .../HibernateL2CacheTransactionalSelfTest.java  |   34 +-
 .../CacheHibernateBlobStoreNodeRestartTest.java |   12 +-
 .../CacheHibernateBlobStoreSelfTest.java        |   15 +-
 .../CacheHibernateStoreFactorySelfTest.java     |   42 +-
 ...heHibernateStoreSessionListenerSelfTest.java |   36 +-
 .../testsuites/IgniteHibernateTestSuite.java    |   13 +-
 .../query/h2/GridH2ResultSetIterator.java       |   16 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  196 +-
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |   30 +-
 .../processors/query/h2/opt/GridH2Cursor.java   |   12 +-
 .../query/h2/opt/GridH2IndexBase.java           |   24 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |   19 +-
 .../query/h2/opt/GridH2KeyValueRowOnheap.java   |    8 +-
 .../processors/query/h2/opt/GridH2Row.java      |    6 +-
 .../query/h2/opt/GridH2RowDescriptor.java       |   16 +-
 .../processors/query/h2/opt/GridH2Table.java    |   58 +-
 .../query/h2/opt/GridH2TreeIndex.java           |   41 +-
 .../processors/query/h2/opt/GridH2Utils.java    |   10 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |   19 +-
 .../query/h2/opt/GridLuceneDirectory.java       |   21 +-
 .../processors/query/h2/opt/GridLuceneFile.java |   10 +-
 .../query/h2/opt/GridLuceneIndex.java           |   64 +-
 .../query/h2/opt/GridLuceneInputStream.java     |   13 +-
 .../query/h2/opt/GridLuceneLockFactory.java     |   10 +-
 .../query/h2/opt/GridLuceneOutputStream.java    |    9 +-
 .../query/h2/opt/GridSearchRowPointer.java      |    6 +-
 .../query/h2/sql/GridSqlAggregateFunction.java  |   12 +-
 .../processors/query/h2/sql/GridSqlAlias.java   |    7 +-
 .../processors/query/h2/sql/GridSqlColumn.java  |    4 +-
 .../processors/query/h2/sql/GridSqlConst.java   |    7 +-
 .../processors/query/h2/sql/GridSqlElement.java |    5 +-
 .../query/h2/sql/GridSqlFunction.java           |   22 +-
 .../query/h2/sql/GridSqlFunctionType.java       |    4 +-
 .../processors/query/h2/sql/GridSqlJoin.java    |   10 +-
 .../query/h2/sql/GridSqlOperation.java          |    6 +-
 .../query/h2/sql/GridSqlOperationType.java      |    5 +-
 .../query/h2/sql/GridSqlParameter.java          |    4 +-
 .../query/h2/sql/GridSqlPlaceholder.java        |    4 +-
 .../processors/query/h2/sql/GridSqlQuery.java   |    9 +-
 .../query/h2/sql/GridSqlQueryParser.java        |   82 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |   31 +-
 .../processors/query/h2/sql/GridSqlSelect.java  |    9 +-
 .../query/h2/sql/GridSqlSortColumn.java         |    2 +-
 .../query/h2/sql/GridSqlSubquery.java           |    4 +-
 .../processors/query/h2/sql/GridSqlTable.java   |    9 +-
 .../processors/query/h2/sql/GridSqlType.java    |    8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   |    9 +-
 .../processors/query/h2/sql/GridSqlValue.java   |    2 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   97 +-
 .../query/h2/twostep/GridMergeIndex.java        |   44 +-
 .../h2/twostep/GridMergeIndexUnsorted.java      |   25 +-
 .../query/h2/twostep/GridMergeTable.java        |   22 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  114 +-
 .../query/h2/twostep/GridResultPage.java        |   27 +-
 .../query/h2/twostep/GridThreadLocalTable.java  |   33 +-
 .../query/h2/twostep/msg/GridH2Array.java       |   26 +-
 .../query/h2/twostep/msg/GridH2Boolean.java     |   13 +-
 .../query/h2/twostep/msg/GridH2Byte.java        |   13 +-
 .../query/h2/twostep/msg/GridH2Bytes.java       |   13 +-
 .../query/h2/twostep/msg/GridH2CacheObject.java |   19 +-
 .../query/h2/twostep/msg/GridH2Date.java        |   13 +-
 .../query/h2/twostep/msg/GridH2Decimal.java     |   16 +-
 .../query/h2/twostep/msg/GridH2Double.java      |   13 +-
 .../query/h2/twostep/msg/GridH2Float.java       |   13 +-
 .../query/h2/twostep/msg/GridH2Geometry.java    |   15 +-
 .../query/h2/twostep/msg/GridH2Integer.java     |   13 +-
 .../query/h2/twostep/msg/GridH2JavaObject.java  |   13 +-
 .../query/h2/twostep/msg/GridH2Long.java        |   13 +-
 .../query/h2/twostep/msg/GridH2Null.java        |   13 +-
 .../query/h2/twostep/msg/GridH2Short.java       |   13 +-
 .../query/h2/twostep/msg/GridH2String.java      |   13 +-
 .../query/h2/twostep/msg/GridH2Time.java        |   13 +-
 .../query/h2/twostep/msg/GridH2Timestamp.java   |   13 +-
 .../query/h2/twostep/msg/GridH2Uuid.java        |   13 +-
 .../h2/twostep/msg/GridH2ValueMessage.java      |   15 +-
 .../twostep/msg/GridH2ValueMessageFactory.java  |   19 +-
 .../CacheAbstractQueryMetricsSelfTest.java      |   25 +-
 .../cache/CacheConfigurationP2PTest.java        |   36 +-
 .../cache/CacheConfigurationP2PTestServer.java  |   13 +-
 .../cache/CacheLocalQueryMetricsSelfTest.java   |    4 +-
 ...titionedQueryMetricsDistributedSelfTest.java |    4 +-
 ...chePartitionedQueryMetricsLocalSelfTest.java |    4 +-
 ...plicatedQueryMetricsDistributedSelfTest.java |    4 +-
 ...acheReplicatedQueryMetricsLocalSelfTest.java |    4 +-
 ...CacheScanPartitionQueryFallbackSelfTest.java |   66 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   45 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   64 +-
 .../cache/GridCacheOffHeapSelfTest.java         |   61 +-
 .../GridCacheOffheapIndexEntryEvictTest.java    |   42 +-
 .../cache/GridCacheOffheapIndexGetSelfTest.java |   46 +-
 .../GridCacheQueryIndexDisabledSelfTest.java    |   32 +-
 .../GridCacheQuerySerializationSelfTest.java    |   37 +-
 .../cache/GridCacheQuerySimpleBenchmark.java    |   46 +-
 .../cache/GridCacheQueryTestValue.java          |    8 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |   34 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   63 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |   38 +-
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |   73 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  120 +-
 .../IgniteCacheCollocatedQuerySelfTest.java     |   40 +-
 ...acheConfigurationPrimitiveTypesSelfTest.java |   19 +-
 .../IgniteCacheFieldsQueryNoDataSelfTest.java   |   26 +-
 .../cache/IgniteCacheLargeResultSelfTest.java   |   29 +-
 .../cache/IgniteCacheOffheapEvictQueryTest.java |   50 +-
 ...CacheOffheapTieredMultithreadedSelfTest.java |   44 +-
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |    9 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |   59 +-
 ...teCacheQueryEvictsMultiThreadedSelfTest.java |    2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |   26 +-
 .../cache/IgniteCacheQueryLoadSelfTest.java     |   52 +-
 ...QueryMultiThreadedOffHeapTieredSelfTest.java |    7 +-
 .../IgniteCacheQueryMultiThreadedSelfTest.java  |   66 +-
 ...QueryOffheapEvictsMultiThreadedSelfTest.java |    2 +-
 ...eCacheQueryOffheapMultiThreadedSelfTest.java |    2 +-
 ...gniteCacheSqlQueryMultiThreadedSelfTest.java |   47 +-
 ...ClientReconnectCacheQueriesFailoverTest.java |   37 +-
 .../cache/IgniteClientReconnectQueriesTest.java |   44 +-
 .../IgniteCacheAtomicFieldsQuerySelfTest.java   |   16 +-
 ...cheAtomicNearEnabledFieldsQuerySelfTest.java |    4 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |    8 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |    8 +-
 ...lientQueryReplicatedNodeRestartSelfTest.java |   64 +-
 ...artitionedFieldsQueryP2PEnabledSelfTest.java |    4 +-
 ...niteCachePartitionedFieldsQuerySelfTest.java |   13 +-
 ...achePartitionedQueryP2PDisabledSelfTest.java |    4 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |   26 +-
 .../IgniteCacheQueryNodeRestartSelfTest.java    |   53 +-
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |   56 +-
 ...ReplicatedFieldsQueryP2PEnabledSelfTest.java |    4 +-
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |   25 +-
 ...CacheReplicatedQueryP2PDisabledSelfTest.java |    4 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |   74 +-
 .../IgniteCacheLocalAtomicQuerySelfTest.java    |    6 +-
 .../IgniteCacheLocalFieldsQuerySelfTest.java    |    8 +-
 .../local/IgniteCacheLocalQuerySelfTest.java    |   22 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   54 +-
 ...ridCacheReduceFieldsQueryAtomicSelfTest.java |    8 +-
 ...GridCacheReduceFieldsQueryLocalSelfTest.java |    6 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |   15 +-
 ...acheReduceFieldsQueryReplicatedSelfTest.java |    6 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |   62 +-
 .../CacheTtlOffheapAtomicAbstractSelfTest.java  |    4 +-
 .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java |    4 +-
 ...acheTtlOffheapAtomicPartitionedSelfTest.java |    4 +-
 ...TtlOffheapTransactionalAbstractSelfTest.java |    4 +-
 ...cheTtlOffheapTransactionalLocalSelfTest.java |    4 +-
 .../CacheTtlOnheapAtomicAbstractSelfTest.java   |    4 +-
 .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java  |    4 +-
 ...eTtlOnheapTransactionalAbstractSelfTest.java |    4 +-
 ...acheTtlOnheapTransactionalLocalSelfTest.java |    4 +-
 ...lOnheapTransactionalPartitionedSelfTest.java |    4 +-
 .../query/IgniteSqlSplitterSelfTest.java        |   34 +-
 .../query/h2/GridH2IndexRebuildTest.java        |   33 +-
 .../query/h2/GridH2IndexingInMemSelfTest.java   |    2 +-
 .../query/h2/GridH2IndexingOffheapSelfTest.java |    2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |   47 +-
 .../query/h2/opt/GridH2TableSelfTest.java       |   42 +-
 .../h2/sql/AbstractH2CompareQueryTest.java      |   46 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   34 +-
 .../query/h2/sql/GridQueryParsingTest.java      |   52 +-
 .../query/h2/sql/H2CompareBigQueryTest.java     |   26 +-
 .../loadtests/h2indexing/GridTestEntity.java    |    7 +-
 .../loadtests/h2indexing/GridTreeBenchmark.java |   16 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |   56 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   81 +-
 .../IgniteCacheWithIndexingTestSuite.java       |   23 +-
 .../IgniteH2IndexingSpiTestSuite.java           |   10 +-
 .../IgnitePortableCacheQueryTestSuite.java      |   42 +-
 .../org/apache/ignite/logger/jcl/JclLogger.java |    9 +-
 .../apache/ignite/logger/jcl/JclLoggerTest.java |   10 +-
 .../ignite/testsuites/IgniteJclTestSuite.java   |    6 +-
 .../apache/ignite/stream/jms11/JmsStreamer.java |   31 +-
 .../ignite/stream/jms11/MessageTransformer.java |    7 +-
 .../stream/jms11/IgniteJmsStreamerTest.java     |   50 +-
 .../ignite/stream/jms11/TestTransformers.java   |   11 +-
 .../apache/ignite/cache/jta/CacheTmLookup.java  |   11 +-
 .../cache/jta/jndi/CacheJndiTmLookup.java       |   16 +-
 .../jta/reflect/CacheReflectionTmLookup.java    |   13 +-
 .../processors/cache/jta/CacheJtaManager.java   |   23 +-
 .../cache/jta/GridCacheXAResource.java          |   28 +-
 ...CacheJtaConfigurationValidationSelfTest.java |   22 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |   31 +-
 .../cache/GridCacheReplicatedJtaSelfTest.java   |    6 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |   31 +-
 .../ignite/testsuites/IgniteJtaTestSuite.java   |    9 +-
 .../ignite/stream/kafka/KafkaStreamer.java      |   27 +-
 .../kafka/IgniteKafkaStreamerSelfTestSuite.java |    4 +-
 .../stream/kafka/KafkaEmbeddedBroker.java       |   43 +-
 .../kafka/KafkaIgniteStreamerSelfTest.java      |   42 +-
 .../ignite/stream/kafka/SimplePartitioner.java  |    6 +-
 .../log4j/Log4JDailyRollingFileAppender.java    |   12 +-
 .../Log4JExternallyRolledFileAppender.java      |   11 +-
 .../ignite/logger/log4j/Log4JFileAppender.java  |   12 +-
 .../apache/ignite/logger/log4j/Log4JLogger.java |   49 +-
 .../ignite/logger/log4j/Log4jFileAware.java     |    4 +-
 .../logger/log4j/Log4jNodeIdFilePath.java       |   15 +-
 .../logger/log4j/Log4jRollingFileAppender.java  |   12 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |   24 +-
 .../logger/log4j/GridLog4jInitializedTest.java  |   10 +-
 .../logger/log4j/GridLog4jLoggingFileTest.java  |   13 +-
 .../logger/log4j/GridLog4jLoggingPathTest.java  |    8 +-
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |   13 +-
 .../log4j/GridLog4jNotInitializedTest.java      |    8 +-
 .../ignite/testsuites/IgniteLog4jTestSuite.java |    8 +-
 .../ignite/logger/log4j2/Log4J2Logger.java      |   56 +-
 .../ignite/logger/log4j2/package-info.java      |    2 +-
 .../log4j2/GridLog4j2CorrectFileNameTest.java   |    3 +-
 .../log4j2/GridLog4j2InitializedTest.java       |    9 +-
 .../log4j2/GridLog4j2LoggingFileTest.java       |    5 +-
 .../logger/log4j2/Log4j2LoggerSelfTest.java     |   27 +-
 .../log4j2/Log4j2LoggerVerboseModeSelfTest.java |   22 +-
 .../ignite/logger/log4j2/package-info.java      |    2 +-
 .../testsuites/IgniteLog4j2TestSuite.java       |    6 +-
 .../apache/ignite/mesos/ClusterProperties.java  |   19 +-
 .../apache/ignite/mesos/IgniteFramework.java    |   19 +-
 .../apache/ignite/mesos/IgniteScheduler.java    |   21 +-
 .../org/apache/ignite/mesos/IgniteTask.java     |    2 +-
 .../ignite/mesos/resource/IgniteProvider.java   |   16 +-
 .../ignite/mesos/resource/JettyServer.java      |    8 +-
 .../ignite/mesos/resource/ResourceHandler.java  |   22 +-
 .../ignite/mesos/resource/ResourceProvider.java |   16 +-
 .../org/apache/ignite/IgniteMesosTestSuite.java |    6 +-
 .../ignite/mesos/IgniteSchedulerSelfTest.java   |   16 +-
 .../platform/src/main/cpp/common/Makefile.am    |   45 +
 .../platform/src/main/cpp/common/configure.ac   |   62 +
 .../src/main/cpp/common/ignite-common.pc.in     |    9 +
 .../src/main/cpp/common/include/Makefile.am     |   22 +
 .../common/include/ignite/common/concurrent.h   |  210 ++
 .../cpp/common/include/ignite/common/exports.h  |  145 ++
 .../cpp/common/include/ignite/common/java.h     |  652 ++++++
 .../cpp/common/os/linux/include/Makefile.am     |   21 +
 .../os/linux/include/ignite/common/common.h     |   81 +
 .../linux/include/ignite/common/concurrent_os.h |  394 ++++
 .../src/main/cpp/common/os/linux/src/common.cpp |   59 +
 .../cpp/common/os/linux/src/concurrent_os.cpp   |  175 ++
 .../os/win/include/ignite/common/common.h       |   56 +
 .../win/include/ignite/common/concurrent_os.h   |  406 ++++
 .../src/main/cpp/common/os/win/src/common.cpp   |   65 +
 .../cpp/common/os/win/src/concurrent_os.cpp     |  151 ++
 .../src/main/cpp/common/project/README.TXT      |    1 +
 .../src/main/cpp/common/project/vs/README.TXT   |    1 +
 .../main/cpp/common/project/vs/common.vcxproj   |  202 ++
 .../common/project/vs/common.vcxproj.filters    |   54 +
 .../src/main/cpp/common/project/vs/module.def   |   99 +
 .../src/main/cpp/common/project/vs/targetver.h  |   25 +
 .../src/main/cpp/common/src/concurrent.cpp      |   94 +
 .../src/main/cpp/common/src/exports.cpp         |  413 ++++
 .../platform/src/main/cpp/common/src/java.cpp   | 2204 ++++++++++++++++++
 .../Impl/Memory/PlatformMemoryStream.cs         |    3 +-
 .../platform/PlatformAbstractBootstrap.java     |   12 +-
 .../platform/PlatformAbstractPredicate.java     |    7 +-
 .../platform/PlatformAbstractTarget.java        |  160 +-
 .../processors/platform/PlatformBootstrap.java  |    4 +-
 .../platform/PlatformBootstrapFactory.java      |    2 +-
 .../processors/platform/PlatformException.java  |    8 +-
 .../platform/PlatformExtendedException.java     |    4 +-
 .../processors/platform/PlatformIgnition.java   |   27 +-
 .../platform/PlatformNoCallbackException.java   |    4 +-
 .../platform/cache/PlatformCache.java           |  199 +-
 .../cache/PlatformCacheEntryFilterImpl.java     |   21 +-
 .../cache/PlatformCacheEntryProcessor.java      |  212 --
 .../cache/PlatformCacheEntryProcessorImpl.java  |  220 ++
 .../platform/cache/PlatformCacheIterator.java   |   18 +-
 .../PlatformCachePartialUpdateException.java    |   15 +-
 .../cache/affinity/PlatformAffinity.java        |   39 +-
 .../query/PlatformAbstractQueryCursor.java      |   20 +-
 .../query/PlatformContinuousQueryImpl.java      |   33 +-
 .../PlatformContinuousQueryRemoteFilter.java    |   33 +-
 .../cache/query/PlatformFieldsQueryCursor.java  |   11 +-
 .../cache/query/PlatformQueryCursor.java        |   11 +-
 .../cache/store/PlatformCacheStore.java         |    2 +-
 .../cache/store/PlatformCacheStoreCallback.java |    8 +-
 .../platform/cluster/PlatformClusterGroup.java  |   43 +-
 .../cluster/PlatformClusterNodeFilter.java      |   77 -
 .../cluster/PlatformClusterNodeFilterImpl.java  |   78 +
 .../platform/compute/PlatformAbstractJob.java   |   24 +-
 .../platform/compute/PlatformAbstractTask.java  |   27 +-
 .../PlatformBalancingMultiClosureTask.java      |   23 +-
 ...tformBalancingSingleClosureAffinityTask.java |   22 +-
 .../PlatformBalancingSingleClosureTask.java     |   22 +-
 .../PlatformBroadcastingMultiClosureTask.java   |   20 +-
 .../PlatformBroadcastingSingleClosureTask.java  |   19 +-
 .../platform/compute/PlatformClosureJob.java    |   20 +-
 .../platform/compute/PlatformCompute.java       |   43 +-
 .../platform/compute/PlatformFullJob.java       |   21 +-
 .../platform/compute/PlatformFullTask.java      |   33 +-
 .../compute/PlatformNativeException.java        |   12 +-
 .../datastreamer/PlatformDataStreamer.java      |   38 +-
 .../datastreamer/PlatformStreamReceiver.java    |  114 -
 .../PlatformStreamReceiverImpl.java             |  119 +
 .../platform/dotnet/PlatformDotNetService.java  |    4 +-
 .../dotnet/PlatformDotNetServiceImpl.java       |    6 +-
 .../platform/events/PlatformEventFilter.java    |  161 --
 .../events/PlatformEventFilterListenerImpl.java |  163 ++
 .../platform/events/PlatformEvents.java         |   60 +-
 .../lifecycle/PlatformLifecycleBean.java        |    9 +-
 .../platform/memory/PlatformAbstractMemory.java |    2 +-
 .../PlatformBigEndianInputStreamImpl.java       |    2 +-
 .../PlatformBigEndianOutputStreamImpl.java      |    3 +-
 .../platform/memory/PlatformExternalMemory.java |    8 +-
 .../memory/PlatformInputStreamImpl.java         |   16 +-
 .../memory/PlatformMemoryManagerImpl.java       |   10 +-
 .../platform/memory/PlatformMemoryPool.java     |   11 +-
 .../platform/memory/PlatformMemoryUtils.java    |    9 +-
 .../memory/PlatformOutputStreamImpl.java        |   12 +-
 .../platform/memory/PlatformPooledMemory.java   |    5 +-
 .../platform/memory/PlatformUnpooledMemory.java |    4 +-
 .../messaging/PlatformMessageFilter.java        |  109 -
 .../messaging/PlatformMessageFilterImpl.java    |  110 +
 .../messaging/PlatformMessageLocalFilter.java   |   18 +-
 .../platform/messaging/PlatformMessaging.java   |   32 +-
 .../services/PlatformAbstractService.java       |   28 +-
 .../platform/services/PlatformServices.java     |   63 +-
 .../transactions/PlatformTransactions.java      |   34 +-
 .../platform/utils/PlatformFutureUtils.java     |   17 +-
 .../platform/utils/PlatformReaderBiClosure.java |    6 +-
 .../platform/utils/PlatformReaderClosure.java   |    4 +-
 .../platform/utils/PlatformUtils.java           |   46 +-
 .../platform/utils/PlatformWriterBiClosure.java |    4 +-
 .../platform/utils/PlatformWriterClosure.java   |    4 +-
 .../http/jetty/GridJettyJsonConfig.java         |    9 +-
 .../http/jetty/GridJettyRestHandler.java        |   72 +-
 .../http/jetty/GridJettyRestProtocol.java       |   59 +-
 .../rest/protocols/http/jetty/rest.html         |    4 +-
 modules/scalar-2.10/pom.xml                     |    2 +-
 modules/scalar/pom.xml                          |    2 +-
 .../schedule/IgniteScheduleProcessor.java       |   26 +-
 .../processors/schedule/ScheduleFutureImpl.java |   56 +-
 .../schedule/GridScheduleSelfTest.java          |   31 +-
 .../testsuites/IgniteSchedulerTestSuite.java    |    6 +-
 .../ignite/schema/generator/CodeGenerator.java  |   36 +-
 .../ignite/schema/generator/XmlGenerator.java   |   51 +-
 .../apache/ignite/schema/model/IndexItem.java   |    2 +-
 .../ignite/schema/model/PojoDescriptor.java     |   54 +-
 .../apache/ignite/schema/model/PojoField.java   |   58 +-
 .../ignite/schema/model/SchemaDescriptor.java   |    5 +-
 .../schema/parser/DatabaseMetadataParser.java   |   29 +-
 .../apache/ignite/schema/parser/DbColumn.java   |    2 +-
 .../apache/ignite/schema/parser/DbTable.java    |    6 +-
 .../parser/dialect/DB2MetadataDialect.java      |    6 +-
 .../parser/dialect/DatabaseMetadataDialect.java |   16 +-
 .../parser/dialect/JdbcMetadataDialect.java     |   19 +-
 .../parser/dialect/MySQLMetadataDialect.java    |   10 +-
 .../parser/dialect/OracleMetadataDialect.java   |   42 +-
 .../ignite/schema/ui/ConfirmCallable.java       |   14 +-
 .../org/apache/ignite/schema/ui/Controls.java   |   63 +-
 .../org/apache/ignite/schema/ui/GridPaneEx.java |   13 +-
 .../org/apache/ignite/schema/ui/MessageBox.java |   35 +-
 .../apache/ignite/schema/ui/ModalDialog.java    |    4 +-
 .../ignite/schema/ui/SchemaImportApp.java       |  119 +-
 .../ignite/schema/ui/TextColumnValidator.java   |    2 +-
 .../schema/test/AbstractSchemaImportTest.java   |   32 +-
 .../test/generator/CodeGeneratorTest.java       |    7 +-
 .../schema/test/generator/XmlGeneratorTest.java |   14 +-
 .../test/parser/DbMetadataParserTest.java       |   17 +-
 .../testsuites/IgniteSchemaImportTestSuite.java |    9 +-
 .../apache/ignite/logger/slf4j/Slf4jLogger.java |    9 +-
 .../ignite/spark/JavaIgniteRDDSelfTest.java     |   36 +-
 .../java/org/apache/ignite/IgniteSpring.java    |   15 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   40 +-
 .../apache/ignite/cache/spring/SpringCache.java |    8 +-
 .../ignite/cache/spring/SpringCacheManager.java |   21 +-
 .../spring/CacheSpringStoreSessionListener.java |   33 +-
 .../GridResourceSpringBeanInjector.java         |   17 +-
 .../resource/GridSpringResourceContextImpl.java |   10 +-
 .../util/spring/IgniteSpringHelperImpl.java     |   59 +-
 .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java |   27 +-
 .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java |   26 +-
 ...CacheSpringStoreSessionListenerSelfTest.java |   36 +-
 .../ignite/internal/GridFactorySelfTest.java    |   92 +-
 .../GridSpringBeanSerializationSelfTest.java    |   21 +-
 .../internal/IgniteDynamicCacheConfigTest.java  |   20 +-
 .../apache/ignite/internal/TestNodeFilter.java  |    6 +-
 .../resource/GridLoggerInjectionSelfTest.java   |   21 +-
 .../resource/GridResourceProcessorSelfTest.java |   41 +-
 .../resource/GridResourceTestUtils.java         |    4 +-
 .../resource/GridServiceInjectionSelfTest.java  |   16 +-
 .../processors/resource/TestClosure.java        |   12 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |   50 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |   19 +-
 .../ignite/spring/GridSpringCacheTestKey.java   |    4 +-
 .../spring/GridSpringCacheTestKeyGenerator.java |    7 +-
 .../spring/GridSpringCacheTestService.java      |    9 +-
 .../GridSpringDynamicCacheTestService.java      |    9 +-
 .../IgniteExcludeInConfigurationTest.java       |   21 +-
 .../IgniteStartFromStreamConfigurationTest.java |   18 +-
 .../testsuites/IgniteResourceSelfTestSuite.java |    8 +-
 .../testsuites/IgniteSpringTestSuite.java       |   19 +-
 .../util/nodestart/IgniteSshHelperImpl.java     |    2 +-
 .../util/nodestart/StartNodeCallableImpl.java   |   39 +-
 .../internal/IgniteNodeStartUtilsSelfTest.java  |   25 +-
 ...gniteProjectionStartStopRestartSelfTest.java |   62 +-
 .../IgniteStartStopRestartTestSuite.java        |    3 +-
 .../ant/beautifier/GridJavadocAntTask.java      |   29 +-
 .../GridJavadocCharArrayLexReader.java          |    2 +-
 .../tools/ant/beautifier/GridJavadocToken.java  |    2 +-
 .../ant/beautifier/GridJavadocTokenType.java    |    2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |   27 +-
 .../ignite/tools/javadoc/IgniteLinkTaglet.java  |   11 +-
 .../util/antgar/IgniteDeploymentGarAntTask.java |   15 +-
 .../uri/GridUriDeploymentClassLoader.java       |   15 +-
 .../GridUriDeploymentClassLoaderFactory.java    |   16 +-
 .../uri/GridUriDeploymentDiscovery.java         |   18 +-
 .../uri/GridUriDeploymentFileProcessor.java     |   42 +-
 .../GridUriDeploymentFileProcessorResult.java   |   11 +-
 .../GridUriDeploymentFileResourceLoader.java    |    9 +-
 .../uri/GridUriDeploymentJarVerifier.java       |   26 +-
 .../uri/GridUriDeploymentSpringDocument.java    |   17 +-
 .../uri/GridUriDeploymentSpringParser.java      |   20 +-
 .../uri/GridUriDeploymentUnitDescriptor.java    |   28 +-
 .../uri/GridUriDeploymentUriParser.java         |    6 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |   68 +-
 .../deployment/uri/UriDeploymentSpiMBean.java   |    9 +-
 .../uri/scanners/GridDeploymentFileHandler.java |    4 +-
 .../GridDeploymentFolderScannerHelper.java      |    5 +-
 .../GridUriDeploymentScannerListener.java       |    7 +-
 .../uri/scanners/UriDeploymentScanner.java      |    4 +-
 .../scanners/UriDeploymentScannerContext.java   |   12 +-
 .../scanners/UriDeploymentScannerManager.java   |   18 +-
 .../scanners/file/UriDeploymentFileScanner.java |   32 +-
 .../scanners/http/UriDeploymentHttpScanner.java |   58 +-
 .../GridTaskUriDeploymentDeadlockSelfTest.java  |   32 +-
 .../ignite/p2p/GridP2PDisabledSelfTest.java     |   24 +-
 .../uri/GridUriDeploymentAbstractSelfTest.java  |   10 +-
 ...loymentClassLoaderMultiThreadedSelfTest.java |   15 +-
 .../GridUriDeploymentClassLoaderSelfTest.java   |   17 +-
 ...riDeploymentClassloaderRegisterSelfTest.java |   29 +-
 .../uri/GridUriDeploymentConfigSelfTest.java    |    8 +-
 .../GridUriDeploymentFileProcessorSelfTest.java |   19 +-
 .../uri/GridUriDeploymentMd5CheckSelfTest.java  |   21 +-
 ...loymentMultiScannersErrorThrottlingTest.java |   11 +-
 .../GridUriDeploymentMultiScannersSelfTest.java |   13 +-
 .../uri/GridUriDeploymentSimpleSelfTest.java    |   27 +-
 .../file/GridFileDeploymentSelfTest.java        |   14 +-
 .../GridFileDeploymentUndeploySelfTest.java     |   19 +-
 .../http/GridHttpDeploymentSelfTest.java        |   29 +-
 .../testsuites/IgniteToolsSelfTestSuite.java    |    6 +-
 .../IgniteUriDeploymentTestSuite.java           |   20 +-
 .../apache/ignite/tools/GridToolsSelfTest.java  |   23 +-
 .../visor/plugin/VisorExtensionPoint.java       |    4 +-
 .../ignite/visor/plugin/VisorPluggableTab.java  |    5 +-
 .../apache/ignite/visor/plugin/VisorPlugin.java |    6 +-
 .../visor/plugin/VisorPluginComponent.java      |    4 +-
 .../plugin/VisorPluginComponentsFactory.java    |    6 +-
 .../visor/plugin/VisorPluginLogPanel.java       |    2 +-
 .../ignite/visor/plugin/VisorPluginModel.java   |   12 +-
 .../visor/plugin/VisorPluginNodesPanel.java     |    5 +-
 .../visor/plugin/VisorSelectionListener.java    |    4 +-
 .../visor/plugin/VisorTopologyListener.java     |    4 +-
 .../ignite/cache/websession/WebSession.java     |   30 +-
 .../cache/websession/WebSessionFilter.java      |   64 +-
 .../cache/websession/WebSessionListener.java    |   36 +-
 .../servlet/ServletContextListenerStartup.java  |   32 +-
 .../ignite/startup/servlet/ServletStartup.java  |   28 +-
 .../IgniteWebSessionSelfTestSuite.java          |    8 +-
 .../internal/websession/WebSessionSelfTest.java |   46 +-
 .../websession/WebSessionServerStart.java       |   22 +-
 .../internal/websession/WebSessionTest.java     |   11 +-
 modules/yardstick/README.txt                    |    2 +-
 .../yardstick/IgniteAbstractBenchmark.java      |   25 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   10 +-
 .../org/apache/ignite/yardstick/IgniteNode.java |   40 +-
 .../cache/IgniteCacheAbstractBenchmark.java     |    6 +-
 .../yardstick/cache/IgniteGetBenchmark.java     |    7 +-
 .../cache/IgniteGetOffHeapBenchmark.java        |    6 +-
 .../cache/IgniteGetOffHeapValuesBenchmark.java  |    6 +-
 .../cache/IgniteJdbcSqlQueryBenchmark.java      |   21 +-
 .../yardstick/cache/IgnitePutAllBenchmark.java  |   15 +-
 .../cache/IgnitePutAllTxBenchmark.java          |   15 +-
 .../yardstick/cache/IgnitePutBenchmark.java     |    9 +-
 .../yardstick/cache/IgnitePutGetBenchmark.java  |    9 +-
 .../cache/IgnitePutGetOffHeapBenchmark.java     |    6 +-
 .../IgnitePutGetOffHeapValuesBenchmark.java     |    6 +-
 .../cache/IgnitePutGetTxBenchmark.java          |   11 +-
 .../cache/IgnitePutGetTxOffHeapBenchmark.java   |    6 +-
 .../IgnitePutGetTxOffHeapValuesBenchmark.java   |    6 +-
 .../cache/IgnitePutIndexedValue1Benchmark.java  |    9 +-
 .../cache/IgnitePutIndexedValue2Benchmark.java  |    9 +-
 .../cache/IgnitePutIndexedValue8Benchmark.java  |    9 +-
 .../cache/IgnitePutOffHeapBenchmark.java        |    6 +-
 .../cache/IgnitePutOffHeapValuesBenchmark.java  |    6 +-
 .../yardstick/cache/IgnitePutTxBenchmark.java   |    9 +-
 .../cache/IgnitePutTxOffHeapBenchmark.java      |    6 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java      |    6 +-
 .../cache/IgniteSqlQueryBenchmark.java          |   23 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |   23 +-
 .../IgniteSqlQueryJoinOffHeapBenchmark.java     |    6 +-
 .../cache/IgniteSqlQueryOffHeapBenchmark.java   |    6 +-
 .../cache/IgniteSqlQueryPutBenchmark.java       |   18 +-
 .../IgniteSqlQueryPutOffHeapBenchmark.java      |    6 +-
 .../yardstick/cache/model/Organization.java     |   10 +-
 .../ignite/yardstick/cache/model/Person.java    |   10 +-
 .../ignite/yardstick/cache/model/Person1.java   |    7 +-
 .../ignite/yardstick/cache/model/Person2.java   |    7 +-
 .../ignite/yardstick/cache/model/Person8.java   |    7 +-
 .../ignite/yardstick/cache/model/SampleKey.java |    7 +-
 .../yardstick/cache/model/SampleValue.java      |    7 +-
 .../jdbc/IgniteJdbcStoreAbstractBenchmark.java  |   20 +-
 .../store/jdbc/IgniteJdbcStoreGetBenchmark.java |    9 +-
 .../jdbc/IgniteJdbcStoreGetTxBenchmark.java     |    9 +-
 .../store/jdbc/IgniteJdbcStorePutBenchmark.java |   10 +-
 .../jdbc/IgniteJdbcStorePutGetBenchmark.java    |   10 +-
 .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java  |   10 +-
 .../jdbc/IgniteJdbcStorePutTxBenchmark.java     |   10 +-
 .../compute/IgniteAffinityCallBenchmark.java    |   11 +-
 .../yardstick/compute/IgniteApplyBenchmark.java |   18 +-
 .../compute/IgniteBroadcastBenchmark.java       |    9 +-
 .../compute/IgniteExecuteBenchmark.java         |    9 +-
 .../yardstick/compute/IgniteRunBenchmark.java   |   18 +-
 .../yardstick/compute/model/NoopCallable.java   |   10 +-
 .../yardstick/compute/model/NoopTask.java       |   21 +-
 .../apache/ignite/yarn/ApplicationMaster.java   |   45 +-
 .../apache/ignite/yarn/ClusterProperties.java   |   15 +-
 .../org/apache/ignite/yarn/IgniteContainer.java |    5 +-
 .../org/apache/ignite/yarn/IgniteProvider.java  |   24 +-
 .../apache/ignite/yarn/IgniteYarnClient.java    |   39 +-
 .../ignite/yarn/utils/IgniteYarnUtils.java      |   15 +-
 .../org/apache/ignite/IgniteYarnTestSuite.java  |    6 +-
 .../yarn/IgniteApplicationMasterSelfTest.java   |   52 +-
 .../zk/TcpDiscoveryZookeeperIpFinder.java       |   48 +-
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |   31 +-
 parent/pom.xml                                  |   18 +-
 4585 files changed, 64444 insertions(+), 39158 deletions(-)
----------------------------------------------------------------------



[09/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
index 3a8e6dc..596d93f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
@@ -17,20 +17,27 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.StringTokenizer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
 
 /**
  * Shared filesystem-based IP finder.
@@ -263,4 +270,4 @@ public class TcpDiscoverySharedFsIpFinder extends TcpDiscoveryIpFinderAdapter {
     @Override public String toString() {
         return S.toString(TcpDiscoverySharedFsIpFinder.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
index 2babf83..94c237f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
@@ -17,18 +17,23 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.vm;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_TCP_DISCOVERY_ADDRESSES;
 
 /**
  * IP Finder which works only with pre-configured list of IP addresses specified
@@ -259,4 +264,4 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
     @Override public String toString() {
         return S.toString(TcpDiscoveryVmIpFinder.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
index 6f52152..c50f791 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Base class to implement discovery messages.
@@ -244,4 +244,4 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable {
     @Override public String toString() {
         return S.toString(TcpDiscoveryAbstractMessage.class, this, "isClient", getFlag(CLIENT_FLAG_POS));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
index 0eb3df0..d563fbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.InetAddress;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Message telling joining node that its authentication failed on coordinator.
@@ -74,4 +76,4 @@ public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryAuthFailedMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
index 0905c58..ae970ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Message telling joining node that it failed coordinator's validation check.
@@ -54,4 +53,4 @@ public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage
     @Override public String toString() {
         return S.toString(TcpDiscoveryCheckFailedMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
index ce3943a..0376d04 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  *
@@ -61,4 +61,4 @@ public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientAckResponse.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
index 95ac340..37b578c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Heartbeat message.
@@ -64,4 +63,4 @@ public class TcpDiscoveryClientHeartbeatMessage extends TcpDiscoveryAbstractMess
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientHeartbeatMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
index f9f164d..c1b0d61 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
@@ -53,4 +52,4 @@ public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientPingRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
----------------------------------------------------------------------
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 26a2b00..00a9b43 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
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
@@ -64,4 +63,4 @@ public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientPingResponse.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
index 86aee1a..c232e6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Message telling that client node is reconnecting to topology.
@@ -98,4 +98,4 @@ public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMess
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientReconnectMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
index c7e99c8..a152936 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 
 /**
  * Message used to check whether a node is still connected to the topology.
@@ -61,4 +63,4 @@ public class TcpDiscoveryConnectionCheckMessage extends TcpDiscoveryAbstractMess
     @Override public String toString() {
         return S.toString(TcpDiscoveryConnectionCheckMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index 0739c1d..8f14459 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.spi.discovery.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapped for custom message.
@@ -86,4 +87,4 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
     @Override public String toString() {
         return S.toString(TcpDiscoveryCustomEventMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
index 9510b9e..1e1fa6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Message sent by coordinator when some operation handling is over. All receiving
@@ -58,4 +57,4 @@ public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryDiscardMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
index 978acb2..63c3af1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 
 /**
  * Message telling joining node that new topology already contain
@@ -58,4 +57,4 @@ public class TcpDiscoveryDuplicateIdMessage extends TcpDiscoveryAbstractMessage
     @Override public String toString() {
         return S.toString(TcpDiscoveryDuplicateIdMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryEnsureDelivery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryEnsureDelivery.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryEnsureDelivery.java
index e2aff7a..1bbc0cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryEnsureDelivery.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryEnsureDelivery.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Message classes with this annotation attached are processed in a special way to
@@ -28,4 +32,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface TcpDiscoveryEnsureDelivery {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
index 99f919b..ea5b868 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Handshake request.
@@ -41,4 +40,4 @@ public class TcpDiscoveryHandshakeRequest extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryHandshakeRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
index ac4be50..0d350af 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Handshake response.
@@ -79,4 +78,4 @@ public class TcpDiscoveryHandshakeResponse extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryHandshakeResponse.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
index f721401..338e3f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
@@ -17,15 +17,25 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Heartbeat message.
@@ -320,4 +330,4 @@ public class TcpDiscoveryHeartbeatMessage extends TcpDiscoveryAbstractMessage {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
----------------------------------------------------------------------
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 5fd99b2..2586a8b 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
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 
 /**
  * Initial message sent by a node that wants to enter topology.
@@ -83,4 +82,4 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage
     @Override public String toString() {
         return S.toString(TcpDiscoveryJoinRequestMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
index c8bed37..8c84112 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Message telling joining node that it has loopback problem (misconfiguration).
@@ -68,4 +68,4 @@ public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMess
     @Override public String toString() {
         return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
index 1d974e1..c6a469f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Sent by coordinator across the ring to finish node add process.
@@ -101,4 +101,4 @@ public class TcpDiscoveryNodeAddFinishedMessage extends TcpDiscoveryAbstractMess
     @Override public String toString() {
         return S.toString(TcpDiscoveryNodeAddFinishedMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index 2a14158..01c6789 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message telling nodes that new node should be added to topology.
@@ -205,4 +207,4 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryNodeAddedMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
index 93ecdaa..626bcbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Sent by node that has detected node failure to coordinator across the ring,
@@ -92,4 +91,4 @@ public class TcpDiscoveryNodeFailedMessage extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryNodeFailedMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
index 3c2a7ad..cbc92ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Sent by node that is stopping to coordinator across the ring,
@@ -44,4 +43,4 @@ public class TcpDiscoveryNodeLeftMessage extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryNodeLeftMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
index f17c91b..ae6c62a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
@@ -53,4 +52,4 @@ public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryPingRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
index 02b2d48..f2f0dda 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Ping response.
@@ -56,4 +55,4 @@ public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage {
     @Override public String toString() {
         return S.toString(TcpDiscoveryPingResponse.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRedirectToClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRedirectToClient.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRedirectToClient.java
index cdb0f16..0ad4b9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRedirectToClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRedirectToClient.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Message classes with this annotation attached will be
@@ -28,4 +32,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface TcpDiscoveryRedirectToClient {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
index bec7093..6118f4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.discovery.tcp.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 
 /**
  * Message sent by node to its next to ensure that next node and
@@ -102,4 +101,4 @@ public class TcpDiscoveryStatusCheckMessage extends TcpDiscoveryAbstractMessage
     @Override public String toString() {
         return S.toString(TcpDiscoveryStatusCheckMessage.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
----------------------------------------------------------------------
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 f39ebc5..669b28b 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
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.spi.eventstorage;
 
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
 
 /**
  * This SPI provides local node events storage. SPI allows for recording local
@@ -62,4 +62,4 @@ public interface EventStorageSpi extends IgniteSpi {
      * @throws org.apache.ignite.spi.IgniteSpiException If event recording failed for any reason.
      */
     public void record(Event evt) throws IgniteSpiException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
index 46029a9..0636e71 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
@@ -17,19 +17,23 @@
 
 package org.apache.ignite.spi.eventstorage.memory;
 
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.jsr166.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.eventstorage.EventStorageSpi;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  * In-memory {@link org.apache.ignite.spi.eventstorage.EventStorageSpi} implementation. All events are
@@ -277,4 +281,4 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor
     @Override public String toString() {
         return S.toString(MemoryEventStorageSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
index b5f8dff..601654f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.eventstorage.memory;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link MemoryEventStorageSpi}.
@@ -62,4 +62,4 @@ public interface MemoryEventStorageSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Removes all events from the event queue.")
     public void clearAll();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverContext.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverContext.java
index 865f1a2..1108ad1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverContext.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.spi.failover;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface defines a set of operations available to failover SPI
@@ -70,4 +72,4 @@ public interface FailoverContext {
      * @return Cache name.
      */
     @Nullable public String affinityCacheName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
index ee45fcc..24151f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.failover;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.spi.IgniteSpi;
 
 /**
  * Failover SPI provides developer with ability to supply custom logic for handling
@@ -65,4 +64,4 @@ public interface FailoverSpi extends IgniteSpi {
      *      If job failover fails (returns {@code null}) the whole task will be failed.
      */
     public ClusterNode failover(FailoverContext ctx, List<ClusterNode> top);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
index e925995..1960077 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
@@ -17,15 +17,26 @@
 
 package org.apache.ignite.spi.failover.always;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.failover.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.FailoverSpi;
 
 /**
  * Failover SPI that always reroutes a failed job to another node.
@@ -267,4 +278,4 @@ public class AlwaysFailoverSpi extends IgniteSpiAdapter implements FailoverSpi,
     @Override public String toString() {
         return S.toString(AlwaysFailoverSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
index 394415d..b97ce98 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.failover.always;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link AlwaysFailoverSpi}.
@@ -41,4 +41,4 @@ public interface AlwaysFailoverSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Total number of jobs that were failed over.")
     public int getTotalFailoverJobsCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
index eef1f28..c44187d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
@@ -17,17 +17,28 @@
 
 package org.apache.ignite.spi.failover.jobstealing;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.failover.*;
-
-import java.util.*;
-
-import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.FailoverSpi;
+
+import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.THIEF_NODE_ATTR;
 
 /**
  * Job stealing failover SPI needs to always be used in conjunction with
@@ -347,4 +358,4 @@ public class JobStealingFailoverSpi extends IgniteSpiAdapter implements Failover
     @Override public String toString() {
         return S.toString(JobStealingFailoverSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
index ae40bfa..c362231 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.failover.jobstealing;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link JobStealingFailoverSpi}.
@@ -51,4 +51,4 @@ public interface JobStealingFailoverSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Total number of jobs that were stolen.")
     public int getTotalStolenJobsCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
index 68a24df..4840223 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.spi.failover.never;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.failover.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.FailoverSpi;
 
 /**
  * This class provides failover SPI implementation that never fails over. This implementation
@@ -100,4 +103,4 @@ public class NeverFailoverSpi extends IgniteSpiAdapter implements FailoverSpi, N
     @Override public String toString() {
         return S.toString(NeverFailoverSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
index 5d675fe..ec64542 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.failover.never;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link NeverFailoverSpi}.
@@ -26,4 +26,4 @@ import org.apache.ignite.spi.*;
 @MXBeanDescription("MBean that provides access to never failover SPI configuration.")
 public interface NeverFailoverSpiMBean extends IgniteSpiManagementMBean {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
index 78ef4ab..3ba36e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.indexing;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache entry filter.
@@ -31,4 +31,4 @@ public interface IndexingQueryFilter {
      * @return Predicate or {@code null} if no filtering is needed.
      */
     @Nullable public <K, V> IgniteBiPredicate<K, V> forSpace(@Nullable String spaceName);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
index 15c6fe4..b72c846 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.spi.indexing;
 
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.cache.Cache;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Indexing SPI allows user to index cache content. Using indexing SPI user can index data in cache and run
@@ -110,4 +111,4 @@ public interface IndexingSpi extends IgniteSpi {
      * @throws IgniteSpiException If failed.
      */
     public void onUnswap(@Nullable String spaceName, Object key, Object val) throws IgniteSpiException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
index 83684ba..cbcf429 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.spi.indexing.noop;
 
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.indexing.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.cache.Cache;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.spi.indexing.IndexingQueryFilter;
+import org.apache.ignite.spi.indexing.IndexingSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Default implementation of {@link IndexingSpi} which does not index cache.
@@ -65,4 +68,4 @@ public class NoopIndexingSpi extends IgniteSpiAdapter implements IndexingSpi {
     @Override public void spiStop() throws IgniteSpiException {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
index c02f133..6431fab 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.spi.loadbalancing;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.spi.IgniteSpi;
 
 /**
  * Load balancing SPI provides the next best balanced node for job
@@ -119,4 +119,4 @@ public interface LoadBalancingSpi extends IgniteSpi {
      * @return Best balanced node for the given job within given task session.
      */
     public ClusterNode getBalancedNode(ComputeTaskSession ses, List<ClusterNode> top, ComputeJob job) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
index 63eb9b5..00b6e67 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
@@ -17,8 +17,10 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Implementation of node load probing based on CPU load.
@@ -234,4 +236,4 @@ public class AdaptiveCpuLoadProbe implements AdaptiveLoadProbe {
     @Override public String toString() {
         return S.toString(AdaptiveCpuLoadProbe.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
index bc272f7..319d221 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Implementation of node load probing based on active and waiting job count.
@@ -101,4 +102,4 @@ public class AdaptiveJobCountLoadProbe implements AdaptiveLoadProbe {
     @Override public String toString() {
         return S.toString(AdaptiveJobCountLoadProbe.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
index 8d4d41a..1bc4b0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
@@ -17,26 +17,51 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 
 /**
  * Load balancing SPI that adapts to overall node performance. It
@@ -584,4 +609,4 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa
     @Override public String toString() {
         return S.toString(AdaptiveLoadBalancingSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
index a933bf2..37cc4a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management MBean for {@link AdaptiveLoadBalancingSpi} SPI.
@@ -32,4 +32,4 @@ public interface AdaptiveLoadBalancingSpiMBean extends IgniteSpiManagementMBean
      */
     @MXBeanDescription("Text description of current load probing implementation used.")
     public String getLoadProbeFormatted();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
index 7ac214f..eb23d97 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Pluggable implementation of node load probing. Implementations
@@ -95,4 +95,4 @@ public interface AdaptiveLoadProbe {
      * @return Non-negative load value for the node (zero and above).
      */
     public double getLoad(ClusterNode node, int jobsSentSinceLastUpdate);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
index 44a75ea..535c168 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Implementation of node load probing based on total job processing time.
@@ -103,4 +104,4 @@ public class AdaptiveProcessingTimeLoadProbe implements AdaptiveLoadProbe {
     @Override public String toString() {
         return S.toString(AdaptiveProcessingTimeLoadProbe.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
index a47a17f..c48b819 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
@@ -17,19 +17,30 @@
 
 package org.apache.ignite.spi.loadbalancing.roundrobin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.IgniteSpiContext;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 
 /**
  * Load balancer that works in global (not-per-task) mode.
@@ -311,4 +322,4 @@ class RoundRobinGlobalLoadBalancer {
     @Override public String toString() {
         return S.toString(RoundRobinGlobalLoadBalancer.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
index 6ae9e99..4784ee4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
@@ -17,22 +17,36 @@
 
 package org.apache.ignite.spi.loadbalancing.roundrobin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 
 /**
  * This SPI iterates through nodes in round-robin fashion and pick the next
@@ -322,4 +336,4 @@ public class RoundRobinLoadBalancingSpi extends IgniteSpiAdapter implements Load
     @Override public String toString() {
         return S.toString(RoundRobinLoadBalancingSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
index 6512c95..28eb073 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.loadbalancing.roundrobin;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link RoundRobinLoadBalancingSpi} SPI.
@@ -42,4 +42,4 @@ public interface RoundRobinLoadBalancingSpiMBean extends IgniteSpiManagementMBea
      */
     @MXBeanDescription("Configuration parameter indicating whether a new round robin order should be created for every task.")
     public boolean isPerTask();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinPerTaskLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinPerTaskLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinPerTaskLoadBalancer.java
index 2e00582..59f1717 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinPerTaskLoadBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinPerTaskLoadBalancer.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.spi.loadbalancing.roundrobin;
 
-import org.apache.ignite.cluster.*;
-
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Load balancer for per-task configuration.
@@ -101,4 +103,4 @@ class RoundRobinPerTaskLoadBalancer {
             return Collections.unmodifiableList(new ArrayList<>(nodeQueue));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
index 6fcce26..ec4708f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
@@ -17,24 +17,41 @@
 
 package org.apache.ignite.spi.loadbalancing.weightedrandom;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 
 /**
  * Load balancing SPI that picks a random node for job execution. Note that you can
@@ -399,4 +416,4 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements
     @Override public String toString() {
         return S.toString(WeightedRandomLoadBalancingSpi.class, this);
     }
-}
+}
\ No newline at end of file


[40/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionInternal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionInternal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionInternal.java
index ea3be2d..7d371e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionInternal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionInternal.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Internal task session interface.
@@ -66,4 +65,4 @@ public interface GridTaskSessionInternal extends ComputeTaskSession {
      * @return Subject ID.
      */
     public UUID subjectId();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
index 42e1506..02d17db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Task session request.
@@ -183,4 +184,4 @@ public class GridTaskSessionRequest implements Message {
     @Override public String toString() {
         return S.toString(GridTaskSessionRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 ba3b8b2..fbf2b18 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
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.charset.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Communication topic.
@@ -756,4 +760,4 @@ public enum GridTopic {
             return S.toString(T8.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
index dc22128..448f87b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
@@ -17,22 +17,40 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-import javax.xml.parsers.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.net.URLEncoder.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.plugin.PluginProvider;
+import org.jetbrains.annotations.Nullable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
+import static java.net.URLEncoder.encode;
 
 /**
  * This class is responsible for notification about new version availability.
@@ -401,4 +419,4 @@ class GridUpdateNotifier {
             return obtainMeta("downloadUrl", node);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteClientDisconnectedCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClientDisconnectedCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClientDisconnectedCheckedException.java
index e58530d..e9079f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClientDisconnectedCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClientDisconnectedCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  *
@@ -46,4 +46,4 @@ public class IgniteClientDisconnectedCheckedException extends IgniteCheckedExcep
     public IgniteFuture<?> reconnectFuture() {
         return reconnectFut;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteCodeGeneratingFail.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteCodeGeneratingFail.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteCodeGeneratingFail.java
index 8c4ce2e..e682139 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteCodeGeneratingFail.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteCodeGeneratingFail.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates fields that code generator should not be override.
@@ -26,4 +29,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface IgniteCodeGeneratingFail {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
index 4b937b1..01872b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Component type.
@@ -314,4 +313,4 @@ public enum IgniteComponentType {
         return new IgniteCheckedException("Failed to create Ignite component (consider adding " + module +
             " module to classpath) [component=" + this + ", cls=" + clsName + ']', err);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
index 85fefa5..d6e9a8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
@@ -17,21 +17,41 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.GridClosureCallMode.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteDeploymentException;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
+import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBJ_ID;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TASK_NAME;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TIMEOUT;
 
 /**
  * {@link IgniteCompute} implementation.
@@ -561,4 +581,4 @@ public class IgniteComputeImpl extends AsyncSupportAdapter<IgniteCompute>
     @Override public <R> ComputeTaskFuture<R> future() {
         return (ComputeTaskFuture<R>)super.future();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteDeploymentCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDeploymentCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDeploymentCheckedException.java
index 03450f1..d08d3c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDeploymentCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDeploymentCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Deployment or re-deployment failed.
@@ -55,4 +55,4 @@ public class IgniteDeploymentCheckedException extends IgniteCheckedException {
     public IgniteDeploymentCheckedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
index c27be6b..505bc9d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteEvents;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link IgniteEvents} implementation.
@@ -306,4 +314,4 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen
     protected Object readResolve() throws ObjectStreamException {
         return prj.events();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index ef733cf..e3859c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.cluster.IgniteClusterEx;
+import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.hadoop.Hadoop;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extended Grid interface which provides some additional methods required for kernal and Visor.
@@ -140,4 +140,4 @@ public interface IgniteEx extends Ignite {
      * @return Kernal context.
      */
     public GridKernalContext context();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureCancelledCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureCancelledCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureCancelledCheckedException.java
index da2f738..5058869 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureCancelledCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureCancelledCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future computation cannot be retrieved because it was cancelled.
@@ -55,4 +55,4 @@ public class IgniteFutureCancelledCheckedException extends IgniteCheckedExceptio
     public IgniteFutureCancelledCheckedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureTimeoutCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureTimeoutCheckedException.java
index 1697577..de9fd59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureTimeoutCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteFutureTimeoutCheckedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future computation completion is timed out.
@@ -55,4 +55,4 @@ public class IgniteFutureTimeoutCheckedException extends IgniteCheckedException
     public IgniteFutureTimeoutCheckedException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
index 74cfb06..b80a755 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Extension for standard {@link Future} interface. It adds simplified exception handling,
@@ -140,4 +141,4 @@ public interface IgniteInternalFuture<R> {
      * @return Result value if future has already been completed normally.
      */
     public R result();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteInterruptedCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInterruptedCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInterruptedCheckedException.java
index 282217d..556d39c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInterruptedCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInterruptedCheckedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * This exception is used to wrap standard {@link InterruptedException} into {@link IgniteCheckedException}.
@@ -55,4 +55,4 @@ public class IgniteInterruptedCheckedException extends IgniteCheckedException {
     public IgniteInterruptedCheckedException(String msg, InterruptedException cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
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 1db73bf..4ff38c7 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
@@ -17,80 +17,203 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.internal.managers.collision.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.managers.failover.*;
-import org.apache.ignite.internal.managers.indexing.*;
-import org.apache.ignite.internal.managers.loadbalancer.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.clock.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.processors.cluster.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.processors.job.*;
-import org.apache.ignite.internal.processors.jobmetrics.*;
-import org.apache.ignite.internal.processors.nodevalidation.*;
-import org.apache.ignite.internal.processors.offheap.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.processors.port.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.processors.segmentation.*;
-import org.apache.ignite.internal.processors.service.*;
-import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import javax.management.*;
-import java.io.*;
-import java.lang.management.*;
-import java.lang.reflect.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.GridKernalState.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
-import static org.apache.ignite.lifecycle.LifecycleEventType.*;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.Constructor;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.management.JMException;
+import javax.management.ObjectName;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteAtomicReference;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteCountDownLatch;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteEvents;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.IgniteServices;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.cluster.IgniteClusterEx;
+import org.apache.ignite.internal.managers.GridManager;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
+import org.apache.ignite.internal.managers.collision.GridCollisionManager;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.failover.GridFailoverManager;
+import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
+import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessor;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
+import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
+import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
+import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor;
+import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
+import org.apache.ignite.internal.processors.hadoop.Hadoop;
+import org.apache.ignite.internal.processors.job.GridJobProcessor;
+import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
+import org.apache.ignite.internal.processors.nodevalidation.OsDiscoveryNodeValidationProcessor;
+import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
+import org.apache.ignite.internal.processors.platform.PlatformNoopProcessor;
+import org.apache.ignite.internal.processors.platform.PlatformProcessor;
+import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
+import org.apache.ignite.internal.processors.port.GridPortProcessor;
+import org.apache.ignite.internal.processors.port.GridPortRecord;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
+import org.apache.ignite.internal.processors.rest.GridRestProcessor;
+import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
+import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
+import org.apache.ignite.internal.processors.service.GridServiceProcessor;
+import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
+import org.apache.ignite.internal.processors.task.GridTaskProcessor;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.GridEnumCache;
+import org.apache.ignite.internal.util.GridTimerTask;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
+import org.apache.ignite.mxbean.IgniteMXBean;
+import org.apache.ignite.mxbean.ThreadPoolMXBean;
+import org.apache.ignite.plugin.IgnitePlugin;
+import org.apache.ignite.plugin.PluginNotFoundException;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiVersionCheckException;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_STARVATION_CHECK_INTERVAL;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER;
+import static org.apache.ignite.IgniteSystemProperties.getBoolean;
+import static org.apache.ignite.IgniteSystemProperties.snapshot;
+import static org.apache.ignite.internal.GridKernalState.DISCONNECTED;
+import static org.apache.ignite.internal.GridKernalState.STARTED;
+import static org.apache.ignite.internal.GridKernalState.STARTING;
+import static org.apache.ignite.internal.GridKernalState.STOPPED;
+import static org.apache.ignite.internal.GridKernalState.STOPPING;
+import static org.apache.ignite.internal.IgniteComponentType.IGFS;
+import static org.apache.ignite.internal.IgniteComponentType.IGFS_HELPER;
+import static org.apache.ignite.internal.IgniteComponentType.SCHEDULE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_DATE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CLIENT_MODE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CONSISTENCY_CHECK_SKIPPED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_GRID_NAME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JIT_NAME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JMX_PORT;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_ARGS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_PID;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_LANG_RUNTIME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTENT_ID;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PEER_CLASSLOADING;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PHY_RAM;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PREFIX;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_RESTART_ENABLED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_PORT_RANGE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
+import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
+import static org.apache.ignite.internal.IgniteVersionUtils.REV_HASH_STR;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
+import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_START;
+import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_START;
 
 /**
  * Ignite kernal.
@@ -3066,4 +3189,4 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
     @Override public String toString() {
         return S.toString(IgniteKernal.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
index d6643a8..17c06fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
@@ -17,17 +17,24 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link IgniteMessaging} implementation.
@@ -242,4 +249,4 @@ public class IgniteMessagingImpl extends AsyncSupportAdapter<IgniteMessaging>
     protected Object readResolve() throws ObjectStreamException {
         return prj.message();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
index 10b8df0..300cc64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@ -141,4 +141,4 @@ public final class IgniteNodeAttributes {
     private IgniteNodeAttributes() {
         /* No-op. */
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
index 74c0ce4..3ea1bfb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 /**
  * Ignite properties holder.
@@ -76,4 +77,4 @@ public class IgniteProperties {
     private IgniteProperties() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
index 60513c2..ed8d1a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.scheduler.*;
-
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.scheduler.SchedulerFuture;
 
 /**
  * {@link IgniteScheduler} implementation.
@@ -139,4 +142,4 @@ public class IgniteSchedulerImpl implements IgniteScheduler, Externalizable {
     private Object readResolve() throws ObjectStreamException {
         return ctx.grid().scheduler();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
index f0f5a70..8f4e0bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
@@ -17,15 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.services.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteServices;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.services.ServiceDescriptor;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link org.apache.ignite.IgniteCompute} implementation.
@@ -281,4 +289,4 @@ public class IgniteServicesImpl extends AsyncSupportAdapter implements IgniteSer
     protected Object readResolve() throws ObjectStreamException {
         return prj.services();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
index 4e60659..9772dcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.transactions.*;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
 
 /**
  * Extended interface to work with system transactions.
@@ -47,4 +48,4 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
      * @return New transaction.
      */
     public IgniteInternalTx txStartEx(GridCacheContext ctx, TransactionConcurrency concurrency, TransactionIsolation isolation);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
index 3c47f23..7f81cb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.lang.*;
-
-import java.text.*;
-import java.util.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.apache.ignite.lang.IgniteProductVersion;
 
 /**
  * Ignite version utils.
@@ -75,4 +74,4 @@ public class IgniteVersionUtils {
     private IgniteVersionUtils() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index cd91fa8..02b28c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -17,61 +17,110 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.spring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.logger.*;
-import org.apache.ignite.logger.java.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.noop.*;
-import org.apache.ignite.spi.collision.noop.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.eventstorage.memory.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.spi.indexing.noop.*;
-import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.spi.swapspace.noop.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.management.*;
-import java.io.*;
-import java.lang.management.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.logging.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.configuration.IgniteConfiguration.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Handler;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteIllegalStateException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteState;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.IgnitionListener;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.configuration.AtomicConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.logger.LoggerNodeIdAware;
+import org.apache.ignite.logger.java.JavaLogger;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.mxbean.IgnitionMXBean;
+import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
+import org.apache.ignite.resources.SpringApplicationContextResource;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi;
+import org.apache.ignite.spi.collision.noop.NoopCollisionSpi;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
+import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.spi.indexing.noop.NoopIndexingSpi;
+import org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi;
+import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.noop.NoopSwapSpaceSpi;
+import org.apache.ignite.thread.IgniteThreadPoolExecutor;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.IgniteState.STARTED;
+import static org.apache.ignite.IgniteState.STOPPED;
+import static org.apache.ignite.IgniteState.STOPPED_ON_SEGMENTATION;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_CLIENT;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DEP_MODE_OVERRIDE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_HOST;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_SHUTDOWN_HOOK;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_RESTART_CODE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_PUBLIC_KEEP_ALIVE_TIME;
+import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_PUBLIC_THREADPOOL_QUEUE_CAP;
+import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SYSTEM_KEEP_ALIVE_TIME;
+import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SYSTEM_MAX_THREAD_CNT;
+import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SYSTEM_THREADPOOL_QUEUE_CAP;
+import static org.apache.ignite.internal.IgniteComponentType.SPRING;
+import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.RESTART_JVM;
 
 /**
  * This class defines a factory for the main Ignite API. It controls Grid life cycle
@@ -2336,4 +2385,4 @@ public class IgnitionEx {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/IgnitionMXBeanAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionMXBeanAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionMXBeanAdapter.java
index 17c8328..0edce70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionMXBeanAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionMXBeanAdapter.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.mxbean.IgnitionMXBean;
 
 /**
  * Management bean that provides access to {@link org.apache.ignite.Ignition}.
@@ -56,4 +57,4 @@ public class IgnitionMXBeanAdapter implements IgnitionMXBean {
     @Override public void restart(boolean cancel) {
         G.restart(cancel);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index 6ef7713..c25da03 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.plugin.PluginProvider;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Marshaller context adapter.
@@ -200,4 +208,4 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
      * @throws IgniteCheckedException In case of error.
      */
     protected abstract String className(int id) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index dc0fd57..52d3b1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -17,16 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
-
-import javax.cache.event.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryListenerException;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheTryPutFailedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.PluginProvider;
 
 /**
  * Marshaller context implementation.
@@ -197,4 +206,4 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/SkipDaemon.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/SkipDaemon.java b/modules/core/src/main/java/org/apache/ignite/internal/SkipDaemon.java
index 5fb2c25..a829c08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/SkipDaemon.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/SkipDaemon.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Lifecycle callbacks will not be called for grid components marked with this annotation.
@@ -26,4 +29,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface SkipDaemon {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
index 0de13e6..8d62e35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.mxbean.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.mxbean.ThreadPoolMXBean;
 
 /**
  * Adapter for {@link org.apache.ignite.mxbean.ThreadPoolMXBean} which delegates all method calls to the underlying
@@ -126,4 +129,4 @@ public class ThreadPoolMXBeanAdapter implements ThreadPoolMXBean {
     @Override public String toString() {
         return S.toString(ThreadPoolMXBeanAdapter.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
index 154f61b..cf4b518 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.client;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
 
 /**
  * Ignite Java client API.
@@ -143,4 +144,4 @@ public interface GridClient extends AutoCloseable {
      * {@code try-with-resources} statement.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java
index cd46d8b..3101c21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java
@@ -32,4 +32,4 @@ public class GridClientAuthenticationException extends GridClientException {
     public GridClientAuthenticationException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
index 707a31b..382141c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * Cache projection flags that specify projection behaviour.
@@ -49,4 +49,4 @@ public enum GridClientCacheFlag {
     public static GridClientCacheFlag fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java
index b4c0022..3db76f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java
@@ -29,4 +29,4 @@ public enum GridClientCacheMode {
 
     /** Partitioned cache. */
     PARTITIONED
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java
index ed0095e..f45fcec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java
@@ -32,4 +32,4 @@ public class GridClientClosedException extends GridClientException {
     public GridClientClosedException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index 02cb428..c907779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.balancer.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A compute projection of grid client. Contains various methods for task execution, full and partial (per node)
@@ -416,4 +417,4 @@ public interface GridClientCompute {
      * Sets keep portables flag for the next task execution in the current thread.
      */
     public GridClientCompute withKeepPortables();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 7fa0dae..2015970 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -17,18 +17,27 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.security.SecurityCredentials;
+import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider;
+import org.apache.ignite.plugin.security.SecurityCredentialsProvider;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Java client configuration.
@@ -841,4 +850,4 @@ public class GridClientConfiguration {
     public boolean isDaemon() {
         return daemon;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
index 73fa06f..b8919b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.client;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 /**
  * A data projection of grid client. Contains various methods for cache operations and metrics retrieval.
@@ -440,4 +443,4 @@ public interface GridClientData {
      * @throws GridClientException In case of error.
      */
     public GridClientData flagsOff(GridClientCacheFlag... flags) throws GridClientException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java
index 53a840f..0ada4bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * Determines which node should be connected when operation on a key is requested.
@@ -36,4 +36,4 @@ public interface GridClientDataAffinity {
      * @return Affinity nodes for the given partition.
      */
     public GridClientNode node(Object key, Collection<? extends GridClientNode> nodes);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
index eaf39f4..322bccd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.balancer.*;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer;
 
 /**
  * Java client data configuration.
@@ -115,4 +116,4 @@ public class GridClientDataConfiguration {
     public void setBalancer(GridClientLoadBalancer balancer) {
         this.balancer = balancer;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java
index 9d2affa..c313e94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Cache metrics used to obtain statistics on cache itself or any of its entries.
@@ -74,4 +74,4 @@ public interface GridClientDataMetrics extends Serializable {
      * @return Number of misses.
      */
     public int misses();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java
index 124f1ef..6678a3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java
@@ -33,4 +33,4 @@ public class GridClientDisconnectedException extends GridClientException {
     public GridClientDisconnectedException(String msg, GridClientException cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java
index a27bff8..aa77394 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Client exception is a common super class of all client exceptions.
@@ -108,4 +108,4 @@ public class GridClientException extends Exception {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java
index 1616d0a..0a1f857 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.impl.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.internal.client.impl.GridClientImpl;
 
 /**
  * Client factory opens and closes clients. It also tracks all currently opened clients as well.
@@ -135,4 +136,4 @@ public class GridClientFactory {
             busyLock.readLock().unlock();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java
index 4f40fae..eb2a985 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Future for asynchronous operations.
@@ -58,4 +58,4 @@ public interface GridClientFuture<R> {
      * @param lsnrs Listeners to be registered.
      */
     public void listen(GridClientFutureListener<R>... lsnrs);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java
index 7314fbd..0715bda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java
@@ -27,4 +27,4 @@ public interface GridClientFutureListener<R> {
      * @param fut Completed future.
      */
     public void onDone(GridClientFuture<R> fut);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java
index a046367..65971f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java
@@ -42,4 +42,4 @@ public class GridClientFutureTimeoutException extends GridClientException {
     public GridClientFutureTimeoutException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java
index cefc287..ecb2ddf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java
@@ -45,4 +45,4 @@ public class GridClientHandshakeException extends GridClientException {
     public byte getStatusCode() {
         return statusCode;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
index 74e612d..be8053b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.client;
 
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Descriptor of remote grid node. Use {@link GridClientCompute#nodes()} to
@@ -117,4 +119,4 @@ public interface GridClientNode {
      *  {@code false} if request may be passed through a router.
      */
     public boolean connectable();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
index 7859ba5..dc9fd92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Node metrics for remote grid node. Metrics can be retrieved via
@@ -521,4 +521,4 @@ public interface GridClientNodeMetrics extends Serializable {
      * @return Received bytes count.
      */
     public long getReceivedBytesCount();
-}
+}
\ No newline at end of file


[48/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/package-info.java
index d90220f..5855994 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates usage of cron-based scheduler.
  */
-package org.apache.ignite.examples.java8.misc.schedule;
+package org.apache.ignite.examples.java8.misc.schedule;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
index d936877..6d46cd0 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
@@ -20,4 +20,4 @@
  * Basic examples for ignite functionality utilizing Java8 lambdas.
  * Use "java8" examples with JDK8 in addition to the "java" examples.
  */
-package org.apache.ignite.examples.java8;
+package org.apache.ignite.examples.java8;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
index f66f9ea..1f0039f 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.examples.java8.streaming;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.stream.*;
-
-import java.util.*;
+import java.util.List;
+import java.util.Random;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.stream.StreamTransformer;
 
 /**
  * Stream random numbers into the streaming cache.
@@ -94,4 +98,4 @@ public class StreamTransformerExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
index 3e161dd..a250d5e 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.examples.java8.streaming;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.stream.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Random;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.stream.StreamVisitor;
 
 /**
  * Stream random numbers into the streaming cache.
@@ -165,4 +169,4 @@ public class StreamVisitorExample {
             this.latest = price;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/package-info.java
index a29e8aa..a3e8734 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates usage of data streamer.
  */
-package org.apache.ignite.examples.java8.streaming;
+package org.apache.ignite.examples.java8.streaming;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
index f2ce6fe..e2e8775 100644
--- a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class BasicExamplesMultiNodeSelfTest extends BasicExamplesSelfTest {
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
index 4c28b76..30e1456 100644
--- a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
@@ -17,9 +17,15 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.*;
-import org.apache.ignite.examples.datastructures.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.ComputeBroadcastExample;
+import org.apache.ignite.examples.computegrid.ComputeCallableExample;
+import org.apache.ignite.examples.computegrid.ComputeClosureExample;
+import org.apache.ignite.examples.computegrid.ComputeReducerExample;
+import org.apache.ignite.examples.computegrid.ComputeRunnableExample;
+import org.apache.ignite.examples.computegrid.ComputeTaskMapExample;
+import org.apache.ignite.examples.computegrid.ComputeTaskSplitExample;
+import org.apache.ignite.examples.datastructures.IgniteExecutorServiceExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Closure examples self test.
@@ -80,4 +86,4 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest {
     public void testTaskSplitExample() throws Exception {
         ComputeTaskSplitExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
index b7734e6..06ceaac 100644
--- a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
@@ -35,4 +35,4 @@ public class CacheExamplesMultiNodeSelfTest extends CacheExamplesSelfTest {
     @Override protected long getTestTimeout() {
         return 10 * 60 * 1000;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
index 526d2cc..79f404a 100644
--- a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
@@ -17,11 +17,23 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.datagrid.*;
-import org.apache.ignite.examples.datagrid.starschema.*;
-import org.apache.ignite.examples.datagrid.store.dummy.*;
-import org.apache.ignite.examples.datastructures.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.datagrid.CacheAffinityExample;
+import org.apache.ignite.examples.datagrid.CacheApiExample;
+import org.apache.ignite.examples.datagrid.CacheContinuousQueryExample;
+import org.apache.ignite.examples.datagrid.CacheDataStreamerExample;
+import org.apache.ignite.examples.datagrid.CachePutGetExample;
+import org.apache.ignite.examples.datagrid.CacheQueryExample;
+import org.apache.ignite.examples.datagrid.CacheTransactionExample;
+import org.apache.ignite.examples.datagrid.starschema.CacheStarSchemaExample;
+import org.apache.ignite.examples.datagrid.store.dummy.CacheDummyStoreExample;
+import org.apache.ignite.examples.datastructures.IgniteAtomicLongExample;
+import org.apache.ignite.examples.datastructures.IgniteAtomicReferenceExample;
+import org.apache.ignite.examples.datastructures.IgniteAtomicSequenceExample;
+import org.apache.ignite.examples.datastructures.IgniteAtomicStampedExample;
+import org.apache.ignite.examples.datastructures.IgniteCountDownLatchExample;
+import org.apache.ignite.examples.datastructures.IgniteQueueExample;
+import org.apache.ignite.examples.datastructures.IgniteSetExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Cache examples self test.
@@ -138,4 +150,4 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest {
     public void testCacheContinuousQueryExample() throws Exception {
         CacheContinuousQueryExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
index e348124..226a573 100644
--- a/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.failover.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.failover.ComputeFailoverExample;
+import org.apache.ignite.examples.computegrid.failover.ComputeFailoverNodeStartup;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Checkpoint examples self test.
@@ -42,4 +43,4 @@ public class CheckpointExamplesSelfTest extends GridAbstractExamplesTest {
     public void testCheckpointExample() throws Exception {
         ComputeFailoverExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/ClusterGroupExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ClusterGroupExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ClusterGroupExampleSelfTest.java
index 81af84a..3746de7 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ClusterGroupExampleSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ClusterGroupExampleSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.cluster.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.cluster.ClusterGroupExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  *
@@ -36,4 +36,4 @@ public class ClusterGroupExampleSelfTest extends GridAbstractExamplesTest {
     public void testComputeClusterGroupsExample() throws Exception {
         ClusterGroupExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
index 8b0d305..f73a74d 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class ContinuationExamplesMultiNodeSelfTest extends ContinuationExamplesS
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
index 2556224..d1cfaf5 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.ComputeFibonacciContinuationExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Continuation example self test.
@@ -30,4 +30,4 @@ public class ContinuationExamplesSelfTest extends GridAbstractExamplesTest {
     public void testContinuationExample() throws Exception {
         ComputeFibonacciContinuationExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
index 2d435f4..e85e281 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class ContinuousMapperExamplesMultiNodeSelfTest extends ContinuationExamp
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
index 0597c4f..2dda7d6 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.ComputeContinuousMapperExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * ContinuousMapperExample self test.
@@ -30,4 +30,4 @@ public class ContinuousMapperExamplesSelfTest extends GridAbstractExamplesTest {
     public void testContinuousMapperExample() throws Exception {
         ComputeContinuousMapperExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
index 7011a9b..73b7e4c 100644
--- a/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
@@ -27,4 +27,4 @@ public class DeploymentExamplesMultiNodeSelfTest extends DeploymentExamplesSelfT
 
         super.testDeploymentExample();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
index 6ef54c9..0059429 100644
--- a/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.misc.deployment.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.misc.deployment.DeploymentExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Deployment examples self test.
@@ -30,4 +30,4 @@ public class DeploymentExamplesSelfTest extends GridAbstractExamplesTest {
     public void testDeploymentExample() throws Exception {
         DeploymentExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
index 8ce2aad..bbcd7c1 100644
--- a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class EventsExamplesMultiNodeSelfTest extends EventsExamplesSelfTest {
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
index 496b556..6eea95e 100644
--- a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.events.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.events.EventsExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Events examples self test.
@@ -30,4 +30,4 @@ public class EventsExamplesSelfTest extends GridAbstractExamplesTest {
     public void testEventsExample() throws Exception {
         EventsExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
index ea14374..1ca9b59 100644
--- a/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.datagrid.hibernate.*;
+import org.apache.ignite.examples.datagrid.hibernate.HibernateL2CacheExample;
 
 /**
  * Multi-node test for {@link HibernateL2CacheExample}.
@@ -28,4 +28,4 @@ public class HibernateL2CacheExampleMultiNodeSelfTest extends HibernateL2CacheEx
         for (int i = 0; i < RMT_NODES_CNT; i++)
             startGrid("node-" + i, "examples/config/example-ignite.xml");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
index 6fa1b13..5f55e82 100644
--- a/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.datagrid.hibernate.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.datagrid.hibernate.HibernateL2CacheExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Tests the {@link HibernateL2CacheExample}.
@@ -30,4 +30,4 @@ public class HibernateL2CacheExampleSelfTest extends GridAbstractExamplesTest {
     public void testHibernateL2CacheExample() throws Exception {
         HibernateL2CacheExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
index 8365b00..766c22c 100644
--- a/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.igfs.IgfsExample;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * IGFS examples self test.
@@ -48,4 +48,4 @@ public class IgfsExamplesSelfTest extends GridAbstractExamplesTest {
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
index eb66ac3..2bd4a1f 100644
--- a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.misc.lifecycle.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.misc.lifecycle.LifecycleExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * LifecycleExample self test.
@@ -30,4 +30,4 @@ public class LifecycleExamplesSelfTest extends GridAbstractExamplesTest {
     public void testLifecycleExample() throws Exception {
         LifecycleExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
index 573999e..82a69e3 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.misc.client.memcache.*;
+import org.apache.ignite.examples.misc.client.memcache.MemcacheRestExampleNodeStartup;
 
 /**
  * MemcacheRestExample multi-node self test.
@@ -28,4 +28,4 @@ public class MemcacheRestExamplesMultiNodeSelfTest extends MemcacheRestExamplesS
         for (int i = 0; i < RMT_NODES_CNT; i++)
             startGrid("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
index 79a8da5..459ddea 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.misc.client.memcache.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.misc.client.memcache.MemcacheRestExample;
+import org.apache.ignite.examples.misc.client.memcache.MemcacheRestExampleNodeStartup;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * MemcacheRestExample self test.
@@ -38,4 +39,4 @@ public class MemcacheRestExamplesSelfTest extends GridAbstractExamplesTest {
     public void testMemcacheRestExample() throws Exception {
         MemcacheRestExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
index 4a94b3b..a5b4329 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
@@ -17,8 +17,10 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.messaging.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.messaging.MessagingExample;
+import org.apache.ignite.examples.messaging.MessagingPingPongExample;
+import org.apache.ignite.examples.messaging.MessagingPingPongListenActorExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Messaging examples self test.
@@ -50,4 +52,4 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest {
     public void testMessagingPingPongListenActorExample() throws Exception {
         MessagingPingPongListenActorExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
index f432a1a..f641a45 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class MonteCarloExamplesMultiNodeSelfTest extends MonteCarloExamplesSelfT
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
index f42151f..f98b481 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.montecarlo.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.montecarlo.CreditRiskExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Ignite examples self test. Excludes Ignite Spring tests.
@@ -71,4 +71,4 @@ public class MonteCarloExamplesSelfTest extends GridAbstractExamplesTest {
     public void testCreditRiskExample() throws Exception {
         CreditRiskExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
index 6465d40..9819072 100644
--- a/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.misc.springbean.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.misc.springbean.SpringBeanExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Spring bean examples self test.
@@ -30,4 +30,4 @@ public class SpringBeanExamplesSelfTest extends GridAbstractExamplesTest {
     public void testSpringBeanHelloWorldExample() throws Exception {
         SpringBeanExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
index e0c7bb5..06c4dd8 100644
--- a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class TaskExamplesMultiNodeSelfTest extends TaskExamplesSelfTest {
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
index 01bb254..c31787a 100644
--- a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.computegrid.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.examples.computegrid.ComputeTaskMapExample;
+import org.apache.ignite.examples.computegrid.ComputeTaskSplitExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
 
 /**
  * Hello world examples self test.
@@ -37,4 +38,4 @@ public class TaskExamplesSelfTest extends GridAbstractExamplesTest {
     public void testTaskMapExample() throws Exception {
         ComputeTaskMapExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
index 3ede10f..4669ae4 100644
--- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@ -17,11 +17,36 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.testframework.*;
+import junit.framework.TestSuite;
+import org.apache.ignite.examples.BasicExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.BasicExamplesSelfTest;
+import org.apache.ignite.examples.CacheExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.CacheExamplesSelfTest;
+import org.apache.ignite.examples.CheckpointExamplesSelfTest;
+import org.apache.ignite.examples.ClusterGroupExampleSelfTest;
+import org.apache.ignite.examples.ContinuationExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.ContinuationExamplesSelfTest;
+import org.apache.ignite.examples.ContinuousMapperExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.ContinuousMapperExamplesSelfTest;
+import org.apache.ignite.examples.DeploymentExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.DeploymentExamplesSelfTest;
+import org.apache.ignite.examples.EventsExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.EventsExamplesSelfTest;
+import org.apache.ignite.examples.HibernateL2CacheExampleMultiNodeSelfTest;
+import org.apache.ignite.examples.HibernateL2CacheExampleSelfTest;
+import org.apache.ignite.examples.IgfsExamplesSelfTest;
+import org.apache.ignite.examples.LifecycleExamplesSelfTest;
+import org.apache.ignite.examples.MemcacheRestExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.MemcacheRestExamplesSelfTest;
+import org.apache.ignite.examples.MessagingExamplesSelfTest;
+import org.apache.ignite.examples.MonteCarloExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.MonteCarloExamplesSelfTest;
+import org.apache.ignite.examples.SpringBeanExamplesSelfTest;
+import org.apache.ignite.examples.TaskExamplesMultiNodeSelfTest;
+import org.apache.ignite.examples.TaskExamplesSelfTest;
+import org.apache.ignite.testframework.GridTestUtils;
 
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
 
 /**
  * Examples test suite.
@@ -70,4 +95,4 @@ public class IgniteExamplesSelfTestSuite extends TestSuite {
 
         return suite;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java
index bf9c3fb..127ba0d 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class BasicExamplesMultiNodeSelfTest extends BasicExamplesSelfTest {
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java
index 73b49cb..a6bd7c9 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.java8.examples;
 
 import org.apache.ignite.examples.java8.computegrid.*;
 import org.apache.ignite.examples.java8.datastructures.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Closure examples self test.
@@ -83,4 +82,4 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testTaskSplitExample() throws Exception {
 //        ComputeTaskSplitExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java
index a1d9bcd..8056eef 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java
@@ -35,4 +35,4 @@ public class CacheExamplesMultiNodeSelfTest extends CacheExamplesSelfTest {
     @Override protected long getTestTimeout() {
         return 10 * 60 * 1000;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
index af233ac..823210b 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.java8.examples;
 
 import org.apache.ignite.examples.java8.datagrid.*;
+
 //import org.apache.ignite.examples.java8.datagrid.starschema.*;
 //import org.apache.ignite.examples.java8.datagrid.store.dummy.*;
 //import org.apache.ignite.examples.java8.datastructures.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Cache examples self test.
@@ -142,4 +142,4 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testCacheContinuousQueryExample() throws Exception {
 //        CacheContinuousQueryExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java
index b0c8133..d1c5f16 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.computegrid.failover.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Checkpoint examples self test.
@@ -45,4 +44,4 @@ public class CheckpointExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testCheckpointExample() throws Exception {
 //        ComputeFailoverExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java
index 4822e7b..3dea6ca 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.java8.examples;
 
-import org.apache.ignite.testframework.junits.common.*;
-
 /**
  *
  */
@@ -37,4 +35,4 @@ public class ClusterGroupExampleSelfTest extends GridAbstractExamplesTest {
 //    public void testComputeClusterGroupsExample() throws Exception {
 //        ClusterGroupExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java
index d93ee13..8e9aa48 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class ContinuationExamplesMultiNodeSelfTest extends ContinuationExamplesS
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java
index 5f71816..4b4387c 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.computegrid.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Continuation example self test.
@@ -33,4 +32,4 @@ public class ContinuationExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testContinuationExample() throws Exception {
 //        ComputeFibonacciContinuationExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
index aff4c5f..b570947 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class ContinuousMapperExamplesMultiNodeSelfTest extends ContinuationExamp
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java
index 6c8992c..afa1262 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.java8.examples;
 
-import org.apache.ignite.testframework.junits.common.*;
-
 /**
  * ContinuousMapperExample self test.
  */
@@ -32,4 +30,4 @@ public class ContinuousMapperExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testContinuousMapperExample() throws Exception {
 //        ComputeContinuousMapperExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java
index d3318bc..3ad9837 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java
@@ -29,4 +29,4 @@ public class DeploymentExamplesMultiNodeSelfTest extends DeploymentExamplesSelfT
 //
 //        super.testDeploymentExample();
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java
index b55c0db..f56630d 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.misc.deployment.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Deployment examples self test.
@@ -32,4 +31,4 @@ public class DeploymentExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testDeploymentExample() throws Exception {
 //        DeploymentExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java
index ab37197..1b71382 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class EventsExamplesMultiNodeSelfTest extends EventsExamplesSelfTest {
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java
index f0a42ca..e7b45a1 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 import org.apache.ignite.examples.java8.events.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Events examples self test.
@@ -30,4 +29,4 @@ public class EventsExamplesSelfTest extends GridAbstractExamplesTest {
     public void testEventsExample() throws Exception {
         EventsExample.main(EMPTY_ARGS);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
index edfba3d..737d498 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
@@ -26,4 +26,4 @@ public class HibernateL2CacheExampleMultiNodeSelfTest extends HibernateL2CacheEx
         for (int i = 0; i < RMT_NODES_CNT; i++)
             startGrid("node-" + i, "examples/config/example-ignite.xml");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java
index 51c3326..f3c36ab 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.datagrid.hibernate.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Tests the {@link org.apache.ignite.examples.java8.datagrid.hibernate.HibernateL2CacheExample}.
@@ -33,4 +32,4 @@ public class HibernateL2CacheExampleSelfTest extends GridAbstractExamplesTest {
 //    public void testHibernateL2CacheExample() throws Exception {
 //        HibernateL2CacheExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java
index e570cad..424c197 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.igfs.*;
 //import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * IGFS examples self test.
@@ -51,4 +50,4 @@ public class IgfsExamplesSelfTest extends GridAbstractExamplesTest {
 //            stopAllGrids();
 //        }
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java
index 2bf1e24..f132e64 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.misc.lifecycle.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * LifecycleExample self test.
@@ -33,4 +32,4 @@ public class LifecycleExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testLifecycleExample() throws Exception {
 //        LifecycleExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java
index 8376c8f..52b79d8 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java
@@ -30,4 +30,4 @@ public class MemcacheRestExamplesMultiNodeSelfTest extends MemcacheRestExamplesS
 //        for (int i = 0; i < RMT_NODES_CNT; i++)
 //            startGrid("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration());
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java
index 1ac773c..398451e 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.misc.client.memcache.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * MemcacheRestExample self test.
@@ -40,4 +39,4 @@ public class MemcacheRestExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testMemcacheRestExample() throws Exception {
 //        MemcacheRestExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
index 562c0e5..92b2190 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 import org.apache.ignite.examples.java8.messaging.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Messaging examples self test.
@@ -52,4 +51,4 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testMessagingPingPongListenActorExample() throws Exception {
 //        MessagingPingPongListenActorExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java
index 2808a46..dee7560 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class MonteCarloExamplesMultiNodeSelfTest extends MonteCarloExamplesSelfT
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java
index 78d926a..2173bd6 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.computegrid.montecarlo.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Ignite examples self test. Excludes Ignite Spring tests.
@@ -74,4 +73,4 @@ public class MonteCarloExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testCreditRiskExample() throws Exception {
 //        CreditRiskExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java
index a44074c..859eb0a 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.misc.springbean.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Spring bean examples self test.
@@ -33,4 +32,4 @@ public class SpringBeanExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testSpringBeanHelloWorldExample() throws Exception {
 //        SpringBeanExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java
index 9f29c5a..2db3906 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java
@@ -25,4 +25,4 @@ public class TaskExamplesMultiNodeSelfTest extends TaskExamplesSelfTest {
     @Override protected void beforeTest() throws Exception {
         startRemoteNodes();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java
index 330bbba..a520292 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.java8.examples;
 
 //import org.apache.ignite.examples.java8.computegrid.*;
-import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Hello world examples self test.
@@ -39,4 +38,4 @@ public class TaskExamplesSelfTest extends GridAbstractExamplesTest {
 //    public void testTaskMapExample() throws Exception {
 //        ComputeTaskMapExample.main(EMPTY_ARGS);
 //    }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java b/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
index bd4597f..1373abe 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
@@ -17,11 +17,9 @@
 
 package org.apache.ignite.java8.testsuites;
 
-import junit.framework.*;
 import org.apache.ignite.java8.examples.*;
-import org.apache.ignite.testframework.*;
 
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
 
 /**
  * Examples test suite.
@@ -70,4 +68,4 @@ public class IgniteExamplesJ8SelfTestSuite extends TestSuite {
 
         return suite;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
index f13b64c..fefff9d 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
@@ -17,18 +17,24 @@
 
 package org.apache.ignite.compute.gridify.aop.aspectj;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.aspectj.lang.*;
-import org.aspectj.lang.annotation.*;
-import org.aspectj.lang.reflect.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteState.*;
+import java.lang.reflect.Method;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.compute.gridify.GridifyInterceptor;
+import org.apache.ignite.compute.gridify.GridifyRuntimeException;
+import org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter;
+import org.apache.ignite.compute.gridify.aop.GridifyDefaultTask;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+
+import static org.apache.ignite.IgniteState.STARTED;
 
 /**
  * AspectJ aspect that cross-cuts on all methods grid-enabled with
@@ -121,4 +127,4 @@ public class GridifyAspectJAspect {
             throw new GridifyRuntimeException("Undeclared exception thrown: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
index acd318b..bf57742 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.compute.gridify.aop.aspectj;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.aspectj.lang.*;
-import org.aspectj.lang.annotation.*;
-import org.aspectj.lang.reflect.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.Method;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.gridify.GridifyInterceptor;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifyRuntimeException;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.aop.GridifySetToSetAbstractAspect;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+
+import static org.apache.ignite.IgniteState.STARTED;
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * AspectJ aspect that cross-cuts on all methods grid-enabled with
@@ -132,4 +138,4 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect
             throw new GridifyRuntimeException("Undeclared exception thrown: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
index ae39ceb..283a0aa 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.compute.gridify.aop.aspectj;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.aspectj.lang.*;
-import org.aspectj.lang.annotation.*;
-import org.aspectj.lang.reflect.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.Method;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.gridify.GridifyInterceptor;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifyRuntimeException;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.compute.gridify.aop.GridifySetToValueAbstractAspect;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+
+import static org.apache.ignite.IgniteState.STARTED;
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * AspectJ aspect that cross-cuts on all methods grid-enabled with
@@ -132,4 +138,4 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp
             throw new GridifyRuntimeException("Undeclared exception thrown: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
index b7499af..6330ef1 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.compute.gridify.aop.spring;
 
-import org.aopalliance.intercept.*;
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.Method;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.gridify.GridifyInterceptor;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifyRuntimeException;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.aop.GridifySetToSetAbstractAspect;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+
+import static org.apache.ignite.IgniteState.STARTED;
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Spring aspect that cross-cuts on all methods grid-enabled with
@@ -127,4 +133,4 @@ public class GridifySetToSetSpringAspect extends GridifySetToSetAbstractAspect i
             throw new GridifyRuntimeException("Undeclared exception thrown: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
index af4bee6..05bf8d7 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.compute.gridify.aop.spring;
 
-import org.aopalliance.intercept.*;
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.Method;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.gridify.GridifyInterceptor;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifyRuntimeException;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.compute.gridify.aop.GridifySetToValueAbstractAspect;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+
+import static org.apache.ignite.IgniteState.STARTED;
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Spring aspect that cross-cuts on all methods grid-enabled with
@@ -127,4 +133,4 @@ public class GridifySetToValueSpringAspect extends GridifySetToValueAbstractAspe
             throw new GridifyRuntimeException("Undeclared exception thrown: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
index a7984c5..6d21d67 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
@@ -17,16 +17,22 @@
 
 package org.apache.ignite.compute.gridify.aop.spring;
 
-import org.aopalliance.intercept.*;
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteState.*;
+import java.lang.reflect.Method;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.compute.gridify.GridifyInterceptor;
+import org.apache.ignite.compute.gridify.GridifyRuntimeException;
+import org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter;
+import org.apache.ignite.compute.gridify.aop.GridifyDefaultTask;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+
+import static org.apache.ignite.IgniteState.STARTED;
 
 /**
  * Spring aspect that cross-cuts on all methods grid-enabled with
@@ -115,4 +121,4 @@ public class GridifySpringAspect implements MethodInterceptor {
             throw new GridifyRuntimeException("Undeclared exception thrown: " + e.getMessage(), e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java
index bade583..b71fcaf 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.compute.gridify.aop.spring;
 
-import org.springframework.aop.framework.*;
-import org.springframework.aop.support.*;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.support.DefaultPointcutAdvisor;
 
 /**
  * Spring AOP enhancer. Use it to grid-enable methods annotated with
@@ -78,4 +78,4 @@ public final class GridifySpringEnhancer {
 
         return (T)proxyFac.getProxy();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringPointcut.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringPointcut.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringPointcut.java
index 3442f6f..02c5027 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringPointcut.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringPointcut.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.compute.gridify.aop.spring;
 
-import org.apache.ignite.compute.gridify.*;
-import org.springframework.aop.*;
-
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.springframework.aop.ClassFilter;
+import org.springframework.aop.MethodMatcher;
+import org.springframework.aop.Pointcut;
 
 /**
  * Pointcut used by gridified aspects to find methods
@@ -134,4 +137,4 @@ public class GridifySpringPointcut implements Pointcut {
         /** */
         SET_TO_SET
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
index 5a03dfd..4f0e2ea 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -17,22 +17,23 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestClassLoader;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED;
 
 /**
  * Abstract AOP test.
@@ -731,4 +732,4 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
             return true;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
index dc83a57..28b7320 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.compute.gridify.GridifyTaskSplitAdapter;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Tries to execute dummy gridified task. It should fail because grid is not started.
@@ -74,4 +77,4 @@ public class BasicAopSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file


[36/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
index e62e43f..f90cf4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
@@ -17,22 +17,34 @@
 
 package org.apache.ignite.internal.managers.swapspace;
 
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.events.SwapSpaceEvent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.SkipDaemon;
+import org.apache.ignite.internal.managers.GridManagerAdapter;
+import org.apache.ignite.internal.util.GridEmptyCloseableIterator;
+import org.apache.ignite.internal.util.GridSpiCloseableIteratorWrapper;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.swapspace.SwapContext;
+import org.apache.ignite.spi.swapspace.SwapKey;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpiListener;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_CLEARED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_EVICTED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_READ;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_REMOVED;
+import static org.apache.ignite.events.EventType.EVT_SWAP_SPACE_DATA_STORED;
 
 /**
  *
@@ -447,4 +459,4 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
 
         return ctx;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
index 77810e1..e4ae161 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
@@ -17,12 +17,19 @@
 
 package org.apache.ignite.internal.mxbean;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.mxbean.*;
-
-import javax.management.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
+import javax.management.NotCompliantMBeanException;
+import javax.management.StandardMBean;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.mxbean.MXBeanParametersDescriptions;
+import org.apache.ignite.mxbean.MXBeanParametersNames;
 
 /**
  * Extension of standard Java MBean. Overrides some hooks to return
@@ -274,4 +281,4 @@ public class IgniteStandardMXBean extends StandardMBean {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
index 2969261..3b2357e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.portable.streams.PortableInputStream;
+import org.apache.ignite.internal.portable.streams.PortableOutputStream;
+import org.apache.ignite.portable.PortableException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable objects marshaller.
@@ -301,4 +301,4 @@ public class GridPortableMarshaller {
     public PortableContext context() {
         return ctx;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableAbstractLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableAbstractLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableAbstractLazyValue.java
index 83b3050..2b1c4b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableAbstractLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableAbstractLazyValue.java
@@ -54,4 +54,4 @@ abstract class PortableAbstractLazyValue implements PortableLazyValue {
 
         return val;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderEnum.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderEnum.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderEnum.java
index 9d29669..b6ace99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderEnum.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderEnum.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableInvalidClassException;
 
 /**
  *
@@ -111,4 +111,4 @@ public class PortableBuilderEnum implements PortableBuilderSerializationAware {
 
         return result;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderImpl.java
index 26f1d25..dac199a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderImpl.java
@@ -17,16 +17,28 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.portable.GridPortableMarshaller.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.util.GridArgumentCheck;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableInvalidClassException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLS_NAME_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DFLT_HDR_LEN;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.HASH_CODE_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.RAW_DATA_OFF_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.TOTAL_LEN_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.TYPE_ID_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UNREGISTERED_TYPE_ID;
 
 /**
  *
@@ -516,4 +528,4 @@ public class PortableBuilderImpl implements PortableBuilder {
     int typeId() {
         return typeId;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderReader.java
index 3e0286f..30b31f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderReader.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.portable.*;
-
-import java.sql.*;
+import java.sql.Timestamp;
 import java.util.Date;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.portable.PortableException;
 
-import static java.nio.charset.StandardCharsets.*;
-import static org.apache.ignite.internal.portable.GridPortableMarshaller.*;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.NULL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING;
 
 /**
  *
@@ -772,4 +773,4 @@ class PortableBuilderReader {
             return PortableUtils.unwrapLazy(wrappedCollection());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializationAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializationAware.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializationAware.java
index dadbcf2..d75cd7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializationAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializationAware.java
@@ -26,4 +26,4 @@ interface PortableBuilderSerializationAware {
      * @param ctx Context.
      */
     public void writeTo(PortableWriterExImpl writer, PortableBuilderSerializer ctx);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializer.java
index 01edc5e..6ce9f4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableBuilderSerializer.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.portable.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import org.apache.ignite.internal.util.GridConcurrentSkipListSet;
+import org.apache.ignite.portable.PortableObject;
 
 /**
  *
@@ -207,4 +208,4 @@ class PortableBuilderSerializer {
             writeValue(writer, obj);
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index fb2bdc2..7e4266c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -17,22 +17,33 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-
-import static java.lang.reflect.Modifier.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableSerializer;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.reflect.Modifier.isStatic;
+import static java.lang.reflect.Modifier.isTransient;
 
 /**
  * Portable class descriptor.
@@ -1341,4 +1352,4 @@ class PortableClassDescriptor {
             return typeName;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index cd3abc1..15b6433 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -17,30 +17,58 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.math.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.math.BigDecimal;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.*;
-import java.util.jar.*;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableInvalidClassException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableSerializer;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Portable context.

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableEnumArrayLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableEnumArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableEnumArrayLazyValue.java
index 7fa04e8..c953bb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableEnumArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableEnumArrayLazyValue.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableInvalidClassException;
 
 /**
  *
@@ -108,4 +109,4 @@ class PortableEnumArrayLazyValue extends PortableAbstractLazyValue {
 
         writer.write(reader.array(), valOff, len);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyArrayList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyArrayList.java
index 56dfba9..84a0c22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyArrayList.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.portable;
 
-import java.util.*;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  *
@@ -153,4 +156,4 @@ class PortableLazyArrayList extends AbstractList<Object> implements PortableBuil
                 ctx.writeValue(writer, o);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyLinkedList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyLinkedList.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyLinkedList.java
index 9395aeb..7b2e15a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyLinkedList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyLinkedList.java
@@ -17,7 +17,12 @@
 
 package org.apache.ignite.internal.portable;
 
-import java.util.*;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
 
 /**
  *
@@ -207,4 +212,4 @@ class PortableLazyLinkedList extends AbstractList<Object> implements PortableBui
                 ctx.writeValue(writer, o);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMap.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMap.java
index e7f7727..eed8121 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMap.java
@@ -17,9 +17,13 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -211,4 +215,4 @@ class PortableLazyMap extends AbstractMap<Object, Object> implements PortableBui
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMapEntry.java
index 389ab33..1970d21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyMapEntry.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.portable;
 
-import java.util.*;
+import java.util.Map;
 
 /**
  *
@@ -63,4 +63,4 @@ class PortableLazyMapEntry implements Map.Entry<Object, Object>, PortableBuilder
         ctx.writeValue(writer, key);
         ctx.writeValue(writer, val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazySet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazySet.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazySet.java
index d5a59a0..3e1dc92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazySet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazySet.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Set;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  *
@@ -86,4 +86,4 @@ class PortableLazySet extends PortableAbstractLazyValue {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyValue.java
index fcce4a5..43728b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableLazyValue.java
@@ -25,4 +25,4 @@ interface PortableLazyValue extends PortableBuilderSerializationAware {
      * @return Value.
      */
     public Object value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataCollector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataCollector.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataCollector.java
index 30978ad..ae5fbf0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataCollector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataCollector.java
@@ -17,15 +17,20 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.lang.reflect.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.apache.ignite.portable.PortableWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Writer for meta data collection.
@@ -250,4 +255,4 @@ class PortableMetaDataCollector implements PortableWriter {
             );
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataHandler.java
index e8154ab..e03d67f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataHandler.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.portable.*;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMetadata;
 
 /**
  * Portable meta data handler.
@@ -40,4 +41,4 @@ public interface PortableMetaDataHandler {
      * @throws PortableException In case of error.
      */
     public PortableMetadata metadata(int typeId) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataImpl.java
index 697a981..1d26007 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableMetaDataImpl.java
@@ -17,14 +17,24 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableRawReader;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.apache.ignite.portable.PortableReader;
+import org.apache.ignite.portable.PortableWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable meta data implementation.
@@ -137,4 +147,4 @@ public class PortableMetaDataImpl implements PortableMetadata, PortableMarshalAw
     @Override public String toString() {
         return S.toString(PortableMetaDataImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectArrayLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectArrayLazyValue.java
index 16038d9..897e8e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectArrayLazyValue.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableInvalidClassException;
 
 /**
  *
@@ -86,4 +86,4 @@ class PortableObjectArrayLazyValue extends PortableAbstractLazyValue {
         else
             ctx.writeArray(writer, GridPortableMarshaller.OBJ_ARR, lazyValsArr, clsName);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectEx.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectEx.java
index 270ba9f..fe4b628 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectEx.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.offheap.unsafe.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.IdentityHashMap;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Internal portable object interface.
@@ -210,4 +211,4 @@ public abstract class PortableObjectEx implements PortableObject {
             throw new IgniteException("Failed to create string representation of portable object.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
index f3dfd50..47ff1ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
@@ -17,19 +17,27 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.portable.streams.PortableHeapInputStream;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable object implementation.
@@ -380,4 +388,4 @@ public final class PortableObjectImpl extends PortableObjectEx implements Extern
     @Override public byte fieldsCount() {
         return 3;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectOffheapImpl.java
index 40655ba..ba8ee83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectOffheapImpl.java
@@ -17,19 +17,24 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.portable.streams.PortableOffheapInputStream;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Unsafe;
 
 /**
  *  Portable object implementation over offheap memory
@@ -235,4 +240,4 @@ public class PortableObjectOffheapImpl extends PortableObjectEx implements Exter
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         throw new UnsupportedOperationException(); // To make sure it is not marshalled.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainLazyValue.java
index 73cc19e..d08d09b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainLazyValue.java
@@ -44,4 +44,4 @@ class PortablePlainLazyValue extends PortableAbstractLazyValue {
     @Override public void writeTo(PortableWriterExImpl writer, PortableBuilderSerializer ctx) {
         writer.write(reader.array(), valOff, len);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainPortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainPortableObject.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainPortableObject.java
index 1679303..cfaa04f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainPortableObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePlainPortableObject.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.portable.*;
+import org.apache.ignite.portable.PortableObject;
 
 /**
  *
@@ -47,4 +47,4 @@ public class PortablePlainPortableObject implements PortableLazyValue {
 
         writer.doWritePortableObject((PortableObjectImpl)val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePrimitives.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePrimitives.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePrimitives.java
index ce29458..4c6b5fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePrimitives.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortablePrimitives.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridUnsafe;
+import sun.misc.Unsafe;
 
-import sun.misc.*;
-
-import static java.nio.ByteOrder.*;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.nio.ByteOrder.nativeOrder;
 
 /**
  * Primitives writer.
@@ -770,4 +770,4 @@ public abstract class PortablePrimitives {
             return val;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawReaderEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawReaderEx.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawReaderEx.java
index 2abce7f..e703f2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawReaderEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawReaderEx.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableRawReader;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extended reader interface.
@@ -30,4 +30,4 @@ public interface PortableRawReaderEx extends PortableRawReader {
      * @throws PortableException In case of error.
      */
     @Nullable public Object readObjectDetached() throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawWriterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawWriterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawWriterEx.java
index b0d6c71..a59f157 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawWriterEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableRawWriterEx.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.portable.streams.PortableOutputStream;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extended writer interface.
@@ -57,4 +57,4 @@ public interface PortableRawWriterEx extends PortableRawWriter, AutoCloseable {
      * @throws PortableException If failed.
      */
     public void writeInt(int pos, int val) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderContext.java
index 704305a..2d4a1c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderContext.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Reader context.
@@ -80,4 +79,4 @@ class PortableReaderContext {
     @Override public String toString() {
         return S.toString(PortableReaderContext.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
index 2a6c2e3..f702e06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
@@ -17,26 +17,97 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.ObjectInput;
 import java.lang.reflect.Array;
-import java.lang.reflect.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.*;
-
-import static java.nio.charset.StandardCharsets.*;
-import static org.apache.ignite.internal.portable.GridPortableMarshaller.*;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.portable.streams.PortableHeapInputStream;
+import org.apache.ignite.internal.portable.streams.PortableInputStream;
+import org.apache.ignite.internal.util.GridEnumCache;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableInvalidClassException;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.portable.PortableRawReader;
+import org.apache.ignite.portable.PortableReader;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ARR_LIST;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLASS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLS_NAME_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.COL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CONC_HASH_MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CONC_SKIP_LIST_SET;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DFLT_HDR_LEN;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.HANDLE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.HASH_MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.HASH_SET;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LINKED_HASH_MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LINKED_HASH_SET;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LINKED_LIST;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP_ENTRY;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.NULL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJECT_TYPE_ID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OPTM_MARSH;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.PORTABLE_OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.PROPERTIES_MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.RAW_DATA_OFF_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.TREE_MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.TREE_SET;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UNREGISTERED_TYPE_ID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.USER_COL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.USER_SET;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID_ARR;
 
 /**
  * Portable reader implementation.
@@ -2946,4 +3017,4 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
     @Override public void close() throws IOException {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableThreadLocalMemoryAllocator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableThreadLocalMemoryAllocator.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableThreadLocalMemoryAllocator.java
index f3b3739..8f5bfb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableThreadLocalMemoryAllocator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableThreadLocalMemoryAllocator.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.portable.streams.PortableMemoryAllocator;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import sun.misc.Unsafe;
 
-import sun.misc.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RECHECK;
 
 /**
  * Thread-local memory allocator.

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
index 72e80ec..ce77783 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
@@ -17,19 +17,58 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.portable.GridPortableMarshaller.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.portable.PortableObject;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.COL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.NULL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID_ARR;
 
 /**
  *
@@ -416,4 +455,4 @@ public class PortableUtils {
 
         return U.newHashSet(set.size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableValueWithType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableValueWithType.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableValueWithType.java
index 52f1dcc..ebc68c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableValueWithType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableValueWithType.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -71,4 +71,4 @@ class PortableValueWithType implements PortableLazyValue {
     @Override public String toString() {
         return S.toString(PortableValueWithType.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
index e100e13..6bcce2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
@@ -17,23 +17,70 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.portable.streams.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.*;
-
-import static java.nio.charset.StandardCharsets.*;
-import static org.apache.ignite.internal.portable.GridPortableMarshaller.*;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.portable.streams.PortableHeapOutputStream;
+import org.apache.ignite.internal.portable.streams.PortableOutputStream;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableRawWriter;
+import org.apache.ignite.portable.PortableWriter;
+import org.jetbrains.annotations.Nullable;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLASS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.COL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP_ENTRY;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.NULL;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.OPTM_MARSH;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.PORTABLE_OBJ;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.RAW_DATA_OFF_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING_ARR;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.TOTAL_LEN_POS;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UNREGISTERED_TYPE_ID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID;
+import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID_ARR;
 
  /**
  * Portable writer implementation.
@@ -1756,4 +1803,4 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
             handles = new IdentityHashMap<>();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractInputStream.java
index 9f0b1db..107b02e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractInputStream.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.portable.streams;
 
-import org.apache.ignite.portable.*;
+import org.apache.ignite.portable.PortableException;
 
 /**
  * Portable abstract input stream.
@@ -340,4 +340,4 @@ public abstract class PortableAbstractInputStream extends PortableAbstractStream
      * @return Int value.
      */
     protected abstract int readIntPositioned(int pos);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractOutputStream.java
index 2c3179a..78f46ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractOutputStream.java
@@ -320,4 +320,4 @@ public abstract class PortableAbstractOutputStream extends PortableAbstractStrea
      * @param cnt Required byte count.
      */
     protected abstract void ensureCapacity(int cnt);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractStream.java
index a39662b..b2cd8b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableAbstractStream.java
@@ -17,11 +17,9 @@
 
 package org.apache.ignite.internal.portable.streams;
 
-import org.apache.ignite.internal.util.*;
-
-import sun.misc.*;
-
-import java.nio.*;
+import java.nio.ByteOrder;
+import org.apache.ignite.internal.util.GridUnsafe;
+import sun.misc.Unsafe;
 
 /**
  * Portable abstract stream.
@@ -79,4 +77,4 @@ public abstract class PortableAbstractStream implements PortableStream {
     protected void shift(int cnt) {
         pos += cnt;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapInputStream.java
index 3baa6a5..c7ec576 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapInputStream.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.portable.streams;
 
-import java.util.*;
+import java.util.Arrays;
 
 /**
  * Portable off-heap input stream.
@@ -131,4 +131,4 @@ public final class PortableHeapInputStream extends PortableAbstractInputStream {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapOutputStream.java
index f492449..2abb69c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableHeapOutputStream.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.portable.streams;
 
-import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.*;
+import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.DFLT_ALLOC;
+import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.THREAD_LOCAL_ALLOC;
 
 /**
  * Portable heap output stream.
@@ -152,4 +153,4 @@ public final class PortableHeapOutputStream extends PortableAbstractOutputStream
 
         UNSAFE.putInt(data, BYTE_ARR_OFF + pos, val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableInputStream.java
index cd6e039..a1d7fd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableInputStream.java
@@ -165,4 +165,4 @@ public interface PortableInputStream extends PortableStream {
      * @return Remaining data.
      */
     public int remaining();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableMemoryAllocator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableMemoryAllocator.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableMemoryAllocator.java
index 071396a..7ddb457 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableMemoryAllocator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableMemoryAllocator.java
@@ -73,4 +73,4 @@ public interface PortableMemoryAllocator {
      * @param addr Address.
      */
     public void releaseDirect(long addr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapInputStream.java
index bfdd97a..f5ecf95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapInputStream.java
@@ -126,4 +126,4 @@ public class PortableOffheapInputStream extends PortableAbstractInputStream {
     @Override public long offheapPointer() {
         return forceHeap ? 0 : ptr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapOutputStream.java
index adfb6bf..0deef90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOffheapOutputStream.java
@@ -166,4 +166,4 @@ public class PortableOffheapOutputStream extends PortableAbstractOutputStream {
     protected void release(long ptr) {
         UNSAFE.freeMemory(ptr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOutputStream.java
index f320566..745f9ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableOutputStream.java
@@ -162,4 +162,4 @@ public interface PortableOutputStream extends PortableStream, AutoCloseable {
      * Close the stream releasing resources.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableSimpleMemoryAllocator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableSimpleMemoryAllocator.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableSimpleMemoryAllocator.java
index 6021140..54d7b38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableSimpleMemoryAllocator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableSimpleMemoryAllocator.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.portable.streams;
 
-import org.apache.ignite.internal.util.*;
-
-import sun.misc.*;
+import org.apache.ignite.internal.util.GridUnsafe;
+import sun.misc.Unsafe;
 
 /**
  * Naive implementation of portable memory allocator.
@@ -64,4 +63,4 @@ public class PortableSimpleMemoryAllocator implements PortableMemoryAllocator {
     @Override public void releaseDirect(long addr) {
         UNSAFE.freeMemory(addr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableStream.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableStream.java
index 5c84609..bdc39f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/streams/PortableStream.java
@@ -50,4 +50,4 @@ public interface PortableStream {
      * @return {@code True} is stream is array based.
      */
     public boolean hasArray();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
index 563c986..2f5e6d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessor.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 
 /**
  * Interface for all processors.
@@ -26,4 +26,4 @@ import org.apache.ignite.internal.util.tostring.*;
 @GridToStringExclude
 public interface GridProcessor extends GridComponent {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
index 8baf95c..f7f42bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal.processors;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Advanced parent adapter for all processor.
@@ -134,4 +134,3 @@ public abstract class GridProcessorAdapter implements GridProcessor {
         return S.toString(GridProcessorAdapter.class, this);
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
index 40dc64d..a43557f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
@@ -194,4 +198,4 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi
     @Override public String toString() {
         return S.toString(AffinityTopologyVersion.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
index 5373e46..810843c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java
@@ -17,11 +17,16 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Cached affinity calculations.
@@ -183,4 +188,4 @@ class GridAffinityAssignment implements Serializable {
     @Override public String toString() {
         return S.toString(GridAffinityAssignment.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index d40128c..18776a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -17,22 +17,35 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.events.DiscoveryCustomEvent.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.GridNodeOrderComparator;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedHashMap;
+
+import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
 
 /**
  * Affinity cached function.
@@ -485,4 +498,4 @@ public class GridAffinityAssignmentCache {
             return done;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java
index 5a790b6..6c97efd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.affinity;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.cache.affinity.AffinityFunctionContext;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache affinity function context implementation. Simple bean that holds all required fields.
@@ -80,4 +80,4 @@ public class GridAffinityFunctionContextImpl implements AffinityFunctionContext
     @Override public int backups() {
         return backups;
     }
-}
+}
\ No newline at end of file


[47/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
index ede07f9..17a8c7a 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
@@ -17,10 +17,17 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
 
 /**
  * Test set-to-set target.
@@ -369,4 +376,4 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
             out.defaultWriteObject();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
index 82e1da0..592169c 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
 
 /**
  * Test set-to-set target interface.
@@ -106,4 +109,4 @@ public interface GridifySetToSetTargetInterface {
      */
     @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     public Enumeration<Long> findPrimesWithEnumeration(Enumeration<Long> input);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
index 59fdddc..16138f2 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
@@ -17,10 +17,14 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
 
 /**
  * Test set-to-value target.
@@ -196,4 +200,4 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
 
         return maximum;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
index 5250e7f..9d22104 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
 
 /**
  * Test set-to-value target interface.
@@ -97,4 +99,4 @@ public interface GridifySetToValueTargetInterface {
      */
     @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     public long findMaximumInEnumeration(Enumeration<Long> input);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
index 237c91e..2ebd272 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
@@ -17,9 +17,14 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * To run this test with JBoss AOP make sure of the following:
@@ -201,4 +206,4 @@ public class GridifySetToXXXNonSpringAopSelfTest extends GridCommonAbstractTest
             return iter.next();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
index e4e2c69..1dd499a 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
@@ -17,10 +17,15 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.aop.spring.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.compute.gridify.aop.spring.GridifySpringEnhancer;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * To run this test with JBoss AOP make sure of the following:
@@ -202,4 +207,4 @@ public class GridifySetToXXXSpringAopSelfTest extends GridCommonAbstractTest {
             return iter.next();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
index d429e06..faadb53 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * To run this test with JBoss AOP make sure of the following:
@@ -54,4 +54,4 @@ public class NonSpringAopSelfTest extends AbstractAopTest {
     @Override public String getTestGridName() {
         return "TestAopTarget";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
index 8f34950..9a4d969 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.aop.spring.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.compute.gridify.aop.spring.GridifySpringEnhancer;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Spring AOP test.
@@ -49,4 +49,4 @@ public class SpringAopSelfTest extends AbstractAopTest {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
index 5058626..c58d9f5 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import org.apache.ignite.compute.gridify.Gridify;
 
 /**
  * AOP test.
@@ -135,4 +135,4 @@ public class TestAopTarget implements TestAopTargetInterface {
             throw new TestGridifyException("Failed to test load properties file.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
index 686466c..d32c1bf 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.compute.gridify.Gridify;
 
 /**
  * Test AOP target interface.
@@ -84,4 +83,4 @@ public interface TestAopTargetInterface extends Serializable {
      */
     @Gridify(gridName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
     public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java
index aa340b6..ae57a41 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java
@@ -35,4 +35,4 @@ public class TestGridifyException extends Exception {
     public TestGridifyException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java
index 41f5025..f2cce5e 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * Test gridify job.
@@ -64,4 +63,4 @@ public class TestGridifyJob extends ComputeJobAdapter {
         // Never reached.
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java
index fc0af80..ede4d18 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java
@@ -17,10 +17,14 @@
 
 package org.apache.ignite.gridify;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.gridify.GridifyArgument;
 
 /**
  * Test gridify task.
@@ -43,4 +47,4 @@ public class TestGridifyTask extends ComputeTaskSplitAdapter<GridifyArgument, Ob
 
         return results.get(0).getData();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
index 51b1135..a33482e 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.gridify.hierarchy;
 
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Gridify hierarchy test.
@@ -48,4 +48,4 @@ public class GridifyHierarchyTest extends GridCommonAbstractTest {
     @Override public String getTestGridName() {
         return "GridifyHierarchyTest";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
index c2ba1b0..f2e2663 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.gridify.hierarchy;
 
-import org.apache.ignite.compute.gridify.*;
+import org.apache.ignite.compute.gridify.Gridify;
 
 /**
  * Target base class.
@@ -50,4 +50,4 @@ public abstract class SuperTarget {
         return "SuperTarget.methodC()";
     }
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
index 42e7872..f73f1e9 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
@@ -42,4 +42,4 @@ public class Target extends SuperTarget {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
index 0ae80de..7985fb2 100644
--- a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 
 /**
  * Test use GridOptimizedMarshaller and AspectJ AOP.
@@ -101,4 +101,4 @@ public class OptimizedMarshallerAopTest extends GridCommonAbstractTest {
     private void gridify1() {
         X.println("Executes on grid");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
index 8bee327..3a22dde 100644
--- a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.p2p;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.GridTestClassLoader;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  *
@@ -238,4 +240,4 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest {
     public void testResourceSharedMode() throws Exception {
         processTestGridifyResource(DeploymentMode.SHARED);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
index 5c2ab54..7c2d3ea 100644
--- a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
+++ b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.*;
-import org.apache.ignite.gridify.*;
-import org.apache.ignite.testframework.*;
-import org.test.gridify.*;
+import junit.framework.TestSuite;
+import org.apache.ignite.gridify.BasicAopSelfTest;
+import org.apache.ignite.gridify.GridifySetToXXXNonSpringAopSelfTest;
+import org.apache.ignite.gridify.GridifySetToXXXSpringAopSelfTest;
+import org.apache.ignite.gridify.NonSpringAopSelfTest;
+import org.apache.ignite.gridify.SpringAopSelfTest;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.test.gridify.ExternalNonSpringAopSelfTest;
 
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
 
 /**
  * AOP test suite.
@@ -49,4 +53,4 @@ public class IgniteAopSelfTestSuite extends TestSuite {
 
         return suite;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java
index 1bdcd49..cf8e23c 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java
@@ -17,9 +17,9 @@
 
 package org.apache.loadtests.direct.singlesplit;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.loadtests.gridify.*;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.gridify.Gridify;
+import org.apache.loadtests.gridify.GridifyLoadTestTask;
 
 /**
  * Single split test job target.
@@ -41,4 +41,4 @@ public class SingleSplitTestJobTarget {
 
         return 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java
index 0c55204..d6fa18f 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java
@@ -17,11 +17,21 @@
 
 package org.apache.loadtests.direct.singlesplit;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.resources.LoadBalancerResource;
+import org.apache.ignite.resources.TaskSessionResource;
 
 /**
  * Single split test task.
@@ -90,4 +100,4 @@ public class SingleSplitTestTask extends ComputeTaskAdapter<Integer, Integer> {
 
         return retVal;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
index ec9d8b1..dc9760d 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
@@ -17,18 +17,21 @@
 
 package org.apache.loadtests.direct.singlesplit;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.loadtest.*;
-import org.apache.ignite.logger.log4j.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.config.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.log4j.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.loadtest.GridLoadTestStatistics;
+import org.apache.ignite.logger.log4j.Log4JLogger;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.config.GridTestProperties;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.apache.log4j.Level;
 
 /**
  * Single split load test.
@@ -128,4 +131,4 @@ public class SingleSplitsLoadTest extends GridCommonAbstractTest {
 
         info("Final test statistics: " + stats);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java
index dcafd5c..9cfe7ec 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java
@@ -17,7 +17,7 @@
 
 package org.apache.loadtests.gridify;
 
-import org.apache.ignite.compute.gridify.*;
+import org.apache.ignite.compute.gridify.Gridify;
 
 /**
  * Gridify load test job target.
@@ -34,4 +34,4 @@ public class GridifyLoadTestJobTarget {
 
         return 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java
index 4c11e9f..d4a1a3f 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java
@@ -17,12 +17,16 @@
 
 package org.apache.loadtests.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.gridify.GridifyArgument;
 
 /**
  * Gridify load test task.
@@ -67,4 +71,4 @@ public class GridifyLoadTestTask extends ComputeTaskSplitAdapter<GridifyArgument
 
         return retVal;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
index dcaf6bd..317a43d 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -17,21 +17,20 @@
 
 package org.apache.loadtests.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.loadtest.*;
-import org.apache.ignite.logger.log4j.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.config.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.log4j.*;
-
-import java.util.concurrent.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.loadtest.GridLoadTestStatistics;
+import org.apache.ignite.logger.log4j.Log4JLogger;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.config.GridTestProperties;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.apache.log4j.Level;
 
 /**
  * Gridify single split load test.
@@ -153,4 +152,4 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
 
         return num == 1 ? 1 : num * factorial(num - 1);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
index c2d0f30..b3d17a5 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
@@ -17,10 +17,10 @@
 
 package org.test.gridify;
 
-import org.apache.ignite.compute.gridify.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import org.apache.ignite.compute.gridify.Gridify;
 
 /**
  * AOP target.
@@ -131,4 +131,4 @@ public class ExternalAopTarget {
             throw new ExternalGridifyException("Failed to test load properties file.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java
index d6954c6..34a2fb3 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java
@@ -35,4 +35,4 @@ public class ExternalGridifyException extends Exception {
     public ExternalGridifyException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java
index 31e95ba..ff067db 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java
@@ -17,13 +17,17 @@
 
 package org.test.gridify;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.resources.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * External gridify task.
@@ -76,4 +80,4 @@ public class ExternalGridifyTask extends ComputeTaskSplitAdapter<GridifyArgument
 
         return results.get(0).getData();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
index 56a63c8..998ddac 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
@@ -17,12 +17,15 @@
 
 package org.test.gridify;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.gridify.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.gridify.TestGridifyException;
+import org.apache.ignite.gridify.TestGridifyTask;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * To run this test with JBoss AOP make sure of the following:
@@ -536,4 +539,4 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {
     @Override public String getTestGridName() {
         return "ExternalAopTarget";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
index 9b18615..3cee121 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Wrapper of all checkpoint that are saved to the S3. It
@@ -142,4 +143,4 @@ class S3CheckpointData {
     @Override public String toString() {
         return S.toString(S3CheckpointData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index c5a428a..ed72d14 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -17,23 +17,45 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import com.amazonaws.*;
-import com.amazonaws.auth.*;
-import com.amazonaws.services.s3.*;
-import com.amazonaws.services.s3.model.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.AmazonServiceException;
+import com.amazonaws.ClientConfiguration;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines Amazon S3-based implementation for checkpoint SPI.
@@ -680,4 +702,4 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
             return S.toString(S3TimeoutWorker.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java
index 528e60f..5c7c8a5d 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean for {@link S3CheckpointSpi}.
@@ -56,4 +56,4 @@ public interface S3CheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("HTTP proxy user name.")
     public String getProxyUsername();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java
index 8d9ae43..1a0a437 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Helper class that keeps checkpoint expiration date inside to track and delete
@@ -76,4 +76,4 @@ class S3TimeData {
     @Override public String toString() {
         return S.toString(S3TimeData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java
index 78f4ad1..86e4eb2 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java
@@ -17,24 +17,32 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.s3;
 
-import com.amazonaws.*;
-import com.amazonaws.auth.*;
-import com.amazonaws.services.s3.*;
-import com.amazonaws.services.s3.model.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.ClientConfiguration;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import java.io.ByteArrayInputStream;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.StringTokenizer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
 
 /**
  * AWS S3-based IP finder.
@@ -317,4 +325,4 @@ public class TcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter {
     @Override public String toString() {
         return S.toString(TcpDiscoveryS3IpFinder.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
index b01ba81..db09e33 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import com.amazonaws.auth.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.testsuites.*;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManagerAbstractSelfTest;
+import org.apache.ignite.testsuites.IgniteS3TestSuite;
 
 /**
  * Checkpoint manager test using {@link S3CheckpointSpi}.
@@ -63,4 +64,4 @@ public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSe
 
         doMultiNodeTest("s3");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java
index c942d63..727845b 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import org.apache.ignite.testframework.junits.spi.*;
+import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest;
+import org.apache.ignite.testframework.junits.spi.GridSpiTest;
 
 /**
  * Grid S3 checkpoint SPI config self test.
@@ -30,4 +31,4 @@ public class S3CheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<S3C
     public void testNegativeConfig() throws Exception {
         checkNegativeSpiProperty(new S3CheckpointSpi(), "awsCredentials", null);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
index 5894678..11e5bad 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
@@ -17,18 +17,24 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import com.amazonaws.*;
-import com.amazonaws.auth.*;
-import com.amazonaws.services.s3.*;
-import com.amazonaws.services.s3.model.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.spi.*;
-import org.apache.ignite.testsuites.*;
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import org.apache.ignite.GridTestIoUtils;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.lang.GridAbsClosureX;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.checkpoint.GridCheckpointTestState;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest;
+import org.apache.ignite.testframework.junits.spi.GridSpiTest;
+import org.apache.ignite.testsuites.IgniteS3TestSuite;
 
 /**
  * Grid S3 checkpoint SPI self test.
@@ -212,4 +218,4 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
     private void assertWithRetries(GridAbsClosureX assertion) throws IgniteInterruptedCheckedException {
         GridTestUtils.retryAssert(log, 6, 5000, assertion);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
index 34f25ad..3995b09 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import com.amazonaws.auth.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.testframework.junits.spi.*;
-import org.apache.ignite.testsuites.*;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import org.apache.ignite.spi.GridSpiStartStopAbstractTest;
+import org.apache.ignite.testframework.junits.spi.GridSpiTest;
+import org.apache.ignite.testsuites.IgniteS3TestSuite;
 
 /**
  * Grid S3 checkpoint SPI start stop self test.
@@ -38,4 +39,4 @@ public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTe
 
         super.spiConfigure(spi);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
index c683cb3..e5dd074 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.spi.checkpoint.s3;
 
-import com.amazonaws.auth.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.session.*;
-import org.apache.ignite.testsuites.*;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.session.GridSessionCheckpointAbstractSelfTest;
+import org.apache.ignite.session.GridSessionCheckpointSelfTest;
+import org.apache.ignite.testsuites.IgniteS3TestSuite;
 
 /**
  * Grid session checkpoint self test using {@link S3CheckpointSpi}.
@@ -47,4 +49,4 @@ public class S3SessionCheckpointSelfTest extends GridSessionCheckpointAbstractSe
 
         checkCheckpoints(cfg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java
index 8a7b528..73e8e55 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.spi.discovery.tcp.ipfinder.s3;
 
-import com.amazonaws.auth.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.testsuites.*;
-
-import java.net.*;
-import java.util.*;
+import com.amazonaws.auth.BasicAWSCredentials;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
+import org.apache.ignite.testsuites.IgniteS3TestSuite;
 
 /**
  * TcpDiscoveryS3IpFinder test.
@@ -69,4 +69,4 @@ public class TcpDiscoveryS3IpFinderSelfTest
 
         return finder;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
index f286289..5c4ba97 100644
--- a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
+++ b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
@@ -17,9 +17,13 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.*;
-import org.apache.ignite.spi.checkpoint.s3.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.*;
+import junit.framework.TestSuite;
+import org.apache.ignite.spi.checkpoint.s3.S3CheckpointManagerSelfTest;
+import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiConfigSelfTest;
+import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiSelfTest;
+import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiStartStopSelfTest;
+import org.apache.ignite.spi.checkpoint.s3.S3SessionCheckpointSelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinderSelfTest;
 
 /**
  * S3 integration tests.
@@ -66,4 +70,4 @@ public class IgniteS3TestSuite extends TestSuite {
 
         return key;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
index 89a2e78..dea326c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -17,21 +17,42 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.compute.ComputeTaskTimeoutException;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_TASK_REDUCED;
+import static org.apache.ignite.events.EventType.EVT_TASK_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT;
 
 /**
  * Tests for security subject ID in task events.
@@ -389,4 +410,4 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index f1898df..9dd4d83 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -17,29 +17,43 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  *
@@ -384,4 +398,4 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
             return locNodeId;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
index c8a92b5..f910b7d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.charset.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
 
 /**
  * Tests that client is able to connect to a grid with only default cache enabled.
@@ -169,4 +176,4 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest {
                 "\"sessionToken\":\"\",\"successStatus\":0}",
             sendHttp("cmd=get&cacheName=" + LOCAL_CACHE + "&key=a"));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java
index b748cbd..94367d1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.resources.IgniteInstanceResource;
 
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Get affinity for task argument.
@@ -61,4 +62,4 @@ public class ClientGetAffinityTask extends TaskSingleJobSplitAdapter<String, Int
 
         return WAIT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java
index 9599e05..9604c29 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java
@@ -17,12 +17,19 @@
 
 package org.apache.ignite.internal.client;
 
-import net.sf.json.*;
-import org.apache.ignite.compute.*;
+import java.util.Collection;
+import java.util.List;
+import net.sf.json.JSON;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONSerializer;
+import net.sf.json.JsonConfig;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Test task summarizes length of all strings in the arguments list.
@@ -55,4 +62,4 @@ public class ClientHttpTask extends ComputeTaskSplitAdapter<String, Integer> {
 
         return WAIT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java
index 83f1537..9bacfc0 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Starts up one grid node (server) with pre-defined ports and tasks to test client-server interactions.
@@ -54,4 +55,4 @@ public class ClientNodeStartup {
             U.sleep(Long.MAX_VALUE);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
index d1c764e..92c8e76 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.nio.channels.*;
-import java.util.*;
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  *
@@ -235,4 +235,4 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest {
 
         return srv;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java
index 9387311..420b0b9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Starts up one grid node (server) with pre-defined ports and tasks to test client-server interactions.
@@ -56,4 +57,4 @@ public class ClientSslNodeStartup {
             U.sleep(Long.MAX_VALUE);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
index 1822790..4d0a355 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
@@ -17,19 +17,29 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.springframework.beans.factory.*;
-import org.springframework.context.support.*;
-
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Start node task, applicable arguments:
@@ -175,4 +185,4 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ
 
         parent.log().info(">>> Available grids: " + gridNames);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
index 9e3b42a..b648a43 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
@@ -17,14 +17,22 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Stop node task, applicable arguments:
@@ -124,4 +132,4 @@ public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer>
             return 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java
index 2aa0a4f..43db6fd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java
@@ -17,11 +17,17 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.compute.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Test task calculate length of the string passed in the argument.
@@ -68,4 +74,4 @@ public class ClientStringLengthTask extends ComputeTaskSplitAdapter<String, Inte
 
         return WAIT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java
index 74f9a8e..70b1ce8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.ssl.*;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
 
 /**
  * Runs multi-threaded tests on tcp binary protocol (ssl is disabled).
@@ -42,4 +42,4 @@ public class ClientTcpMultiThreadedSelfTest extends ClientAbstractMultiThreadedS
     @Override protected GridSslContextFactory sslContextFactory() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
index 438b943..9dc5042 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
@@ -17,19 +17,21 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.net.ssl.*;
-import java.security.cert.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.net.ssl.X509TrustManager;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
+import org.apache.ignite.internal.client.impl.GridClientImpl;
+import org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Tests
@@ -262,4 +264,4 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest {
             srvCheckCallCnt.set(0);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java
index 4131bf0..7504e9c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.testframework.*;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Runs multithreaded tests for client over tcp binary protocol with ssl enabled.
@@ -43,4 +43,4 @@ public class ClientTcpSslMultiThreadedSelfTest extends ClientAbstractMultiThread
     @Override protected GridSslContextFactory sslContextFactory() {
         return GridTestUtils.sslContextFactory();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java
index caf6e87..8458c0e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java
@@ -17,11 +17,17 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.compute.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Test task summarizes length of all strings in the arguments list.
@@ -68,4 +74,4 @@ public class ClientTcpTask extends ComputeTaskSplitAdapter<List<Object>, Integer
 
         return WAIT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
index 5fc6b06..62d8f63 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collections;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Ensures
@@ -72,4 +72,4 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm
 
         cli.compute().execute(ClientTcpTask.class.getName(), Collections.singletonList("arg"));
     }
-}
+}
\ No newline at end of file


[55/82] [abbrv] ignite git commit: IGNITE-1336: Implemented callback extensions.

Posted by sb...@apache.org.
IGNITE-1336: Implemented callback extensions.


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

Branch: refs/heads/ignite-1093-2
Commit: d907afc669fb4b99e0f0011785415e39abe8b655
Parents: 1335580
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Aug 31 17:41:54 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Aug 31 17:41:54 2015 +0300

----------------------------------------------------------------------
 .../callback/PlatformCallbackGateway.java       | 82 ++++++++++++++++++--
 .../callback/PlatformCallbackUtils.java         | 21 +++++
 2 files changed, 98 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d907afc6/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index a8e7879..ff376d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -790,7 +790,14 @@ public class PlatformCallbackGateway {
      * @throws org.apache.ignite.IgniteCheckedException In case of error.
      */
     public long serviceInit(long memPtr) throws IgniteCheckedException {
-        return PlatformCallbackUtils.serviceInit(envPtr, memPtr);
+        enter();
+
+        try {
+            return PlatformCallbackUtils.serviceInit(envPtr, memPtr);
+        }
+        finally {
+            leave();
+        }
     }
 
     /**
@@ -801,7 +808,14 @@ public class PlatformCallbackGateway {
      * @throws org.apache.ignite.IgniteCheckedException In case of error.
      */
     public void serviceExecute(long svcPtr, long memPtr) throws IgniteCheckedException {
-        PlatformCallbackUtils.serviceExecute(envPtr, svcPtr, memPtr);
+        enter();
+
+        try {
+            PlatformCallbackUtils.serviceExecute(envPtr, svcPtr, memPtr);
+        }
+        finally {
+            leave();
+        }
     }
 
     /**
@@ -812,7 +826,14 @@ public class PlatformCallbackGateway {
      * @throws org.apache.ignite.IgniteCheckedException In case of error.
      */
     public void serviceCancel(long svcPtr, long memPtr) throws IgniteCheckedException {
-        PlatformCallbackUtils.serviceCancel(envPtr, svcPtr, memPtr);
+        enter();
+
+        try {
+            PlatformCallbackUtils.serviceCancel(envPtr, svcPtr, memPtr);
+        }
+        finally {
+            leave();
+        }
     }
 
     /**
@@ -824,7 +845,14 @@ public class PlatformCallbackGateway {
      * @throws org.apache.ignite.IgniteCheckedException In case of error.
      */
     public void serviceInvokeMethod(long svcPtr, long outMemPtr, long inMemPtr) throws IgniteCheckedException {
-        PlatformCallbackUtils.serviceInvokeMethod(envPtr, svcPtr, outMemPtr, inMemPtr);
+        enter();
+
+        try {
+            PlatformCallbackUtils.serviceInvokeMethod(envPtr, svcPtr, outMemPtr, inMemPtr);
+        }
+        finally {
+            leave();
+        }
     }
 
     /**
@@ -833,7 +861,51 @@ public class PlatformCallbackGateway {
      * @param memPtr Stream pointer.
      */
     public int clusterNodeFilterApply(long memPtr) {
-        return PlatformCallbackUtils.clusterNodeFilterApply(envPtr, memPtr);
+        enter();
+
+        try {
+            return PlatformCallbackUtils.clusterNodeFilterApply(envPtr, memPtr);
+        }
+        finally {
+            leave();
+        }
+    }
+
+    /**
+     * Extension callback accepting single long argument and returning long result.
+     *
+     * @param typ Operation type.
+     * @param arg1 Argument 1.
+     * @return Long result.
+     */
+    public long extensionCallbackInLongOutLong(int typ, long arg1) {
+        enter();
+
+        try {
+            return PlatformCallbackUtils.extensionCallbackInLongOutLong(envPtr, typ, arg1);
+        }
+        finally {
+            leave();
+        }
+    }
+
+    /**
+     * Extension callback accepting two long arguments and returning long result.
+     *
+     * @param typ Operation type.
+     * @param arg1 Argument 1.
+     * @param arg2 Argument 2.
+     * @return Long result.
+     */
+    public long extensionCallbackInLongLongOutLong(int typ, long arg1, long arg2) {
+        enter();
+
+        try {
+            return PlatformCallbackUtils.extensionCallbackInLongLongOutLong(envPtr, typ, arg1, arg2);
+        }
+        finally {
+            leave();
+        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/d907afc6/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
index 7e9587f..804012c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
@@ -460,6 +460,27 @@ public class PlatformCallbackUtils {
     static native int clusterNodeFilterApply(long envPtr, long memPtr);
 
     /**
+     * Extension callback accepting single long argument and returning long result.
+     *
+     * @param envPtr Environment pointer.
+     * @param typ Operation type.
+     * @param arg1 Argument 1.
+     * @return Long result.
+     */
+    static native long extensionCallbackInLongOutLong(long envPtr, int typ, long arg1);
+
+    /**
+     * Extension callback accepting two long arguments and returning long result.
+     *
+     * @param envPtr Environment pointer.
+     * @param typ Operation type.
+     * @param arg1 Argument 1.
+     * @param arg2 Argument 2.
+     * @return Long result.
+     */
+    static native long extensionCallbackInLongLongOutLong(long envPtr, int typ, long arg1, long arg2);
+
+    /**
      * Private constructor.
      */
     private PlatformCallbackUtils() {


[58/82] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0dab4df3/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------


[11/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
index 62ae901..0f8d78b 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating portable object serialization error.
@@ -55,4 +54,4 @@ public class PortableException extends IgniteException {
     public PortableException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
index 9502a86..368e415 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.marshaller.portable.*;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Type and field ID mapper for portable objects. Ignite never writes full
@@ -53,4 +53,4 @@ public interface PortableIdMapper {
      * @return Field ID.
      */
     public int fieldId(int typeId, String fieldName);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
index 533d453..0098ec3 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that class needed for deserialization of portable object does not exist.
@@ -55,4 +55,4 @@ public class PortableInvalidClassException extends PortableException {
     public PortableInvalidClassException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
index 3ae2bd7..4270885 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
@@ -45,4 +45,4 @@ public interface PortableMarshalAware {
      * @throws PortableException In case of error.
      */
     public void readPortable(PortableReader reader) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
index 7697299..4ea808b 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
@@ -17,11 +17,9 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgnitePortables;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable type meta data. Metadata for portable types can be accessed from any of the
@@ -60,4 +58,4 @@ public interface PortableMetadata {
      * @return Affinity key field name.
      */
     @Nullable public String affinityKeyFieldName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
index c22892d..66b8f76 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.marshaller.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.TreeMap;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper for portable object in portable binary format. Once an object is defined as portable,
@@ -150,4 +151,4 @@ public interface PortableObject extends Serializable, Cloneable {
      * @return Copy of this portable object.
      */
     public PortableObject clone() throws CloneNotSupportedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
index 5764560..9189b28 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable protocol version.
@@ -38,4 +38,4 @@ public enum PortableProtocolVersion {
     @Nullable public static PortableProtocolVersion fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
index a704570..3bae2e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Raw reader for portable objects. Raw reader does not use field name hash codes, therefore,
@@ -230,4 +231,4 @@ public interface PortableRawReader {
      * @throws PortableException In case of error.
      */
     @Nullable public <T extends Enum<?>> T[] readEnumArray() throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
index e6efee5..53f4f92 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Raw writer for portable object. Raw writer does not write field name hash codes, therefore,
@@ -215,4 +216,4 @@ public interface PortableRawWriter {
      * @throws PortableException In case of error.
      */
     public <T extends Enum<?>> void writeEnumArray(T[] val) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
index 82dca0c..58f078d 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Reader for portable objects used in {@link PortableMarshalAware} implementations.
@@ -280,4 +281,4 @@ public interface PortableReader {
      * @return Raw reader.
      */
     public PortableRawReader rawReader();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
index 54b0937..90ee562 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.marshaller.portable.*;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Interface that allows to implement custom serialization logic for portable objects.
@@ -46,4 +46,4 @@ public interface PortableSerializer {
      * @throws PortableException In case of error.
      */
     public void readPortable(Object obj, PortableReader reader) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
index b221298..5e6e09d 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.portable.*;
-
-import java.sql.*;
-import java.util.*;
+import java.sql.Timestamp;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Defines configuration properties for a specific portable type. Providing per-type
@@ -194,4 +193,4 @@ public class PortableTypeConfiguration {
     @Override public String toString() {
         return S.toString(PortableTypeConfiguration.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
index 36fa608..0d7160f 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Writer for portable object used in {@link PortableMarshalAware} implementations.
@@ -262,4 +263,4 @@ public interface PortableWriter {
      * @return Raw writer.
      */
     public PortableRawWriter rawWriter();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
index 50ab5cb..1658440 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of grid cache name.
@@ -56,4 +60,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface CacheNameResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java b/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
index b75b796..ac7ef8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of current {@link org.apache.ignite.cache.store.CacheStoreSession}
@@ -38,4 +42,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface CacheStoreSessionResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
index 4b1ed4e..b83c945 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of current {@link org.apache.ignite.Ignite} instance.
@@ -60,4 +64,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface IgniteInstanceResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
index 681c88c..9e1a5e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.compute.ComputeJobContext} instance.
@@ -56,4 +60,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface JobContextResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
index dfac834..deaf882 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.compute.ComputeLoadBalancer}.
@@ -58,4 +62,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface LoadBalancerResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
index 3f68f73..dd6daf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.IgniteLogger}. Grid logger is provided to grid
@@ -82,4 +86,4 @@ public @interface LoggerResource {
      * @return Category name for the injected logger.
      */
     public String categoryName() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
index bf11e91..17b9aa7 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.resources;
 
-import javax.management.*;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.management.MBeanServer;
 
 /**
  * Annotates a field or a setter method for injection of {@link MBeanServer} resource. MBean server
@@ -62,4 +66,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface MBeanServerResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
index 7c22728..b23015c 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of Ignite service(s) by specified service name.
@@ -84,4 +88,4 @@ public @interface ServiceResource {
      * @return {@code True} if a sticky instance of a service proxy should be injected.
      */
     public boolean proxySticky() default false;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
index 38c0c88..8de591c 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of Spring ApplicationContext resource.
@@ -65,4 +69,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface SpringApplicationContextResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
index 4426637..f4c041e 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.resources;
 
-import java.io.*;
-import java.lang.annotation.*;
+import java.io.Serializable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of resource
@@ -109,4 +113,4 @@ public @interface SpringResource {
      * @return Resource bean name.
      */
     String resourceName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java b/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
index 30cb8fc..65946ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of
@@ -54,4 +58,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface TaskContinuousMapperResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java b/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
index 060288f..3292da1 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.compute.ComputeTaskSession} resource.
@@ -57,4 +61,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface TaskSessionResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/package-info.java b/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
index 9f9aefb..a9cfeec 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
@@ -19,4 +19,4 @@
  * Contains resource injection annotations. Annotations are used to inject resources
  * into user defined code such as grid tasks, grid jobs and SPI implementations.
  */
-package org.apache.ignite.resources;
+package org.apache.ignite.resources;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java b/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
index 4ce3ff9..4dcefc6 100644
--- a/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
@@ -17,10 +17,14 @@
 
 package org.apache.ignite.scheduler;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteFutureTimeoutException;
 
 /**
  * Future for cron-based scheduled execution. This future is returned
@@ -151,4 +155,4 @@ public interface SchedulerFuture<R> extends IgniteFuture<R> {
      * @throws IgniteException {@inheritDoc}
      */
     @Override public R get(long timeout, TimeUnit unit);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/Service.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/Service.java b/modules/core/src/main/java/org/apache/ignite/services/Service.java
index 4f927a3..60b977d 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/Service.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/Service.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.services;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * An instance of grid-managed service. Grid-managed services may be deployed from
@@ -117,4 +117,4 @@ public interface Service extends Serializable {
      *      {@link org.apache.ignite.IgniteServices#cancel(String)} method will be called.
      */
     public void execute(ServiceContext ctx) throws Exception;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
index fbc0e09..126ad47 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.services;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Managed service configuration. In addition to deploying managed services by
@@ -302,4 +301,4 @@ public class ServiceConfiguration implements Serializable {
 
         return S.toString(ServiceConfiguration.class, this, "svcCls", svcCls, "nodeFilterCls", nodeFilterCls);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
----------------------------------------------------------------------
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 2868c4a..8f10036 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
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.services;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Service execution context. Execution context is provided into {@link Service#execute(ServiceContext)}
@@ -65,4 +64,4 @@ public interface ServiceContext extends Serializable {
      * @return Affinity key, possibly {@code null}.
      */
     @Nullable public <K> K affinityKey();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
----------------------------------------------------------------------
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 927d778..94c0fd2 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
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.services;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Service deployment descriptor. Contains all service deployment configuration, and also
@@ -87,4 +87,4 @@ public interface ServiceDescriptor extends Serializable {
      * @return Map of number of service instances per node ID.
      */
     public Map<UUID, Integer> topologySnapshot();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
index 0c3746c..2473a9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * Result of joining node validation.
@@ -63,4 +63,4 @@ public class IgniteNodeValidationResult {
     public String sendMessage() {
         return sndMsg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java b/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
index 9cc241a..ad02e06 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Protocols supported by port processor.
@@ -45,4 +45,4 @@ public enum IgnitePortProtocol {
     @Nullable public static IgnitePortProtocol fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
index 0f6ed5c..3ab3b42 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface defines life-cycle of SPI implementation. Every SPI implementation should implement
@@ -121,4 +120,4 @@ public interface IgniteSpi {
      * @param clusterRestarted {@code True} if all cluster nodes restarted while client was disconnected.
      */
     public void onClientReconnected(boolean clusterRestarted);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 0d08171..cd46de4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -17,31 +17,47 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.resources.*;
-
-import org.jetbrains.annotations.*;
-
-import javax.management.*;
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.timeout.GridSpiTimeoutObject;
+import org.apache.ignite.internal.util.IgniteExceptionRegistry;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
 
 /**
  * This class provides convenient adapter for SPI implementations.
@@ -864,4 +880,4 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
             ((IgniteKernal)ignite0).context().timeout().removeTimeoutObject(new GridSpiTimeoutObject(obj));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
index 28c2d66..6a617a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  *  Closeable iterator.
@@ -36,4 +35,4 @@ public interface IgniteSpiCloseableIterator<T> extends Iterator<T>, AutoCloseabl
      * @throws IgniteCheckedException In case of error.
      */
     @Override public void close() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
----------------------------------------------------------------------
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 c3e62c8..9851e05 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates SPI configuration setters on whether or not it is optional.
@@ -34,4 +38,4 @@ public @interface IgniteSpiConfiguration {
      */
     @SuppressWarnings("JavaDoc")
     public boolean optional();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
----------------------------------------------------------------------
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 b9219c2..157d9ce 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * SPIs that have this annotation present will be checked for consistency within grid.
@@ -36,4 +40,4 @@ public @interface IgniteSpiConsistencyChecked {
      */
     @SuppressWarnings("JavaDoc")
     public boolean optional();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
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 611702b..899c222 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
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.UUID;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * SPI context provides common functionality for all SPI implementations.
@@ -327,4 +328,4 @@ public interface IgniteSpiContext {
      * @param c Timeout object.
      */
     public void removeTimeoutObject(IgniteSpiTimeoutObject c);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
index 91d691e..266e430 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown by SPI implementations.
@@ -54,4 +54,4 @@ public class IgniteSpiException extends IgniteException {
     public IgniteSpiException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
index df973b2..5c94a64 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.mxbean.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * This interface defines basic MBean for all SPI implementations. Every SPI implementation
@@ -82,4 +81,4 @@ public interface IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Name of the SPI.")
     public String getName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
index 2575710..b55ec92 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid SPI exception which may contain more than one failure.
@@ -100,4 +101,4 @@ public class IgniteSpiMultiException extends IgniteSpiException {
         for (Throwable t : causes)
             t.printStackTrace(s);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
----------------------------------------------------------------------
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 c0f5ec2..2ff06fb 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
@@ -17,7 +17,12 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates whether or not multiple instances of this SPI can be
@@ -38,4 +43,4 @@ public @interface IgniteSpiMultipleInstancesSupport {
      * started in the same VM.
      */
     @SuppressWarnings({"JavaDoc"}) public boolean value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
index 9308585..6b4eeaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates {@code NO-OP} SPI implementations. {@code NO-OP} implementations are empty implementations
@@ -29,4 +33,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface IgniteSpiNoop {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
index 0e34cf2..f5f7c21 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 
 /**
  * Kind of exception that is used when failure detection timeout is enabled for {@link TcpDiscoverySpi} or
@@ -40,4 +40,4 @@ public class IgniteSpiOperationTimeoutException extends IgniteCheckedException {
     public IgniteSpiOperationTimeoutException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
index f7d8daa..e17b0dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
@@ -16,10 +16,10 @@
  */
 package org.apache.ignite.spi;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.net.*;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Object that incorporates logic that determines a timeout value for the next network related operation and checks
@@ -99,4 +99,4 @@ public class IgniteSpiOperationTimeoutHelper {
         return e instanceof IgniteSpiOperationTimeoutException || e instanceof SocketTimeoutException ||
             X.hasCause(e, IgniteSpiOperationTimeoutException.class, SocketException.class);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
index 5682868..25b81e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This class provides convenient adapter for threads used by SPIs.
@@ -105,4 +105,4 @@ public abstract class IgniteSpiThread extends Thread {
     @Override public String toString() {
         return S.toString(IgniteSpiThread.class, this, "name", getName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
index 2344d3f..c40925d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ThreadFactory;
+import org.apache.ignite.IgniteLogger;
 
 /**
  * This class provides implementation of {@link ThreadFactory}  factory
@@ -58,4 +57,4 @@ public class IgniteSpiThreadFactory implements ThreadFactory {
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
index b3fc28e..94eff3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.lang.*;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Provides possibility to schedule delayed execution,
@@ -41,4 +41,4 @@ public interface IgniteSpiTimeoutObject {
      * Timeout callback.
      */
     public void onTimeout();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
index 73f015f..563c9aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
@@ -52,4 +52,4 @@ public class IgniteSpiVersionCheckException extends IgniteSpiException {
     public IgniteSpiVersionCheckException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
index 691b29c..9bb8f78 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
@@ -27,4 +27,4 @@ public interface CheckpointListener {
      * @param key Key of removed checkpoint.
      */
     public void onCheckpointRemoved(String key);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
index 30f2528..02159fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.spi.checkpoint;
 
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Checkpoint SPI provides an ability to save an intermediate job state. It can
@@ -103,4 +104,4 @@ public interface CheckpointSpi extends IgniteSpi {
      * @param lsnr The listener to set or {@code null}.
      */
     public void setCheckpointListener(CheckpointListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
index db6d1b0..fd5b64b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.spi.checkpoint.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-
-import static org.apache.ignite.events.EventType.*;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_EXPIRED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_REMOVED;
 
 /**
  * This class defines cache-based implementation for checkpoint SPI.
@@ -243,4 +250,4 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp
     @Override public String toString() {
         return S.toString(CacheCheckpointSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
index 976d2eb..f81be17 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.checkpoint.cache;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides general administrative and configuration information
@@ -35,4 +35,4 @@ public interface CacheCheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Cache name to be used by this SPI.")
     public String getCacheName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
----------------------------------------------------------------------
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 f25c46d..1d6c04d 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
@@ -17,16 +17,24 @@
 
 package org.apache.ignite.spi.checkpoint.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-
-import javax.sql.*;
-import java.sql.*;
-import java.text.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Time;
+import java.text.MessageFormat;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
 
 /**
  * This class defines JDBC checkpoint SPI implementation. All checkpoints are
@@ -872,4 +880,4 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
     @Override public void setCheckpointListener(CheckpointListener lsnr) {
         this.lsnr = lsnr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
index 5deec18..595b80b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.spi.checkpoint.jdbc;
 
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides general administrative and configuration information
@@ -114,4 +114,4 @@ public interface JdbcCheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Expiration date field type for checkpoint table.")
     public String getExpireDateFieldType();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
index 832d872..bf44e8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.spi.checkpoint.noop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation of {@link org.apache.ignite.spi.checkpoint.CheckpointSpi}. This is default implementation
@@ -69,4 +74,4 @@ public class NoopCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
     @Override public String toString() {
         return S.toString(NoopCheckpointSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
index 203fb8d..33c03e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Wrapper of all checkpoint that are saved to the file system. It
@@ -103,4 +102,4 @@ class SharedFsCheckpointData implements Serializable {
     @Override public String toString() {
         return S.toString(SharedFsCheckpointData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index 21880de..8b70969 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -17,17 +17,33 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines shared file system {@link org.apache.ignite.spi.checkpoint.CheckpointSpi} implementation for
@@ -485,4 +501,4 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
     @Override public String toString() {
         return S.toString(SharedFsCheckpointSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
index 2fc051f..193aa72 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides general administrative and configuration information
@@ -44,4 +43,4 @@ public interface SharedFsCheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Gets collection of all configured paths where checkpoints can be saved.")
     public Collection<String> getDirectoryPaths();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
index 65d926a..b37a775 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Helper class that keeps checkpoint expiration date and last file
@@ -104,4 +104,4 @@ class SharedFsTimeData {
     @Override public String toString() {
         return S.toString(SharedFsTimeData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
index 5f82115..3cf11f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
 
 /**
  * Implementation of {@link org.apache.ignite.spi.IgniteSpiThread} that takes care about outdated files.
@@ -233,4 +238,4 @@ class SharedFsTimeoutTask extends IgniteSpiThread {
     @Override public String toString() {
         return S.toString(SharedFsTimeoutTask.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
index 5d7ae36..b1698fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
@@ -17,11 +17,16 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
 
 /**
  * Utility class that helps to manage files. It provides read/write
@@ -92,4 +97,4 @@ final class SharedFsUtils {
             U.close(out, log);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
index 31fb0ae..549d066 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * Context for resolving collisions. This context contains collections of
@@ -59,4 +59,4 @@ public interface CollisionContext {
      * @return Collection of jobs that are currently in {@code held} state.
      */
     public Collection<CollisionJobContext> heldJobs();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
index f012a0f..f59c663 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * Listener to be set on {@link CollisionSpi} for notification of external
@@ -30,4 +30,4 @@ public interface CollisionExternalListener extends EventListener {
      * event occurs.
      */
     public void onExternalCollision();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
index ca7e85c..22f8ccc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.spi.collision;
 
-import org.apache.ignite.compute.*;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeTaskSession;
 
 /**
  * This interface defines set of operations that collision SPI implementation can perform on
@@ -75,4 +77,4 @@ public interface CollisionJobContext {
      *      otherwise.
      */
     public boolean cancel();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
index bb3b731..d82d9a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.collision;
 
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.spi.IgniteSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Collision SPI allows to regulate how grid jobs get executed when they arrive on a
@@ -82,4 +82,4 @@ public interface CollisionSpi extends IgniteSpi {
      * @param lsnr Listener for external collision events.
      */
     public void setExternalCollisionListener(@Nullable CollisionExternalListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
index 5bdab6f..bc4bce6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.spi.collision.fifoqueue;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
 
 /**
  * This class provides implementation for Collision SPI based on FIFO queue. Jobs are ordered
@@ -248,4 +255,4 @@ public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements Collision
     @Override public String toString() {
         return S.toString(FifoQueueCollisionSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
index b69a38d..40d47a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.collision.fifoqueue;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides access to the FIFO queue collision SPI configuration.
@@ -90,4 +90,4 @@ public interface FifoQueueCollisionSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Number of held jobs.")
     public int getCurrentHeldJobsNumber();
-}
+}
\ No newline at end of file


[07/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
----------------------------------------------------------------------
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 814c8a5..e661a2f 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
@@ -17,23 +17,27 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import java.util.Arrays;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.FactoryBuilder;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Store session listeners test.
@@ -392,4 +396,4 @@ public class CacheStoreSessionListenerLifecycleSelfTest extends GridCommonAbstra
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
index b14ac5f..d41a441 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
@@ -17,19 +17,25 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.Cache;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.CacheStoreBalancingWrapper;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Store test.
@@ -198,4 +204,4 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
index 5ff8c72..70fae9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -111,4 +111,4 @@ public class GridCacheLoadOnlyStoreAdapterSelfTest extends GridCacheAbstractSelf
             return i % 10 == 0 ? null : new T2<>(i, p[1]);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java
index 7e9c82e..c5ba78b 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.resources.CacheNameResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test store that generates objects on demand.
@@ -98,4 +99,4 @@ public class GridGeneratingTestStore implements CacheStore<String, String> {
     @Override public void sessionEnd(boolean commit) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
index a3a5717..4bf0785 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
@@ -17,20 +17,29 @@
 
 package org.apache.ignite.cache.store;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import java.util.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.cache.Cache;
+import javax.cache.expiry.CreatedExpiryPolicy;
+import javax.cache.expiry.Duration;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import javax.cache.integration.CompletionListenerFuture;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Test check that cache values removes from cache on expiry.
@@ -234,4 +243,4 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreMultitreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreMultitreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreMultitreadedSelfTest.java
index c9462c8..a662d4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreMultitreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreMultitreadedSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.h2.jdbcx.*;
+import org.h2.jdbcx.JdbcConnectionPool;
 
 /**
  * Test for JDBC POJO store from multiple threads.
@@ -32,4 +32,4 @@ public class CacheJdbcPojoStoreMultitreadedSelfTest
 
         return store;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 68a77dc..0ad2cad 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -17,27 +17,40 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.jdbc.dialect.*;
-import org.apache.ignite.cache.store.jdbc.model.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.cache.*;
-import org.h2.jdbcx.*;
-import org.springframework.beans.*;
-import org.springframework.beans.factory.xml.*;
-import org.springframework.context.support.*;
-import org.springframework.core.io.*;
-
-import javax.cache.integration.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect;
+import org.apache.ignite.cache.store.jdbc.dialect.JdbcDialect;
+import org.apache.ignite.cache.store.jdbc.model.Organization;
+import org.apache.ignite.cache.store.jdbc.model.OrganizationKey;
+import org.apache.ignite.cache.store.jdbc.model.Person;
+import org.apache.ignite.cache.store.jdbc.model.PersonComplexKey;
+import org.apache.ignite.cache.store.jdbc.model.PersonKey;
+import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.cache.GridAbstractCacheStoreSelfTest;
+import org.h2.jdbcx.JdbcConnectionPool;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.UrlResource;
 
 /**
  * Class for {@code PojoCacheStore} tests.
@@ -405,4 +418,4 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest<Cache
 
         assertNull(store.load(k));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java
index 9483545..757cedd 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java
@@ -17,32 +17,45 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.jdbc.model.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.springframework.beans.*;
-import org.springframework.beans.factory.xml.*;
-import org.springframework.context.support.*;
-import org.springframework.core.io.*;
-
-import java.net.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.store.jdbc.model.Organization;
+import org.apache.ignite.cache.store.jdbc.model.OrganizationKey;
+import org.apache.ignite.cache.store.jdbc.model.Person;
+import org.apache.ignite.cache.store.jdbc.model.PersonKey;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.UrlResource;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.testframework.GridTestUtils.runMultiThreaded;
+import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
 
 /**
  *
@@ -295,4 +308,4 @@ public abstract class CacheJdbcStoreAbstractMultithreadedSelfTest<T extends Cach
             }
         }, 8, "tx");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListenerSelfTest.java
index 64af249..237cfeb 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreSessionListenerSelfTest.java
@@ -17,16 +17,22 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.h2.jdbcx.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Map;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cache.store.CacheStoreSessionListenerAbstractSelfTest;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.h2.jdbcx.JdbcConnectionPool;
 
 /**
  * Tests for {@link CacheJdbcStoreSessionListener}.
@@ -172,4 +178,4 @@ public class CacheJdbcStoreSessionListenerSelfTest extends CacheStoreSessionList
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
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 72308ad..4396549 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
@@ -17,28 +17,37 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.apache.ignite.transactions.*;
-import org.jsr166.*;
-
-import javax.cache.configuration.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.Random;
+import java.util.TreeMap;
+import java.util.concurrent.Callable;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.testframework.GridTestUtils.runMultiThreaded;
+import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
 
 /**
  *
@@ -254,4 +263,4 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
             assertEquals(opened, closed);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreSelfTest.java
index 01b2081..7d0abd1 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreSelfTest.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.testframework.junits.cache.*;
-
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import org.apache.ignite.testframework.junits.cache.GridAbstractCacheStoreSelfTest;
 
 /**
  * Cache store test.
@@ -48,4 +49,4 @@ public class GridCacheJdbcBlobStoreSelfTest
     @Override protected CacheJdbcBlobStore<Object, Object> store() {
         return new CacheJdbcBlobStore<>();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
index f33ce14..1ba3002 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Organization.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.model;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Organization definition.
@@ -152,4 +152,3 @@ public class Organization implements Serializable {
             "]";
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
index 0a3b2f2..7d3a37a 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/OrganizationKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.model;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * OrganizationKey definition.
@@ -94,4 +94,3 @@ public class OrganizationKey implements Serializable {
             "]";
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
index 95c83b9..4d3714e 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.model;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Person definition.
@@ -176,4 +176,3 @@ public class Person implements Serializable {
             "]";
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonComplexKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonComplexKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonComplexKey.java
index debc2c5..c213e66 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonComplexKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonComplexKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.model;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * PersonComplexKey definition.
@@ -143,4 +143,4 @@ public class PersonComplexKey implements Serializable {
             ", cityId=" + cityId +
             "]";
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
index 930e542..a46c830 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/PersonKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.store.jdbc.model;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * PersonKey definition.
@@ -94,4 +94,3 @@ public class PersonKey implements Serializable {
             "]";
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 07cd1e6..f0f86ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -17,26 +17,48 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.IgfsEvent;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.igfs.IgfsImpl;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.events.EventType.EVTS_IGFS;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CLOSED_READ;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CLOSED_WRITE;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_READ;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_WRITE;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_PURGED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_RENAMED;
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
+import static org.apache.ignite.testframework.GridTestUtils.assertOneToOne;
 
 /**
  * Tests events, generated by {@link org.apache.ignite.IgniteFileSystem} implementation.
@@ -843,4 +865,4 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
             return e0.type() == evt && e0.path().equals(path);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
index a138a2a..22f427a 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest;
+import org.apache.ignite.internal.processors.igfs.IgfsEx;
+import org.apache.ignite.internal.processors.igfs.IgfsFileInfo;
+import org.apache.ignite.internal.processors.igfs.IgfsMetaManager;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * Fragmentizer abstract self test.
@@ -163,4 +169,4 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         grid(0).fileSystem("igfs").format();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
index 87de557..ebf91e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.igfs.IgfsImpl;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Tests fragmentizer work.
@@ -265,4 +266,4 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
         while(read < data.length)
             read += in.read(data, read, data.length - read);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
index cb7b63a..9cc5006 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteFileSystem;
 
 /**
  * Tests coordinator transfer from one node to other.
@@ -46,4 +46,4 @@ public class IgfsFragmentizerTopologySelfTest extends IgfsFragmentizerAbstractSe
             startGrid(0);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
index dec0bb6..eb0f383 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
@@ -17,18 +17,18 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link IgfsPath} self test.
@@ -159,4 +159,4 @@ public class IgfsPathSelfTest extends GridCommonAbstractTest {
             }
         }, cls, null);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
index abf6e89..1b13cf9 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.igfs;
 
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  *
@@ -48,4 +51,4 @@ public class IgfsTestInputGenerator {
     private static int read(long pos) {
         return (int)(pos % 116) + 10;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
index 0514ad9..dedc9c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
@@ -17,25 +17,49 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_STARTED;
 
 /**
  * Abstract test for {@link org.apache.ignite.cluster.ClusterGroup}
@@ -774,4 +798,4 @@ public abstract class ClusterGroupAbstractTest extends GridCommonAbstractTest im
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
index 297a590..bba83b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test for {@link ClusterGroup#forHost(String, String...)}.
@@ -138,4 +140,4 @@ public class ClusterGroupHostsSelfTest extends GridCommonAbstractTest {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
index ceb9bef..d916d78 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test for {@link ClusterGroup}.
@@ -248,4 +251,4 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
 
         return even ? cnt - 1 : cnt - 2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
index 3c52d97..7c5d201 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
@@ -17,18 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  * Tests for projection metrics.
@@ -232,4 +240,4 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest {
             latch.await();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 3d0df7c..d684446 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -17,25 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.messaging.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.messaging.MessagingListenActor;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
 
 /**
  * Grid node metrics self test.
@@ -285,4 +286,4 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
     private static class TestInternalTask extends GridTestTask {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
index 22e878b..777f843 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
@@ -17,20 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests affinity mapping when {@link AffinityKeyMapper} is used.
@@ -160,4 +163,4 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest {
             // This mapper is stateless and needs no initialization logic.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
index 8c7ef46..f96b6c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
@@ -17,23 +17,28 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.config.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestExternalClassLoader;
+import org.apache.ignite.testframework.config.GridTestProperties;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests affinity and affinity mapper P2P loading.
@@ -201,4 +206,4 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
             stopGrid(3);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index 7bc8dd6..4c0e2e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -17,20 +17,24 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Tests affinity mapping.
@@ -116,4 +120,4 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
             }
         });
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java
index 88c97a7..64fb988 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.spi.failover.FailoverContext;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Always failover SPI test.
@@ -156,4 +164,4 @@ public class GridAlwaysFailoverSpiFailSelfTest extends GridCommonAbstractTest {
             throw this.<IgniteException>argument(0);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelOnGridStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelOnGridStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelOnGridStopSelfTest.java
index 1270080..75affc4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelOnGridStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelOnGridStopSelfTest.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Test task cancellation on grid stop.
@@ -103,4 +108,4 @@ public class GridCancelOnGridStopSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
index c9b2974..7b5568b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
@@ -17,19 +17,30 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Cancel unused job test.
@@ -210,4 +221,4 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest {
             cancelCnt++;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
index 1538a96..8b27b79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
@@ -17,20 +17,37 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Cancelled jobs metrics self test.
@@ -211,4 +228,4 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest {
                 tmp.onExternalCollision();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
index 2dd711f..9e03333 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
@@ -17,15 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.GridTestJob;
+import org.apache.ignite.GridTestTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Collision job context test.
@@ -110,4 +118,4 @@ public class GridCollisionJobsContextSelfTest extends GridCommonAbstractTest {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java
index fce597b..100ed2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Grid basic communication test.
@@ -118,4 +121,4 @@ public class GridCommunicationSelfTest extends GridCommonAbstractTest {
             return buf.toString();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
index 8f0aeab..dc4592e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
@@ -17,17 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobAfterSend;
+import org.apache.ignite.compute.ComputeJobBeforeFailover;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeUserUndeclaredException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test for various job callback annotations.
@@ -212,4 +224,4 @@ public class GridContinuousJobAnnotationSelfTest extends GridCommonAbstractTest
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
index 5e50456..5bbbd85 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
@@ -17,13 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Test continuous mapper with siblings.
@@ -141,4 +154,4 @@ public class GridContinuousJobSiblingsSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
----------------------------------------------------------------------
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 d22dcec..98e3c5a 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
@@ -17,16 +17,40 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionAttributeListener;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 import org.apache.ignite.lang.IgniteClosure;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.resources.TaskSessionResource;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
 
 /**
  * Continuous task test.
@@ -459,4 +483,4 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest {
             return results == null ? 0 : results.size();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
index 33d99a4..cabcba1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * Task deployment tests.
@@ -118,4 +123,4 @@ public class GridDeploymentMultiThreadedSelfTest extends GridCommonAbstractTest
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java
index a159e4d..7eb23fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java
@@ -17,21 +17,32 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED;
+import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED;
 
 /**
  * Task deployment tests.
@@ -531,4 +542,4 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest {
             return undepCnt;
         }
     }
-}
+}
\ No newline at end of file


[76/82] [abbrv] ignite git commit: Platforms: reworked PlatformCacheEntryProcessor interface.

Posted by sb...@apache.org.
Platforms: reworked PlatformCacheEntryProcessor interface.


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

Branch: refs/heads/ignite-1093-2
Commit: 0e25f55cfa33ae4af7c52bd4e2ee49297ef623f4
Parents: 980a934
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 11:41:28 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 11:41:28 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/PlatformContext.java    |   3 +-
 .../cache/PlatformCacheEntryProcessor.java      |  27 +++
 .../cache/PlatformCacheEntryProcessor.java      | 220 -------------------
 .../cache/PlatformCacheEntryProcessorImpl.java  | 220 +++++++++++++++++++
 4 files changed, 249 insertions(+), 221 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0e25f55c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index 4c70360..cea8326 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.portable.PortableRawReaderEx;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
 import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
+import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessor;
 import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery;
 import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
 import org.apache.ignite.internal.processors.platform.cluster.PlatformClusterNodeFilter;
@@ -248,7 +249,7 @@ public interface PlatformContext {
      * @param ptr Pointer.
      * @return Entry processor.
      */
-    public CacheEntryProcessor createCacheEntryProcessor(Object proc, long ptr);
+    public PlatformCacheEntryProcessor createCacheEntryProcessor(Object proc, long ptr);
 
     /**
      * Create cache entry filter.

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e25f55c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java
new file mode 100644
index 0000000..3d8022f
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.cache;
+
+import org.apache.ignite.cache.CacheEntryProcessor;
+
+/**
+ * Platform cache entry processor marker interface.
+ */
+public interface PlatformCacheEntryProcessor extends CacheEntryProcessor {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e25f55c/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java
deleted file mode 100644
index fd14632..0000000
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessor.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform.cache;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import javax.cache.processor.EntryProcessorException;
-import javax.cache.processor.MutableEntry;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheEntryProcessor;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.portable.PortableRawReaderEx;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.platform.PlatformContext;
-import org.apache.ignite.internal.processors.platform.PlatformProcessor;
-import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream;
-import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
-import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
-import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-/**
- * Interop cache entry processor. Delegates processing to native platform.
- */
-public class PlatformCacheEntryProcessor<K, V, T> implements CacheEntryProcessor<K, V, T>, Externalizable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Indicates that entry has not been modified  */
-    private static final byte ENTRY_STATE_INTACT = 0;
-
-    /** Indicates that entry value has been set  */
-    private static final byte ENTRY_STATE_VALUE_SET = 1;
-
-    /** Indicates that remove has been called on an entry  */
-    private static final byte ENTRY_STATE_REMOVED = 2;
-
-    /** Indicates error in processor that is written as portable.  */
-    private static final byte ENTRY_STATE_ERR_PORTABLE = 3;
-
-    /** Indicates error in processor that is written as string.  */
-    private static final byte ENTRY_STATE_ERR_STRING = 4;
-
-    /** Native portable processor */
-    private Object proc;
-
-    /** Pointer to processor in the native platform. */
-    private transient long ptr;
-
-    /**
-     * {@link java.io.Externalizable} support.
-     */
-    public PlatformCacheEntryProcessor() {
-        // No-op.
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param proc Native portable processor
-     * @param ptr Pointer to processor in the native platform.
-     */
-    public PlatformCacheEntryProcessor(Object proc, long ptr) {
-        this.proc = proc;
-        this.ptr = ptr;
-    }
-
-    /** {@inheritDoc} */
-    @Override public T process(MutableEntry<K, V> entry, Object... arguments) throws EntryProcessorException {
-        try {
-            IgniteKernal ignite = (IgniteKernal)entry.unwrap(Ignite.class);
-
-            PlatformProcessor interopProc;
-
-            try {
-                interopProc = PlatformUtils.platformProcessor(ignite);
-            }
-            catch (IllegalStateException ex){
-                throw new EntryProcessorException(ex);
-            }
-
-            interopProc.awaitStart();
-
-            return execute0(interopProc.context(), entry);
-        }
-        catch (IgniteCheckedException e) {
-            throw U.convertException(e);
-        }
-    }
-
-    /**
-     * Executes interop entry processor on a given entry, updates entry and returns result.
-     *
-     * @param ctx Context.
-     * @param entry Entry.
-     * @return Processing result.
-     * @throws org.apache.ignite.IgniteCheckedException
-     */
-    private T execute0(PlatformContext ctx, MutableEntry<K, V> entry)
-        throws IgniteCheckedException {
-        try (PlatformMemory outMem = ctx.memory().allocate()) {
-            PlatformOutputStream out = outMem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            writeEntryAndProcessor(entry, writer);
-
-            out.synchronize();
-
-            try (PlatformMemory inMem = ctx.memory().allocate()) {
-                PlatformInputStream in = inMem.input();
-
-                ctx.gateway().cacheInvoke(outMem.pointer(), inMem.pointer());
-
-                in.synchronize();
-
-                PortableRawReaderEx reader = ctx.reader(in);
-
-                return readResultAndUpdateEntry(ctx, entry, reader);
-            }
-        }
-    }
-
-    /**
-     * Writes mutable entry and entry processor to the stream.
-     *
-     * @param entry Entry to process.
-     * @param writer Writer.
-     */
-    private void writeEntryAndProcessor(MutableEntry<K, V> entry, PortableRawWriterEx writer) {
-        writer.writeObject(entry.getKey());
-        writer.writeObject(entry.getValue());
-
-        if (ptr != 0) {
-            // Execute locally - we have a pointer to native processor.
-            writer.writeBoolean(true);
-            writer.writeLong(ptr);
-        }
-        else {
-            // We are on a remote node. Send processor holder back to native.
-            writer.writeBoolean(false);
-            writer.writeObject(proc);
-        }
-    }
-
-    /**
-     * Reads processing result from stream, updates mutable entry accordingly, and returns the result.
-     *
-     * @param entry Mutable entry to update.
-     * @param reader Reader.
-     * @return Entry processing result
-     * @throws javax.cache.processor.EntryProcessorException If processing has failed in user code.
-     */
-    @SuppressWarnings("unchecked")
-    private T readResultAndUpdateEntry(PlatformContext ctx, MutableEntry<K, V> entry, PortableRawReaderEx reader) {
-        byte state = reader.readByte();
-
-        switch (state) {
-            case ENTRY_STATE_VALUE_SET:
-                entry.setValue((V)reader.readObject());
-
-                break;
-
-            case ENTRY_STATE_REMOVED:
-                entry.remove();
-
-                break;
-
-            case ENTRY_STATE_ERR_PORTABLE:
-                // Full exception
-                Object nativeErr = reader.readObjectDetached();
-
-                assert nativeErr != null;
-
-                throw new EntryProcessorException("Failed to execute native cache entry processor.",
-                    ctx.createNativeException(nativeErr));
-
-            case ENTRY_STATE_ERR_STRING:
-                // Native exception was not serializable, we have only message.
-                String errMsg = reader.readString();
-
-                assert errMsg != null;
-
-                throw new EntryProcessorException("Failed to execute native cache entry processor: " + errMsg);
-
-            default:
-                assert state == ENTRY_STATE_INTACT;
-        }
-
-        return (T)reader.readObject();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject(proc);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        proc = in.readObject();
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e25f55c/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
new file mode 100644
index 0000000..16124fe
--- /dev/null
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
@@ -0,0 +1,220 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.cache;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.portable.PortableRawReaderEx;
+import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.processors.platform.PlatformContext;
+import org.apache.ignite.internal.processors.platform.PlatformProcessor;
+import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+/**
+ * Platform cache entry processor. Delegates processing to native platform.
+ */
+public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProcessor, Externalizable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Indicates that entry has not been modified  */
+    private static final byte ENTRY_STATE_INTACT = 0;
+
+    /** Indicates that entry value has been set  */
+    private static final byte ENTRY_STATE_VALUE_SET = 1;
+
+    /** Indicates that remove has been called on an entry  */
+    private static final byte ENTRY_STATE_REMOVED = 2;
+
+    /** Indicates error in processor that is written as portable.  */
+    private static final byte ENTRY_STATE_ERR_PORTABLE = 3;
+
+    /** Indicates error in processor that is written as string.  */
+    private static final byte ENTRY_STATE_ERR_STRING = 4;
+
+    /** Native portable processor */
+    private Object proc;
+
+    /** Pointer to processor in the native platform. */
+    private transient long ptr;
+
+    /**
+     * {@link java.io.Externalizable} support.
+     */
+    public PlatformCacheEntryProcessorImpl() {
+        // No-op.
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param proc Native portable processor
+     * @param ptr Pointer to processor in the native platform.
+     */
+    public PlatformCacheEntryProcessorImpl(Object proc, long ptr) {
+        this.proc = proc;
+        this.ptr = ptr;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object process(MutableEntry entry, Object... args)
+        throws EntryProcessorException {
+        try {
+            IgniteKernal ignite = (IgniteKernal)entry.unwrap(Ignite.class);
+
+            PlatformProcessor interopProc;
+
+            try {
+                interopProc = PlatformUtils.platformProcessor(ignite);
+            }
+            catch (IllegalStateException ex){
+                throw new EntryProcessorException(ex);
+            }
+
+            interopProc.awaitStart();
+
+            return execute0(interopProc.context(), entry);
+        }
+        catch (IgniteCheckedException e) {
+            throw U.convertException(e);
+        }
+    }
+
+    /**
+     * Executes interop entry processor on a given entry, updates entry and returns result.
+     *
+     * @param ctx Context.
+     * @param entry Entry.
+     * @return Processing result.
+     * @throws org.apache.ignite.IgniteCheckedException
+     */
+    private Object execute0(PlatformContext ctx, MutableEntry entry)
+        throws IgniteCheckedException {
+        try (PlatformMemory outMem = ctx.memory().allocate()) {
+            PlatformOutputStream out = outMem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            writeEntryAndProcessor(entry, writer);
+
+            out.synchronize();
+
+            try (PlatformMemory inMem = ctx.memory().allocate()) {
+                PlatformInputStream in = inMem.input();
+
+                ctx.gateway().cacheInvoke(outMem.pointer(), inMem.pointer());
+
+                in.synchronize();
+
+                PortableRawReaderEx reader = ctx.reader(in);
+
+                return readResultAndUpdateEntry(ctx, entry, reader);
+            }
+        }
+    }
+
+    /**
+     * Writes mutable entry and entry processor to the stream.
+     *
+     * @param entry Entry to process.
+     * @param writer Writer.
+     */
+    private void writeEntryAndProcessor(MutableEntry entry, PortableRawWriterEx writer) {
+        writer.writeObject(entry.getKey());
+        writer.writeObject(entry.getValue());
+
+        if (ptr != 0) {
+            // Execute locally - we have a pointer to native processor.
+            writer.writeBoolean(true);
+            writer.writeLong(ptr);
+        }
+        else {
+            // We are on a remote node. Send processor holder back to native.
+            writer.writeBoolean(false);
+            writer.writeObject(proc);
+        }
+    }
+
+    /**
+     * Reads processing result from stream, updates mutable entry accordingly, and returns the result.
+     *
+     * @param entry Mutable entry to update.
+     * @param reader Reader.
+     * @return Entry processing result
+     * @throws javax.cache.processor.EntryProcessorException If processing has failed in user code.
+     */
+    @SuppressWarnings("unchecked")
+    private Object readResultAndUpdateEntry(PlatformContext ctx, MutableEntry entry, PortableRawReaderEx reader) {
+        byte state = reader.readByte();
+
+        switch (state) {
+            case ENTRY_STATE_VALUE_SET:
+                entry.setValue(reader.readObject());
+
+                break;
+
+            case ENTRY_STATE_REMOVED:
+                entry.remove();
+
+                break;
+
+            case ENTRY_STATE_ERR_PORTABLE:
+                // Full exception
+                Object nativeErr = reader.readObjectDetached();
+
+                assert nativeErr != null;
+
+                throw new EntryProcessorException("Failed to execute native cache entry processor.",
+                    ctx.createNativeException(nativeErr));
+
+            case ENTRY_STATE_ERR_STRING:
+                // Native exception was not serializable, we have only message.
+                String errMsg = reader.readString();
+
+                assert errMsg != null;
+
+                throw new EntryProcessorException("Failed to execute native cache entry processor: " + errMsg);
+
+            default:
+                assert state == ENTRY_STATE_INTACT;
+        }
+
+        return reader.readObject();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeExternal(ObjectOutput out) throws IOException {
+        out.writeObject(proc);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        proc = in.readObject();
+    }
+}
\ No newline at end of file


[31/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 9005541..76aaf72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -17,22 +17,40 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -446,4 +464,4 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
     private GridDhtCacheAdapter<K, V> cache() {
         return (GridDhtCacheAdapter<K, V>)cctx.cache();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtInvalidPartitionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtInvalidPartitionException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtInvalidPartitionException.java
index 2b5e6da..5ef4744 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtInvalidPartitionException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtInvalidPartitionException.java
@@ -48,4 +48,4 @@ public class GridDhtInvalidPartitionException extends RuntimeException {
     @Override public String toString() {
         return getClass() + " [part=" + part + ", msg=" + getMessage() + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 87c7f0e..d0e2b5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -17,32 +17,51 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicStampedReference;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheSwapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.GridCircularBuffer;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.GPC;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.NotNull;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_UNLOADED;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.EVICTED;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.RENTING;
 
 /**
  * Key partition.
@@ -716,4 +735,4 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
             "createTime", U.format(createTime),
             "mapPubSize", mapPubSize);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index e160529..4275623 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -17,32 +17,62 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheMappedVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_LOADED;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_PRELOAD;
 
 /**
  * Cache lock future.
@@ -1206,4 +1236,4 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean>
             return S.toString(MiniFuture.class, this, "nodeId", node.id(), "super", super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index de4c9ef..cf4b581 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -17,23 +17,34 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * DHT lock request.
@@ -523,4 +534,4 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
     @Override public String toString() {
         return S.toString(GridDhtLockRequest.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
index 505a63c..f79156b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -17,21 +17,27 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * DHT cache lock response.
@@ -285,4 +291,4 @@ public class GridDhtLockResponse extends GridDistributedLockResponse {
     @Override public String toString() {
         return S.toString(GridDhtLockResponse.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtOffHeapCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtOffHeapCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtOffHeapCacheEntry.java
index 1191d83..8cb3fa4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtOffHeapCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtOffHeapCacheEntry.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 
 /**
  * Replicated cache entry for off-heap tiered or off-heap values modes.
@@ -60,4 +63,4 @@ public class GridDhtOffHeapCacheEntry extends GridDhtCacheEntry {
     @Override protected void offHeapPointer(long valPtr) {
         this.valPtr = valPtr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionState.java
index d8c1a91..7b49369 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionState.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Partition states.
@@ -52,4 +52,4 @@ public enum GridDhtPartitionState {
     public boolean active() {
         return this != EVICTED;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
index 7b08510..d4ea3d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * DHT partition topology.
@@ -222,4 +226,4 @@ public interface GridDhtPartitionTopology {
      * @param threshold Threshold for number of entries.
      */
     public void printMemoryStats(int threshold);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 8973dcd..5e183e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -17,25 +17,44 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridAtomicLong;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.EVICTED;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.RENTING;
 
 /**
  * Partition topology.
@@ -1301,4 +1320,4 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java
index 207c7f5..756326e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
 
 import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.RENTING;
 
@@ -289,4 +291,4 @@ public class GridDhtPartitionsReservation implements GridReservable {
 
         return result;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
index 57e3e33..c11a3d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
 
 /**
  * Future that implements a barrier after which dht topology is safe to use. Topology is considered to be
@@ -43,4 +43,4 @@ public interface GridDhtTopologyFuture extends IgniteInternalFuture<AffinityTopo
      * @return valid ot not.
      */
     public boolean isCacheTopologyValid(GridCacheContext cctx);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 4f081bf..d81b72c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -17,33 +17,69 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheLockTimeoutException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxRemote;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearUnlockRequest;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
 
 /**
  * Base class for transactional DHT caches.
@@ -1590,4 +1626,4 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
         if (nearEntry != null)
             nearEntry.markObsolete(ctx.versions().next());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 9aa9c17..a7ec20f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -17,26 +17,36 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
 
 /**
  *
@@ -572,4 +582,4 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
             return S.toString(MiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index f2b5317..a9cb299 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -17,20 +17,24 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Near transaction finish request.
@@ -397,4 +401,4 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
     @Override public byte fieldsCount() {
         return 27;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index c6ac483..d696c05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * DHT transaction finish response.
@@ -127,4 +127,4 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
     @Override public byte fieldsCount() {
         return 6;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 7da6e07..b23b3e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -17,29 +17,46 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheMappedVersion;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
 
 /**
  * Replicated user transaction.
@@ -683,4 +700,4 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
     @Override public String toString() {
         return GridToStringBuilder.toString(GridDhtTxLocal.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index b50a010..194da15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -17,31 +17,58 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.transactions.TransactionState.COMMITTED;
+import static org.apache.ignite.transactions.TransactionState.COMMITTING;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
+import static org.apache.ignite.transactions.TransactionState.PREPARING;
+import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK;
+import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK;
+import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
 
 /**
  * Replicated user transaction.
@@ -858,4 +885,4 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
         return GridToStringBuilder.toString(GridDhtTxLocalAdapter.class, this, "nearNodes", nearMap.keySet(),
             "dhtNodes", dhtMap.keySet(), "explicitLock", explicitLock, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
index ba2c35f..55cbe96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
@@ -17,13 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * DHT transaction mapping.
@@ -166,4 +171,4 @@ public class GridDhtTxMapping {
                 this.backups.add(n.id());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 4c39476..b5211ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -17,34 +17,75 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.transactions.TransactionState.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_LOADED;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
+import static org.apache.ignite.transactions.TransactionState.PREPARED;
 
 /**
  *
@@ -1416,4 +1457,4 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
             return S.toString(MiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 7a7769d..5f9443b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -17,23 +17,32 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * DHT prepare request.
@@ -545,4 +554,4 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
     @Override public byte fieldsCount() {
         return 35;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index da03521..d903165 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -17,20 +17,30 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * DHT transaction prepare response.
@@ -357,4 +367,4 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
     @Override public byte fieldsCount() {
         return 14;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index ae13a10..2ff34a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -17,24 +17,35 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
+import java.io.Externalizable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxRemoteAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedHashMap;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
 
 /**
  * Transaction created by system implicitly on remote nodes.
@@ -323,4 +334,4 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
     @Override public String toString() {
         return GridToStringBuilder.toString(GridDhtTxRemote.class, this, "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index eedcdb4..e18dc33 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * DHT cache unlock request.
@@ -154,4 +157,4 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
     @Override public byte fieldsCount() {
         return 9;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnreservedPartitionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnreservedPartitionException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnreservedPartitionException.java
index d824a47..da76272 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnreservedPartitionException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnreservedPartitionException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 
 /**
  * Exception that is thrown when a partition reservation failed.
@@ -63,4 +63,4 @@ public class GridDhtUnreservedPartitionException extends IgniteCheckedException
     @Override public String toString() {
         return getClass() + " [part=" + part + ", msg=" + getMessage() + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
index 098ec97..ef6612b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.lang.GridTriple;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Empty cache map that will never store any entries.
@@ -115,4 +119,4 @@ public class GridNoStorageCacheMap extends GridCacheConcurrentMap {
     @Override public String toString() {
         return S.toString(GridNoStorageCacheMap.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 6e39672..82ff69f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -17,27 +17,55 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridFutureRemapTimeoutObject;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NEAR_GET_MAX_REMAPS;
 
 /**
  * Colocated get future.
@@ -761,4 +789,4 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
             return S.toString(MiniFuture.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
index 326b077..51f22bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
@@ -32,4 +32,4 @@ public interface GridReservable {
      * Releases.
      */
     public void release();
-}
+}
\ No newline at end of file


[46/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
index 73a3076..bda1bef 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
@@ -17,19 +17,34 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientAuthenticationRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestParser;
+import org.apache.ignite.internal.util.nio.GridNioAsyncNotifyFilter;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -278,4 +293,4 @@ public class ClientTestRestServer {
             return marsh;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java
index 8de945a..867c252 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.Cache;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.lang.IgniteBiInClosure;
 
 /**
  * Simple HashMap based cache store emulation.
@@ -50,4 +50,4 @@ public class HashMapStore extends CacheStoreAdapter {
     @Override public void delete(Object key) {
         map.remove(key);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java
index 2345fe0..87ba73c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java
@@ -17,11 +17,17 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.compute.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
-import java.util.*;
-
-import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
+import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT;
 
 /**
  * Test task, that sleeps for 10 seconds in split and returns
@@ -63,4 +69,4 @@ public class SleepTestTask extends ComputeTaskSplitAdapter<String, Integer> {
 
         return WAIT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java
index a35d806..3686278 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java
@@ -17,10 +17,14 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
 /**
  * Adapter for {@link org.apache.ignite.compute.ComputeTaskSplitAdapter}
@@ -67,4 +71,4 @@ public abstract class TaskSingleJobSplitAdapter<T, R> extends ComputeTaskSplitAd
      *      {@link org.apache.ignite.compute.ComputeTask#result(org.apache.ignite.compute.ComputeJobResult, List)} method into task on caller node.
      */
     protected abstract Object executeJob(int gridSize, T arg);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 9f177d7..bd7ca71 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import junit.framework.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.processors.rest.handlers.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import junit.framework.TestCase;
+import org.apache.ignite.internal.client.GridClientCacheFlag;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnection;
+import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler;
+import org.apache.ignite.internal.util.typedef.F;
 
-import java.util.*;
-
-import static org.apache.ignite.internal.client.GridClientCacheFlag.*;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES;
 
 /**
  * Tests conversions between GridClientCacheFlag.
@@ -74,4 +75,4 @@ public class ClientCacheFlagsCodecTest extends TestCase {
 
         assertEquals(length > 0, out);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java
index e120005..7777f33 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.testframework.junits.common.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
 
 /**
  * Simple unit test for GridClientComputeImpl which checks method parameters.
@@ -164,4 +166,4 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest {
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: ip");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java
index 9de9a62..1638f31 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.testframework.junits.common.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.client.GridClientData;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import java.util.concurrent.*;
-
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
 
 /**
  * Simple unit test for GridClientDataImpl which checks method parameters.
@@ -265,4 +264,4 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest {
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: key");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java
index daa9445..67df048 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientFutureTimeoutException;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Grid client future implementation self test.
@@ -112,4 +114,4 @@ public class ClientFutureAdapterSelfTest extends GridCommonAbstractTest {
 
         info("Time consumption for " + chainSize + " chained futures: " + (System.currentTimeMillis() - start));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java
index 8e981d1..55aadfd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java
@@ -17,19 +17,32 @@
 
 package org.apache.ignite.internal.client.impl;
 
-import org.apache.commons.io.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.springframework.context.support.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.client.GridClientConfiguration.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.LineIterator;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientDataConfiguration;
+import org.apache.ignite.internal.client.GridClientPartitionAffinity;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+
+import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_MAX_CONN_IDLE_TIME;
+import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_TOP_REFRESH_FREQ;
 
 /**
  * Properties-based configuration self test.
@@ -229,4 +242,4 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes
         assertEquals(null, cfg.getSslContextFactory(), null);
         assertEquals(DFLT_TOP_REFRESH_FREQ, cfg.getTopologyRefreshFrequency());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
index a2e7c38..ef18a29 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -17,18 +17,27 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Tests the REST client-server connectivity with various configurations.
@@ -314,4 +323,4 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr
             return s.matches("\\d+\\.\\d+\\.\\d+\\.\\d+");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index 66f266a..5e5a68d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -17,40 +17,70 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientDataConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPartitionAffinity;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridClientTopologyListener;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionable;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests basic client behavior with multiple nodes.
@@ -497,4 +527,4 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
                 assertTrue("Invalid tx flags: " + t, t.syncCommit());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index d4758d5..125603e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -17,31 +17,65 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import junit.framework.*;
-import net.sf.json.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.configuration.Factory;
+import junit.framework.Assert;
+import net.sf.json.JSON;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONSerializer;
+import net.sf.json.JsonConfig;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.ConnectorMessageInterceptor;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientClosedException;
+import org.apache.ignite.internal.client.GridClientCompute;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientData;
+import org.apache.ignite.internal.client.GridClientDataConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientFuture;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientPredicate;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Tests for Java client.
@@ -684,4 +718,4 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
             map.remove(key);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
----------------------------------------------------------------------
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 e7705df..68816d1 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
@@ -17,20 +17,33 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer;
+import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.HOST;
+import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.REST_TCP_PORT_BASE;
+import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.TOP_REFRESH_FREQ;
 
 /**
  *
@@ -189,4 +202,4 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest {
             return ignite.cluster().localNode().id().toString();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java
index 63f5945..5fcf802 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.util.typedef.G;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Tests the REST client-server TCP connectivity with various configurations.
@@ -72,4 +73,4 @@ public class ClientTcpConnectivitySelfTest extends ClientAbstractConnectivitySel
     @Override protected GridClientProtocol protocol() {
         return GridClientProtocol.TCP;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java
index ed374dc..087701b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientProtocol;
 
 /**
  *
@@ -52,4 +55,4 @@ public class ClientTcpDirectMultiNodeSelfTest extends ClientAbstractMultiNodeSel
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java
index 8752538..f47ef0a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
-
-import java.util.*;
+import java.util.Collections;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
 
 /**
  *
@@ -55,4 +56,4 @@ public class ClientTcpDirectSelfTest extends ClientAbstractSelfTest {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java
index 9cb1a7b..f9c196f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.GridClientProtocol;
 
 /**
  * Test for TCP binary rest protocol.
@@ -32,4 +32,4 @@ public class ClientTcpMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTest
     @Override protected String serverAddress() {
         return HOST + ":" + REST_TCP_PORT_BASE;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java
index 0042bf7..e72da34 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
 
 /**
  * Tests TCP protocol.
@@ -43,4 +43,4 @@ public class ClientTcpSelfTest extends ClientAbstractSelfTest {
     @Override protected GridSslContextFactory sslContextFactory() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
index 12d49e3..a42328b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -59,4 +62,4 @@ public class ClientTcpSslDirectMultiNodeSelfTest extends ClientAbstractMultiNode
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java
index aec7b22..71fa084 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.testframework.*;
-
-import java.util.*;
+import java.util.Collections;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -56,4 +57,4 @@ public class ClientTcpSslDirectSelfTest extends ClientAbstractSelfTest {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java
index 56355f7..d6ce77f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.testframework.*;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Tests binary tcp protocol with SSL on multiple nodes.
@@ -39,4 +39,4 @@ public class ClientTcpSslMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTe
     @Override protected GridSslContextFactory sslContextFactory() {
         return GridTestUtils.sslContextFactory();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java
index b39d651..dd7f14b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.testframework.*;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Tests TCP binary protocol with client when SSL is enabled.
@@ -44,4 +44,4 @@ public class ClientTcpSslSelfTest extends ClientAbstractSelfTest {
     @Override protected GridSslContextFactory sslContextFactory() {
         return GridTestUtils.sslContextFactory();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
index fda7e99..e70df53 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
@@ -17,12 +17,20 @@
 
 package org.apache.ignite.internal.client.integration;
 
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.client.GridClientCacheMode;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientNodeMetrics;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridClientTopologyListener;
+import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Test for TCP binary rest protocol with unreachable address.
@@ -127,4 +135,4 @@ public class ClientTcpUnreachableMultiNodeSelfTest extends ClientTcpMultiNodeSel
                 ((GridClientTopologyListener)b).onNodeRemoved(node);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
index ed0d720..ba52366 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
@@ -17,22 +17,38 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.client.GridClientProtocol.*;
-import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientDisconnectedException;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.GridServerUnreachableException;
+import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
+import static org.apache.ignite.internal.client.GridClientProtocol.TCP;
+import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.BINARY_PORT;
+import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.HOST;
+import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.JETTY_PORT;
+import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.REST_JETTY_CFG;
 
 /**
  *
@@ -272,4 +288,4 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest {
             return results.get(0).getData();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
index e82393b..d5eee7f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
 
 /**
  * Test routers factory.
@@ -104,4 +107,4 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest {
             GridRouterFactory.stopAllRouters();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
index 7bf8ddb..f0ce7fb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.integration.*;
-import org.apache.ignite.internal.client.router.impl.*;
-import org.apache.ignite.logger.log4j.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientNode;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.integration.ClientAbstractSelfTest;
+import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.logger.log4j.Log4JLogger;
 
 /**
  * Abstract base class for http routing tests.
@@ -122,4 +126,4 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest {
 
         assertFalse(F.first(nodes).connectable());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
index 8eb8421..ea73819 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.integration.*;
-import org.apache.ignite.internal.client.router.impl.*;
-import org.apache.ignite.logger.log4j.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientProtocol;
+import org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest;
+import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl;
+import org.apache.ignite.logger.log4j.Log4JLogger;
+
+import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.ROUTER_LOG_CFG;
 
 /**
  *
@@ -107,4 +110,4 @@ public class TcpRouterMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTest
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java
index e848dea..f2817ad 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.internal.client.ssl.*;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
 
 /**
  * Tests the simplest use case for router: singe router proxies connections to a single node.
@@ -32,4 +32,4 @@ public class TcpRouterSelfTest extends TcpRouterAbstractSelfTest {
     @Override protected GridSslContextFactory sslContextFactory() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java
index 498be7d..1e2a2bd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.client.router;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.testframework.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  *
@@ -50,4 +50,4 @@ public class TcpSslRouterSelfTest extends TcpRouterAbstractSelfTest {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index e9d1ebb..fdb5456 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -17,14 +17,46 @@
 
 package org.apache.ignite.internal.client.suite;
 
-import junit.framework.*;
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.client.integration.*;
-import org.apache.ignite.internal.client.router.*;
-import org.apache.ignite.internal.client.util.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.client.ClientDefaultCacheSelfTest;
+import org.apache.ignite.internal.client.ClientReconnectionSelfTest;
+import org.apache.ignite.internal.client.ClientTcpMultiThreadedSelfTest;
+import org.apache.ignite.internal.client.ClientTcpSslAuthenticationSelfTest;
+import org.apache.ignite.internal.client.ClientTcpSslMultiThreadedSelfTest;
+import org.apache.ignite.internal.client.ClientTcpTaskExecutionAfterTopologyRestartSelfTest;
+import org.apache.ignite.internal.client.impl.ClientCacheFlagsCodecTest;
+import org.apache.ignite.internal.client.impl.ClientComputeImplSelfTest;
+import org.apache.ignite.internal.client.impl.ClientDataImplSelfTest;
+import org.apache.ignite.internal.client.impl.ClientFutureAdapterSelfTest;
+import org.apache.ignite.internal.client.impl.ClientPropertiesConfigurationSelfTest;
+import org.apache.ignite.internal.client.integration.ClientPreferDirectSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpConnectivitySelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpDirectMultiNodeSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpDirectSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpMultiNodeSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpSslDirectMultiNodeSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpSslDirectSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpSslMultiNodeSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpSslSelfTest;
+import org.apache.ignite.internal.client.integration.ClientTcpUnreachableMultiNodeSelfTest;
+import org.apache.ignite.internal.client.router.ClientFailedInitSelfTest;
+import org.apache.ignite.internal.client.router.RouterFactorySelfTest;
+import org.apache.ignite.internal.client.router.TcpRouterMultiNodeSelfTest;
+import org.apache.ignite.internal.client.router.TcpRouterSelfTest;
+import org.apache.ignite.internal.client.router.TcpSslRouterSelfTest;
+import org.apache.ignite.internal.client.util.ClientByteUtilsTest;
+import org.apache.ignite.internal.client.util.ClientConsistentHashSelfTest;
+import org.apache.ignite.internal.client.util.ClientJavaHasherSelfTest;
+import org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest;
+import org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest;
+import org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest;
+import org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest;
+import org.apache.ignite.internal.processors.rest.RestMemcacheProtocolSelfTest;
+import org.apache.ignite.internal.processors.rest.RestProcessorMultiStartSelfTest;
+import org.apache.ignite.internal.processors.rest.RestProcessorStartSelfTest;
+import org.apache.ignite.internal.processors.rest.TaskCommandHandlerSelfTest;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.TcpRestParserSelfTest;
 
 /**
  * Test suite includes all test that concern REST processors.
@@ -112,4 +144,4 @@ public class IgniteClientTestSuite extends TestSuite {
 
         return suite;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java
----------------------------------------------------------------------
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 4f76784..72112cb 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
@@ -17,13 +17,21 @@
 
 package org.apache.ignite.internal.client.util;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.junit.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.util.GridClientByteUtils.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.util.GridClientByteUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
+
+import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToInt;
+import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToLong;
+import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToShort;
+import static org.apache.ignite.internal.util.GridClientByteUtils.intToBytes;
+import static org.apache.ignite.internal.util.GridClientByteUtils.longToBytes;
+import static org.apache.ignite.internal.util.GridClientByteUtils.shortToBytes;
 
 /**
  * Test case for client's byte convertion utility.
@@ -169,4 +177,4 @@ public class ClientByteUtilsTest extends GridCommonAbstractTest {
 
         return b;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
index 7fb4501..fa9d4b4 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
@@ -17,9 +17,20 @@
 
 package org.apache.ignite.internal.client.util;
 
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test for consistent hash management class.
@@ -278,4 +289,4 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest {
 
         assertEquals("Check affinity for object: " + o, code, i);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java
index 46d0cca..765c58d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.client.util;
 
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Test for Java hash codes calculations - SHOULD BE PORTED to other languages.
@@ -81,4 +82,4 @@ public class ClientJavaHasherSelfTest extends GridCommonAbstractTest {
 
         fail("Java hash codes validation fails.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index 8310b0f..bde9180 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Abstract class for REST protocols tests.
@@ -97,4 +99,4 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest {
     @Override protected <K, V> IgniteCache<K, V> jcache() {
         return grid(0).cache(null);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
index 9b43482..0f56c73 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
@@ -17,17 +17,20 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import net.spy.memcached.*;
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.junit.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.junit.Assert.*;
+import java.io.Serializable;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.Date;
+import java.util.Map;
+import net.spy.memcached.BinaryConnectionFactory;
+import net.spy.memcached.MemcachedClient;
+import net.spy.memcached.MemcachedClientIF;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.junit.Assert;
+
+import static org.junit.Assert.assertArrayEquals;
 
 /**
  * Tests for TCP binary protocol.
@@ -440,4 +443,4 @@ public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTe
             return res;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 090e030..8db4cd7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -17,23 +17,31 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import net.sf.json.*;
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.regex.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.Serializable;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+import net.sf.json.JSONObject;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
 
 /**
  * Tests for Jetty REST protocol.
@@ -1308,4 +1316,4 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
             return id;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
index 2bec958..cf9fa9e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import sun.misc.*;
-
-import java.net.*;
-import java.security.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import sun.misc.BASE64Encoder;
 
 /**
  *
@@ -100,4 +102,4 @@ public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstract
             throw new Exception("Failed to create authentication signature.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
index c3de703..e510ae8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
@@ -33,4 +33,4 @@ public class JettyRestProcessorUnsignedSelfTest extends JettyRestProcessorAbstra
     @Override protected String signature() throws Exception {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java
index fd61292..9a84424 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import net.spy.memcached.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import net.spy.memcached.BinaryConnectionFactory;
+import net.spy.memcached.MemcachedClient;
+import net.spy.memcached.MemcachedClientIF;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  */
@@ -73,4 +74,4 @@ public class MemcacheRestProcessorTest extends GridCommonAbstractTest {
 
         assert "1_val".equals(client.get("key"));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index c4cdf19..7629afb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -17,25 +17,37 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * TCP protocol test.
@@ -606,4 +618,4 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
             return sum;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index aea71e5..fbaee9e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -17,19 +17,20 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import junit.framework.*;
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.Map;
+import junit.framework.Assert;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * TCP protocol test.
@@ -336,4 +337,4 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
     public void testQuit() throws Exception {
         client.quit();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
index 1bed679..7714dbf 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.processors.rest;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
  * Rest processor test.
@@ -52,4 +53,4 @@ public class RestProcessorMultiStartSelfTest extends GridCommonAbstractTest {
             stopAllGrids();
         }
     }
-}
+}
\ No newline at end of file


[16/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java
index bbb23e7..18ab1b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Class that defines the piece for application-to-network and vice-versa data conversions
@@ -180,4 +180,4 @@ public abstract class GridNioFilterAdapter implements GridNioFilter {
             throw new GridNioException("Failed to proceed with filter call since previous filter is not set " +
                 "(do you use filter outside the filter chain?): " + getClass().getName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java
index 32b2832..8a43e29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.LT;
 
 /**
  * Filter chain implementation for nio server filters.
@@ -289,4 +290,4 @@ public class GridNioFilterChain<T> extends GridNioFilterAdapter {
             return proceedResumeReads(ses);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java
index aac238a..34c3670 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Future that represents already completed result.
@@ -72,4 +72,4 @@ public class GridNioFinishedFuture<R> extends GridFinishedFuture<R> implements G
     @Override public String toString() {
         return S.toString(GridNioFinishedFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java
index 5a884f0..d81760d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * NIO future.
@@ -53,4 +53,4 @@ public interface GridNioFuture<R> extends IgniteInternalFuture<R> {
      * @return Ack closure.
      */
     public IgniteInClosure<IgniteException> ackClosure();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
index e71bf92..0fc6841 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Default future implementation.
@@ -64,4 +64,4 @@ public class GridNioFutureImpl<R> extends GridFutureAdapter<R> implements GridNi
     @Override public String toString() {
         return S.toString(GridNioFutureImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java
index 0a503fd..fdc60eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message reader.
@@ -39,4 +39,4 @@ public interface GridNioMessageReader {
      * @return Optional message factory.
      */
     @Nullable public MessageFactory messageFactory();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java
index c9ed1a0..e02c7ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Message tracker.
@@ -135,4 +135,4 @@ public class GridNioMessageTracker implements IgniteRunnable {
     @Override public String toString() {
         return S.toString(GridNioMessageTracker.class, this, "hash", System.identityHashCode(this));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java
index fa1ac36..d53ab98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message writer.
@@ -46,4 +46,4 @@ public interface GridNioMessageWriter {
      */
     public int writeFully(@Nullable UUID nodeId, Message msg, OutputStream out,
         ByteBuffer buf) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
index 93414c0..7f458fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
@@ -30,4 +30,4 @@ public interface GridNioMetricsListener {
      * @param bytesCnt Number of received bytes.
      */
     public void onBytesReceived(int bytesCnt);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java
index 6585ec6..bc63dc5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface declares a basic contract on message parsing and encoding to the underlying network layer.
@@ -59,4 +58,4 @@ public interface GridNioParser {
      * @throws IgniteCheckedException If any user-specific error occurred while encoding data.
      */
     public ByteBuffer encode(GridNioSession ses, Object msg) throws IOException, IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
index a7ed02a..42656c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Recovery information for single node.
@@ -375,4 +377,4 @@ public class GridNioRecoveryDescriptor {
     @Override public String toString() {
         return S.toString(GridNioRecoveryDescriptor.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 2d60f98..82fb1bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -17,31 +17,61 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.nio.ssl.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-import sun.nio.ch.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
-import java.util.*;
-import java.util.Map.*;
-
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.ClosedByInterruptException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ClosedSelectorException;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.WritableByteChannel;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
+import sun.nio.ch.DirectBuffer;
+
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.ACK_CLOSURE;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MSG_WRITER;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.NIO_OPERATION;
 
 /**
  * TCP NIO server. Due to asynchronous nature of connections processing
@@ -2440,4 +2470,4 @@ public class GridNioServer<T> {
             return this;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java
index 269a8ce..46ffe46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * NIO server buffer.
@@ -114,4 +113,4 @@ public class GridNioServerBuffer {
         else
             return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
index f268831..29e482a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Listener passed in to the {@link GridNioServer} that will be notified on client events.
@@ -61,4 +61,4 @@ public interface GridNioServerListener<T> {
      * @param ses Session that is idle.
      */
     public void onSessionIdleTimeout(GridNioSession ses);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java
index 4440579..2cc16f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java
@@ -30,4 +30,4 @@ public abstract class GridNioServerListenerAdapter<T> implements GridNioServerLi
     @Override public void onSessionIdleTimeout(GridNioSession ses) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
index bcf8d10..e4a7225 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.jetbrains.annotations.*;
-
-import java.net.*;
+import java.net.InetSocketAddress;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface represents established or closed connection between nio server and remote client.
@@ -165,4 +164,4 @@ public interface GridNioSession {
      * @return Recovery descriptor if recovery is supported, {@code null otherwise.}
      */
     @Nullable public GridNioRecoveryDescriptor recoveryDescriptor();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
index 4ab02fe..0bcfe64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
-import java.net.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MAX_KEYS_CNT;
 
 /**
  *
@@ -309,4 +309,4 @@ public class GridNioSessionImpl implements GridNioSession {
     @Override public String toString() {
         return S.toString(GridNioSessionImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
index 23c1e22..b5387d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Meta keys for {@link GridNioSession}.
@@ -72,4 +72,4 @@ public enum GridNioSessionMetaKey {
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
index 458786b..6b1f6a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
@@ -17,18 +17,18 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.util.Collection;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
 
 /**
  * Session implementation bound to selector API and socket API.
@@ -302,4 +302,4 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
     @Override public String toString() {
         return S.toString(GridSelectorNioSessionImpl.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
index 67d4664..93e789d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryClientEndpoint;
+import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -148,4 +154,4 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien
     @Override public String toString() {
         return S.toString(GridShmemCommunicationClient.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java
index 7933001..4022bc5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.ACK_CLOSURE;
 
 /**
  * Grid client for NIO server.
@@ -152,4 +156,4 @@ public class GridTcpNioCommunicationClient extends GridAbstractCommunicationClie
     @Override public String toString() {
         return S.toString(GridTcpNioCommunicationClient.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
index 1393e50..bb566cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
@@ -17,18 +17,27 @@
 
 package org.apache.ignite.internal.util.nio.ssl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-
-import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*;
-import static javax.net.ssl.SSLEngineResult.Status.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.SocketChannel;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.nio.GridNioException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_TASK;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+import static javax.net.ssl.SSLEngineResult.Status.BUFFER_UNDERFLOW;
+import static javax.net.ssl.SSLEngineResult.Status.CLOSED;
+import static javax.net.ssl.SSLEngineResult.Status.OK;
 
 /**
  *
@@ -516,4 +525,4 @@ public class BlockingSslHandler {
 
         return cp;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java
index c3cb084..63cdd83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java
@@ -17,15 +17,25 @@
 
 package org.apache.ignite.internal.util.nio.ssl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.net.ssl.*;
-import java.io.*;
-import java.nio.*;
-
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.nio.GridNioException;
+import org.apache.ignite.internal.util.nio.GridNioFilterAdapter;
+import org.apache.ignite.internal.util.nio.GridNioFinishedFuture;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.SSL_HANDLER;
 
 /**
  * Implementation of SSL filter using {@link SSLEngine}
@@ -394,4 +404,4 @@ public class GridNioSslFilter extends GridNioFilterAdapter {
 
         return (ByteBuffer)msg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java
index 8c1ac5a..3272b8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java
@@ -17,20 +17,34 @@
 
 package org.apache.ignite.internal.util.nio.ssl;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.net.ssl.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.locks.*;
-
-import static javax.net.ssl.SSLEngineResult.*;
-import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*;
-import static javax.net.ssl.SSLEngineResult.Status.*;
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
-import static org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter.*;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.nio.GridNioEmbeddedFuture;
+import org.apache.ignite.internal.util.nio.GridNioException;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_TASK;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+import static javax.net.ssl.SSLEngineResult.Status;
+import static javax.net.ssl.SSLEngineResult.Status.BUFFER_UNDERFLOW;
+import static javax.net.ssl.SSLEngineResult.Status.CLOSED;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.SSL_ENGINE;
+import static org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter.HANDSHAKE_FUT_META_KEY;
 
 /**
  * Class that encapsulate the per-session SSL state, encoding and decoding logic.
@@ -679,4 +693,4 @@ class GridNioSslHandler extends ReentrantLock {
             return buf;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
index c91ca21..1ef53c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
@@ -17,15 +17,25 @@
 
 package org.apache.ignite.internal.util.nodestart;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Util methods for {@code IgniteCluster.startNodes(..)} methods.
@@ -388,4 +398,4 @@ public class IgniteNodeStartUtils {
 
         return addrs;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java
index b3f9bb1..99b731a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.util.nodestart;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.File;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Host data.
@@ -276,4 +275,4 @@ public class IgniteRemoteStartSpecification {
         if (cfg != null)
             cfg = cfg.replace('\\', separator).replace('/', separator);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
index 14a35b7..296a952 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.nodestart;
 
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
 
 /**
  * SSH processor, interface was introduced to avoid mandatory runtime dependency on SSH library.
@@ -31,4 +31,4 @@ public interface IgniteSshHelper {
      * @return {@link Callable} starting node using SSH.
      */
     public StartNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
index a1a2046..4fdd0cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util.nodestart;
 
-import org.apache.ignite.cluster.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.cluster.ClusterStartNodeResult;
 
 /**
  * SSH-based node starter, returns tuple which contains hostname, success flag and error message
@@ -27,4 +26,4 @@ import java.util.concurrent.*;
  */
 public interface StartNodeCallable extends Callable<ClusterStartNodeResult> {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java
index 408cb38..59df8d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.offheap;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Off-heap event types.
@@ -44,4 +44,4 @@ public enum GridOffHeapEvent {
     @Nullable public static GridOffHeapEvent fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java
index 856a0de..158475b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java
@@ -23,4 +23,4 @@ package org.apache.ignite.internal.util.offheap;
 public interface GridOffHeapEventListener {
     /** Event notification. */
     public void onEvent(GridOffHeapEvent evt);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java
index f1e1741..4597be8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java
@@ -30,4 +30,4 @@ public interface GridOffHeapEvictListener {
      * @param valBytes Value bytes.
      */
     public void onEvict(int part, int hash, byte[] keyBytes, byte[] valBytes);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java
index d10aa22..1fcddd7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.util.offheap;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Off-heap map.
@@ -204,4 +205,4 @@ public interface GridOffHeapMap<K> {
      *      another listener already exists.
      */
     public boolean eventListener(GridOffHeapEventListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java
index d46ff2b..1a3d219 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util.offheap;
 
-import org.apache.ignite.internal.util.offheap.unsafe.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMap;
+import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafePartitionedMap;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Factory for off-heap maps.
@@ -222,4 +223,4 @@ public class GridOffHeapMapFactory {
         long initCap, long totalMem, short lruStripes, @Nullable GridOffHeapEvictListener lsnr) {
         return new GridUnsafePartitionedMap(parts, concurrency, load, initCap, totalMem, lruStripes, lsnr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java
index 8598fed..4ceaa7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java
@@ -47,4 +47,4 @@ public class GridOffHeapOutOfMemoryException extends RuntimeException {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java
index a945262..3afdfa9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.util.offheap;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Set;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Off-heap map.
@@ -235,4 +235,4 @@ public interface GridOffHeapPartitionedMap {
      *      another listener already exists.
      */
     public boolean eventListener(GridOffHeapEventListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java
index dde2330..273ea89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java
@@ -35,4 +35,4 @@ public interface GridOffHeapSmartPointer {
      * Decrement reference count.
      */
     public void decrementRefCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java
index 1885947..b8b24bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java
@@ -26,4 +26,4 @@ public interface GridOffHeapSmartPointerFactory<T extends GridOffHeapSmartPointe
      * @return Smart pointer instance (may or may not return the same instance multiple times).
      */
     public T createPointer(long ptr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java
index 038c05b..04ea56c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java
@@ -35,15 +35,29 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.io.Closeable;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  *  A concurrent AVL tree with fast cloning, based on the algorithm of Bronson,
@@ -4454,4 +4468,3 @@ public class GridOffHeapSnapTreeMap<K extends GridOffHeapSmartPointer,V extends
 }
 
 
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java
index 8b183e4..8b32ceb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java
@@ -32,4 +32,4 @@ public interface GridUnsafeCompoundMemory {
      * @param compound Compound memory.
      */
     public void merge(GridUnsafeCompoundMemory compound);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java
index 8e7f1d5..c461cf1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Guards concurrent operations on offheap memory to make sure that no thread will access already deallocated pointer.
@@ -371,4 +373,4 @@ public class GridUnsafeGuard {
             return S.toString(Finalizer.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java
index 0be313e..aaff4f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.internal.util.offheap.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Striped LRU queue.
@@ -624,4 +625,4 @@ class GridUnsafeLru {
             return S.toString(LruStripe.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java
index a9d35e77..d957b3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java
@@ -27,4 +27,4 @@ interface GridUnsafeLruPoller {
      * @param size Size of the space to free.
      */
     public void lruPoll(int size);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
index e36d85b..40fb3e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
@@ -17,19 +17,27 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.offheap.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.*;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEventListener;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEvictListener;
+import org.apache.ignite.internal.util.offheap.GridOffHeapMap;
+import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.REHASH;
 
 /**
  * Off-heap map based on {@code Unsafe} implementation.
@@ -1750,4 +1758,4 @@ public class GridUnsafeMap<K> implements GridOffHeapMap<K> {
             return len == keyBytes.length && mem.compare(ptr + HEADER, keyBytes);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
index 0f51e56..cf0cb5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.offheap.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import sun.misc.*;
-
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.*;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEventListener;
+import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import sun.misc.Unsafe;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OFFHEAP_SAFE_RELEASE;
+import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.ALLOCATE;
+import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.RELEASE;
 
 /**
  * Unsafe memory.
@@ -714,4 +715,4 @@ public class GridUnsafeMemory {
     @Override public String toString() {
         return S.toString(GridUnsafeMemory.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
index 4ffc33f..070da51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.offheap.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEventListener;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEvictListener;
+import org.apache.ignite.internal.util.offheap.GridOffHeapMap;
+import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMap;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
 
 /**
  * Off-heap map based on {@code Unsafe} implementation.
@@ -413,4 +417,4 @@ public class GridUnsafePartitionedMap implements GridOffHeapPartitionedMap {
                 curIt.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
index 2af2125..2e9b58f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.internal.util.portscanner;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.channels.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+import java.nio.channels.FileLock;
+import org.apache.ignite.IgniteSystemProperties;
 
 /**
  * Ignite port scanner.
@@ -173,4 +176,4 @@ public class GridJmxPortFinder {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java
index cadb45e..685668a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java
@@ -35,8 +35,8 @@
 
 package org.apache.ignite.internal.util.snaptree;
 
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
 
 /** Manages copy-on-write behavior for a concurrent tree structure.  It is
  *  assumed that the managed structure allows concurrent mutation, but that no
@@ -387,4 +387,4 @@ abstract public class CopyOnWriteManager<E> implements Cloneable {
         succ.awaitActivated();
         return succ.initialSize;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java
index 751ac4a..c85320d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java
@@ -128,4 +128,4 @@ abstract public class Epoch {
             Epoch.this.onClosed(dataSum);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java
index 8bc4b39..7ceec45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java
@@ -35,7 +35,8 @@
 
 package org.apache.ignite.internal.util.snaptree;
 
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 /** Provides an implementation of the behavior of an {@link Epoch}. */
 @SuppressWarnings("ALL")
@@ -429,4 +430,4 @@ abstract class EpochNode extends AtomicLong implements Epoch.Ticket {
             return 1;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java
index 77e7c58..b5c6545 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java
@@ -35,9 +35,23 @@
 
 package org.apache.ignite.internal.util.snaptree;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentNavigableMap;
 
 // TODO: optimized buildFromSorted
 // TODO: submap.clone()
@@ -2894,4 +2908,4 @@ public class SnapTreeMap<K,V> extends AbstractMap<K,V> implements ConcurrentNavi
 
         holderRef = new COWMgr<K,V>(holder, size);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
index 345bb7c..6faa4c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.util.spring;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Spring helper which can parse Spring configuration files, interface was introduced to avoid mandatory
@@ -154,4 +155,4 @@ public interface IgniteSpringHelper {
      *      was explicitly specified.
      */
     public String userVersion(ClassLoader ldr, IgniteLogger log);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
index c79dacf..611853f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
@@ -17,8 +17,13 @@
 
 package org.apache.ignite.internal.util.test;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * Print stream that prints each thread group into a separate buffer. Use
@@ -290,4 +295,4 @@ public class GridTestPrintStream extends PrintStream {
             byteOut.reset();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java
index 4c520c5..e3d2a2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.test;
 
-import java.io.*;
+import java.io.PrintStream;
 
 /**
  * Factory that allow to acquire/release Print Stream for test logging.
@@ -125,4 +125,4 @@ public final class GridTestPrintStreamFactory {
         if (errCnt == 0)
             System.setErr(sysErr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 3ff6f3c..b29d7cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -17,15 +17,28 @@
 
 package org.apache.ignite.internal.util.tostring;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.io.Externalizable;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides auto-generation framework for {@code toString()} output.
@@ -585,4 +598,4 @@ public class GridToStringBuilder {
 
         return cd;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java
index b585b53..338e496 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.util.tostring;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * Simple class descriptor containing simple and fully qualified class names as well as
@@ -82,4 +85,4 @@ class GridToStringClassDescriptor {
     List<GridToStringFieldDescriptor> getFields() {
         return fields;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java
index 2523c2a..c6995d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.internal.util.tostring;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Attach this annotation to a field or a class to indicate that this field or fields of this
@@ -29,4 +33,4 @@ import java.lang.annotation.*;
 @Target({ElementType.FIELD, ElementType.TYPE})
 public @interface GridToStringExclude {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java
index 15d8fb5..a48a3a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java
@@ -50,4 +50,4 @@ class GridToStringFieldDescriptor {
      * @return Field name.
      */
     String getName() { return name; }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java
index e688ae1..ec502a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.internal.util.tostring;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Attach this annotation to a field or a class to indicate that this field or fields of this
@@ -29,4 +33,4 @@ import java.lang.annotation.*;
 @Target({ElementType.FIELD, ElementType.TYPE})
 public @interface GridToStringInclude {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java
index 36bdd1b..12032f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.internal.util.tostring;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Attach this annotation to a field to provide its order in
@@ -34,4 +38,4 @@ public @interface GridToStringOrder {
      * Numeric order value.
      */
     @SuppressWarnings({"JavaDoc"}) int value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java
index 30b52ac..ab91452 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.tostring;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.SB;
 
 /**
  * Helper wrapper containing StringBuilder and additional values. Stored as a thread-lcal variable.
@@ -52,4 +52,4 @@ class GridToStringThreadLocal {
     Object[] getAdditionalValues() {
         return addVals;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java
index 2d52875..091bff1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteClosure} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteClosure
  */
-public interface C1<E1, R> extends IgniteClosure<E1, R> { /* No-op. */ }
+public interface C1<E1, R> extends IgniteClosure<E1, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java
index 1d674b9..7f7787c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiClosure} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +30,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteBiClosure
  */
-public interface C2<E1, E2, R> extends IgniteBiClosure<E1, E2, R> { /* No-op. */ }
+public interface C2<E1, E2, R> extends IgniteBiClosure<E1, E2, R> { /* No-op. */ }
\ No newline at end of file


[74/82] [abbrv] ignite git commit: Platforms: reworked PlatformCacheEntryFilter interface.

Posted by sb...@apache.org.
Platforms: reworked PlatformCacheEntryFilter interface.


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

Branch: refs/heads/ignite-1093-2
Commit: 6d0aff43c4e30069cab19a8c71c96b4e47b9ae8d
Parents: 66d46ec
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 11:29:55 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 11:29:55 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |  5 +-
 .../cache/GridLoadCacheCloseablePredicate.java  | 30 -----------
 .../distributed/dht/GridDhtCacheAdapter.java    |  6 +--
 .../CacheQueryCloseableScanBiPredicate.java     | 30 -----------
 .../cache/query/GridCacheQueryManager.java      | 52 ++++++++++----------
 .../cache/PlatformCacheEntryFilter.java         | 11 +++--
 6 files changed, 39 insertions(+), 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6d0aff43/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 653c2b1..68749b9 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
@@ -94,6 +94,7 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
 import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl;
 import org.apache.ignite.internal.processors.dr.IgniteDrDataStreamerCacheUpdater;
+import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
 import org.apache.ignite.internal.processors.task.GridInternal;
 import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
 import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
@@ -3470,8 +3471,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             }
         }
         finally {
-            if (p instanceof GridLoadCacheCloseablePredicate)
-                ((GridLoadCacheCloseablePredicate)p).onClose();
+            if (p instanceof PlatformCacheEntryFilter)
+                ((PlatformCacheEntryFilter)p).onClose();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d0aff43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java
deleted file mode 100644
index 1331a42..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.lang.*;
-
-/**
- * Special version of bi-predicate for LoadCache with close callback.
- */
-public interface GridLoadCacheCloseablePredicate<K, V> extends IgniteBiPredicate<K, V> {
-    /**
-     * Callback invoked when predicate is no longer needed.
-     */
-    public void onClose();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d0aff43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index ecacb29..ee56b16 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -50,7 +50,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedExceptio
 import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
 import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
 import org.apache.ignite.internal.processors.cache.GridCachePreloader;
-import org.apache.ignite.internal.processors.cache.GridLoadCacheCloseablePredicate;
 import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
 import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 import org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest;
@@ -62,6 +61,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCach
 import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.lang.GridIteratorAdapter;
@@ -477,8 +477,8 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
 
         }
         finally {
-            if (p instanceof GridLoadCacheCloseablePredicate)
-                ((GridLoadCacheCloseablePredicate)p).onClose();
+            if (p instanceof PlatformCacheEntryFilter)
+                ((PlatformCacheEntryFilter)p).onClose();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d0aff43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
deleted file mode 100644
index d6c56e2..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryCloseableScanBiPredicate.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.query;
-
-import org.apache.ignite.lang.IgniteBiPredicate;
-
-/**
- * Special version of bi-predicate for cache scan queries with close callback.
- */
-public interface CacheQueryCloseableScanBiPredicate<K, V> extends IgniteBiPredicate<K, V> {
-    /**
-     * Callback invoked when predicate is not longer needed.
-     */
-    public void onClose();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d0aff43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 4206230..b3f8720 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -17,29 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache.query;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.sql.SQLException;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Queue;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
-import javax.cache.Cache;
-import javax.cache.expiry.ExpiryPolicy;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
@@ -71,6 +48,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnrese
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.processors.datastructures.GridCacheSetItemKey;
 import org.apache.ignite.internal.processors.datastructures.GridSetQueryPredicate;
+import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
 import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
 import org.apache.ignite.internal.processors.query.GridQueryFieldsResult;
 import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
@@ -112,6 +90,30 @@ import org.apache.ignite.spi.indexing.IndexingSpi;
 import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.sql.SQLException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+
 import static org.apache.ignite.cache.CacheMode.LOCAL;
 import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
 import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_OBJECT_READ;
@@ -1010,8 +1012,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                     heapIt.close();
                 }
                 finally {
-                    if (keyValFilter instanceof CacheQueryCloseableScanBiPredicate)
-                        ((CacheQueryCloseableScanBiPredicate)keyValFilter).onClose();
+                    if (keyValFilter instanceof PlatformCacheEntryFilter)
+                        ((PlatformCacheEntryFilter)keyValFilter).onClose();
                 }
             }
         };

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d0aff43/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
index bd3e281..94de2bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.processors.platform.cache;
 
-import org.apache.ignite.internal.processors.cache.GridLoadCacheCloseablePredicate;
-import org.apache.ignite.internal.processors.cache.query.CacheQueryCloseableScanBiPredicate;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Platform cache entry filter interface.
  */
-public interface PlatformCacheEntryFilter<K, V> extends GridLoadCacheCloseablePredicate<K, V>,
-    CacheQueryCloseableScanBiPredicate<K, V> {
-    // No-op.
+public interface PlatformCacheEntryFilter<K, V> extends IgniteBiPredicate<K, V> {
+    /**
+     * Callback invoked when filter is no longer needed.
+     */
+    public void onClose();
 }
\ No newline at end of file


[69/82] [abbrv] ignite git commit: IGNITE-1337: Moved "common" CPP project to Ignite.

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/src/java.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/src/java.cpp b/modules/platform/src/main/cpp/common/src/java.cpp
new file mode 100644
index 0000000..0c6524b
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/src/java.cpp
@@ -0,0 +1,2204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cstring>
+#include <string>
+#include <exception>
+
+#include "ignite/common/concurrent.h"
+#include "ignite/common/java.h"
+
+#define IGNITE_SAFE_PROC_NO_ARG(jniEnv, envPtr, type, field) { \
+    JniHandlers* hnds = reinterpret_cast<JniHandlers*>(envPtr); \
+    type hnd = hnds->field; \
+    if (hnd) \
+        hnd(hnds->target); \
+    else \
+        ThrowOnMissingHandler(jniEnv); \
+}
+
+#define IGNITE_SAFE_PROC(jniEnv, envPtr, type, field, ...) { \
+    JniHandlers* hnds = reinterpret_cast<JniHandlers*>(envPtr); \
+    type hnd = hnds->field; \
+    if (hnd) \
+        hnd(hnds->target, __VA_ARGS__); \
+    else \
+        ThrowOnMissingHandler(jniEnv); \
+}
+
+#define IGNITE_SAFE_FUNC(jniEnv, envPtr, type, field, ...) { \
+    JniHandlers* hnds = reinterpret_cast<JniHandlers*>(envPtr); \
+    type hnd = hnds->field; \
+    if (hnd) \
+        return hnd(hnds->target, __VA_ARGS__); \
+    else \
+    { \
+        ThrowOnMissingHandler(jniEnv); \
+        return 0; \
+    }\
+}
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace java
+        {
+            namespace gcc = ignite::common::concurrent;
+
+            /* --- Startup exception. --- */
+            class JvmException : public std::exception {
+                // No-op.
+            };
+
+            /* --- JNI method definitions. --- */
+            struct JniMethod {
+                char* name;
+                char* sign;
+                bool isStatic;
+
+                JniMethod(const char* name, const char* sign, bool isStatic) {
+                    this->name = const_cast<char*>(name);
+                    this->sign = const_cast<char*>(sign);
+                    this->isStatic = isStatic;
+                }
+            };
+
+            /*
+             * Heloper function to copy characters.
+             *
+             * @param src Source.
+             * @return Result.
+             */
+            char* CopyChars(const char* src)
+            {
+                if (src)
+                {
+                    size_t len = strlen(src);
+                    char* dest = new char[len + 1];
+                    strcpy(dest, src);
+                    *(dest + len) = 0;
+                    return dest;
+                }
+                else
+                    return NULL;
+            }
+
+            JniErrorInfo::JniErrorInfo() : code(IGNITE_JNI_ERR_SUCCESS), errCls(NULL), errMsg(NULL)
+            {
+                // No-op.
+            }
+
+            JniErrorInfo::JniErrorInfo(int code, const char* errCls, const char* errMsg) : code(code)
+            {
+                this->errCls = CopyChars(errCls);
+                this->errMsg = CopyChars(errMsg);
+            }
+
+            JniErrorInfo::JniErrorInfo(const JniErrorInfo& other) : code(other.code)
+            {
+                this->errCls = CopyChars(other.errCls);
+                this->errMsg = CopyChars(other.errMsg);
+            }
+
+            JniErrorInfo& JniErrorInfo::operator=(const JniErrorInfo& other)
+            {
+                if (this != &other)
+                {
+                    // 1. Create new instance, exception could occur at this point.
+                    JniErrorInfo tmp(other);
+
+                    // 2. Swap with temp.
+                    int code0 = code;
+                    char* errCls0 = errCls;
+                    char* errMsg0 = errMsg;
+
+                    code = tmp.code;
+                    errCls = tmp.errCls;
+                    errMsg = tmp.errMsg;
+
+                    tmp.code = code0;
+                    tmp.errCls = errCls0;
+                    tmp.errMsg = errMsg0;
+                }
+
+                return *this;
+            }
+
+            JniErrorInfo::~JniErrorInfo()
+            {
+                if (errCls)
+                    delete[] errCls;
+
+                if (errMsg)
+                    delete[] errMsg;
+            }
+
+            const char* C_THROWABLE = "java/lang/Throwable";
+            JniMethod M_THROWABLE_GET_MESSAGE = JniMethod("getMessage", "()Ljava/lang/String;", false);
+            JniMethod M_THROWABLE_PRINT_STACK_TRACE = JniMethod("printStackTrace", "()V", false);
+
+            const char* C_CLASS = "java/lang/Class";
+            JniMethod M_CLASS_GET_NAME = JniMethod("getName", "()Ljava/lang/String;", false);
+
+            const char* C_IGNITE_EXCEPTION = "org/apache/ignite/IgniteException";
+
+            const char* C_PLATFORM_NO_CALLBACK_EXCEPTION = "org/apache/ignite/internal/processors/platform/PlatformNoCallbackException";
+
+            const char* C_PLATFORM_PROCESSOR = "org/apache/ignite/internal/processors/platform/PlatformProcessor";
+            JniMethod M_PLATFORM_PROCESSOR_RELEASE_START = JniMethod("releaseStart", "()V", false);
+            JniMethod M_PLATFORM_PROCESSOR_PROJECTION = JniMethod("projection", "()Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_CACHE = JniMethod("cache", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_CREATE_CACHE = JniMethod("createCache", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_GET_OR_CREATE_CACHE = JniMethod("getOrCreateCache", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_AFFINITY = JniMethod("affinity", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_DATA_STREAMER = JniMethod("dataStreamer", "(Ljava/lang/String;Z)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_TRANSACTIONS = JniMethod("transactions", "()Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_COMPUTE = JniMethod("compute", "(Lorg/apache/ignite/internal/processors/platform/PlatformTarget;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_MESSAGE = JniMethod("message", "(Lorg/apache/ignite/internal/processors/platform/PlatformTarget;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_EVENTS = JniMethod("events", "(Lorg/apache/ignite/internal/processors/platform/PlatformTarget;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_SERVICES = JniMethod("services", "(Lorg/apache/ignite/internal/processors/platform/PlatformTarget;)Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            JniMethod M_PLATFORM_PROCESSOR_EXTENSIONS = JniMethod("extensions", "()Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+            
+            const char* C_PLATFORM_TARGET = "org/apache/ignite/internal/processors/platform/PlatformTarget";
+            JniMethod M_PLATFORM_TARGET_IN_STREAM_OUT_LONG = JniMethod("inStreamOutLong", "(IJ)J", false);
+            JniMethod M_PLATFORM_TARGET_IN_STREAM_OUT_OBJECT = JniMethod("inStreamOutObject", "(IJ)Ljava/lang/Object;", false);
+            JniMethod M_PLATFORM_TARGET_IN_STREAM_OUT_STREAM = JniMethod("inStreamOutStream", "(IJJ)V", false);
+            JniMethod M_PLATFORM_TARGET_IN_OBJECT_STREAM_OUT_STREAM = JniMethod("inObjectStreamOutStream", "(ILjava/lang/Object;JJ)V", false);
+            JniMethod M_PLATFORM_TARGET_OUT_LONG = JniMethod("outLong", "(I)J", false);
+            JniMethod M_PLATFORM_TARGET_OUT_STREAM = JniMethod("outStream", "(IJ)V", false);
+            JniMethod M_PLATFORM_TARGET_OUT_OBJECT = JniMethod("outObject", "(I)Ljava/lang/Object;", false);
+            JniMethod M_PLATFORM_TARGET_LISTEN_FUTURE = JniMethod("listenFuture", "(JI)V", false);
+            JniMethod M_PLATFORM_TARGET_LISTEN_FOR_OPERATION = JniMethod("listenFutureForOperation", "(JII)V", false);
+
+            const char* C_PLATFORM_CLUSTER_GRP = "org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup";
+            JniMethod M_PLATFORM_CLUSTER_GRP_FOR_OTHERS = JniMethod("forOthers", "(Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;)Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;", false);
+            JniMethod M_PLATFORM_CLUSTER_GRP_FOR_REMOTES = JniMethod("forRemotes", "()Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;", false);
+            JniMethod M_PLATFORM_CLUSTER_GRP_FOR_DAEMONS = JniMethod("forDaemons", "()Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;", false);
+            JniMethod M_PLATFORM_CLUSTER_GRP_FOR_RANDOM = JniMethod("forRandom", "()Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;", false);
+            JniMethod M_PLATFORM_CLUSTER_GRP_FOR_OLDEST = JniMethod("forOldest", "()Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;", false);
+            JniMethod M_PLATFORM_CLUSTER_GRP_FOR_YOUNGEST = JniMethod("forYoungest", "()Lorg/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup;", false);
+            JniMethod M_PLATFORM_CLUSTER_GRP_RESET_METRICS = JniMethod("resetMetrics", "()V", false);
+            
+            const char* C_PLATFORM_MESSAGING = "org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging";
+            JniMethod M_PLATFORM_MESSAGING_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/messaging/PlatformMessaging;", false);
+
+            const char* C_PLATFORM_COMPUTE = "org/apache/ignite/internal/processors/platform/compute/PlatformCompute";
+            JniMethod M_PLATFORM_COMPUTE_WITH_NO_FAILOVER = JniMethod("withNoFailover", "()V", false);
+            JniMethod M_PLATFORM_COMPUTE_WITH_TIMEOUT = JniMethod("withTimeout", "(J)V", false);
+            JniMethod M_PLATFORM_COMPUTE_EXECUTE_NATIVE = JniMethod("executeNative", "(JJ)V", false);
+
+            const char* C_PLATFORM_CACHE = "org/apache/ignite/internal/processors/platform/cache/PlatformCache";
+            JniMethod M_PLATFORM_CACHE_WITH_SKIP_STORE = JniMethod("withSkipStore", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+            JniMethod M_PLATFORM_CACHE_WITH_NO_RETRIES = JniMethod("withNoRetries", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+            JniMethod M_PLATFORM_CACHE_WITH_EXPIRY_PLC = JniMethod("withExpiryPolicy", "(JJJ)Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+            JniMethod M_PLATFORM_CACHE_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+            JniMethod M_PLATFORM_CACHE_WITH_KEEP_PORTABLE = JniMethod("withKeepPortable", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+            JniMethod M_PLATFORM_CACHE_CLEAR = JniMethod("clear", "()V", false);
+            JniMethod M_PLATFORM_CACHE_REMOVE_ALL = JniMethod("removeAll", "()V", false);
+            JniMethod M_PLATFORM_CACHE_ITERATOR = JniMethod("iterator", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator;", false);
+            JniMethod M_PLATFORM_CACHE_LOCAL_ITERATOR = JniMethod("localIterator", "(I)Lorg/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator;", false);
+            JniMethod M_PLATFORM_CACHE_ENTER_LOCK = JniMethod("enterLock", "(J)V", false);
+            JniMethod M_PLATFORM_CACHE_EXIT_LOCK = JniMethod("exitLock", "(J)V", false);
+            JniMethod M_PLATFORM_CACHE_TRY_ENTER_LOCK = JniMethod("tryEnterLock", "(JJ)Z", false);
+            JniMethod M_PLATFORM_CACHE_CLOSE_LOCK = JniMethod("closeLock", "(J)V", false);
+            JniMethod M_PLATFORM_CACHE_REBALANCE = JniMethod("rebalance", "(J)V", false);
+            JniMethod M_PLATFORM_CACHE_SIZE = JniMethod("size", "(IZ)I", false);
+
+            const char* C_PLATFORM_AFFINITY = "org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity";
+            JniMethod C_PLATFORM_AFFINITY_PARTITIONS = JniMethod("partitions", "()I", false);
+
+            const char* C_PLATFORM_DATA_STREAMER = "org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer";
+            JniMethod M_PLATFORM_DATA_STREAMER_LISTEN_TOPOLOGY = JniMethod("listenTopology", "(J)V", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_GET_ALLOW_OVERWRITE = JniMethod("allowOverwrite", "()Z", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_SET_ALLOW_OVERWRITE = JniMethod("allowOverwrite", "(Z)V", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_GET_SKIP_STORE = JniMethod("skipStore", "()Z", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_SET_SKIP_STORE = JniMethod("skipStore", "(Z)V", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_GET_PER_NODE_BUFFER_SIZE = JniMethod("perNodeBufferSize", "()I", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_SET_PER_NODE_BUFFER_SIZE = JniMethod("perNodeBufferSize", "(I)V", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_GET_PER_NODE_PARALLEL_OPS = JniMethod("perNodeParallelOperations", "()I", false);
+            JniMethod M_PLATFORM_DATA_STREAMER_SET_PER_NODE_PARALLEL_OPS = JniMethod("perNodeParallelOperations", "(I)V", false);
+
+            const char* C_PLATFORM_TRANSACTIONS = "org/apache/ignite/internal/processors/platform/transactions/PlatformTransactions";
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_START = JniMethod("txStart", "(IIJI)J", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_COMMIT = JniMethod("txCommit", "(J)I", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_ROLLBACK = JniMethod("txRollback", "(J)I", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_COMMIT_ASYNC = JniMethod("txCommitAsync", "(JJ)V", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_ROLLBACK_ASYNC = JniMethod("txRollbackAsync", "(JJ)V", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_STATE = JniMethod("txState", "(J)I", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_SET_ROLLBACK_ONLY = JniMethod("txSetRollbackOnly", "(J)Z", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_TX_CLOSE = JniMethod("txClose", "(J)I", false);
+            JniMethod M_PLATFORM_TRANSACTIONS_RESET_METRICS = JniMethod("resetMetrics", "()V", false);
+
+            const char* C_PLATFORM_CACHE_STORE_CALLBACK = "org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback";
+            JniMethod M_PLATFORM_CACHE_STORE_CALLBACK_INVOKE = JniMethod("invoke", "(J)V", false);
+
+            const char* C_PLATFORM_CALLBACK_UTILS = "org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils";
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_CREATE = JniMethod("cacheStoreCreate", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_INVOKE = JniMethod("cacheStoreInvoke", "(JJJLjava/lang/Object;)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_DESTROY = JniMethod("cacheStoreDestroy", "(JJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_SESSION_CREATE = JniMethod("cacheStoreSessionCreate", "(JJ)J", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_ENTRY_FILTER_CREATE = JniMethod("cacheEntryFilterCreate", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_ENTRY_FILTER_APPLY = JniMethod("cacheEntryFilterApply", "(JJJ)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_ENTRY_FILTER_DESTROY = JniMethod("cacheEntryFilterDestroy", "(JJ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CACHE_INVOKE = JniMethod("cacheInvoke", "(JJJ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_MAP = JniMethod("computeTaskMap", "(JJJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_JOB_RESULT = JniMethod("computeTaskJobResult", "(JJJJ)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_REDUCE = JniMethod("computeTaskReduce", "(JJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_COMPLETE = JniMethod("computeTaskComplete", "(JJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_SERIALIZE = JniMethod("computeJobSerialize", "(JJJ)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_CREATE = JniMethod("computeJobCreate", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_EXECUTE = JniMethod("computeJobExecute", "(JJIJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_DESTROY = JniMethod("computeJobDestroy", "(JJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_CANCEL = JniMethod("computeJobCancel", "(JJ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_LSNR_APPLY = JniMethod("continuousQueryListenerApply", "(JJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_FILTER_CREATE = JniMethod("continuousQueryFilterCreate", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_FILTER_EVAL = JniMethod("continuousQueryFilterApply", "(JJJ)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_FILTER_RELEASE = JniMethod("continuousQueryFilterRelease", "(JJ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_DATA_STREAMER_TOPOLOGY_UPDATE = JniMethod("dataStreamerTopologyUpdate", "(JJJI)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_DATA_STREAMER_STREAM_RECEIVER_INVOKE = JniMethod("dataStreamerStreamReceiverInvoke", "(JJLjava/lang/Object;JZ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_BYTE_RES = JniMethod("futureByteResult", "(JJI)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_BOOL_RES = JniMethod("futureBoolResult", "(JJI)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_SHORT_RES = JniMethod("futureShortResult", "(JJI)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_CHAR_RES = JniMethod("futureCharResult", "(JJI)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_INT_RES = JniMethod("futureIntResult", "(JJI)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_FLOAT_RES = JniMethod("futureFloatResult", "(JJF)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_LONG_RES = JniMethod("futureLongResult", "(JJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_DOUBLE_RES = JniMethod("futureDoubleResult", "(JJD)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_OBJ_RES = JniMethod("futureObjectResult", "(JJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_NULL_RES = JniMethod("futureNullResult", "(JJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_FUTURE_ERR = JniMethod("futureError", "(JJJ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_LIFECYCLE_EVENT = JniMethod("lifecycleEvent", "(JJI)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_MESSAGING_FILTER_CREATE = JniMethod("messagingFilterCreate", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_MESSAGING_FILTER_APPLY = JniMethod("messagingFilterApply", "(JJJ)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_MESSAGING_FILTER_DESTROY = JniMethod("messagingFilterDestroy", "(JJ)V", true);
+            
+            JniMethod M_PLATFORM_CALLBACK_UTILS_EVENT_FILTER_CREATE = JniMethod("eventFilterCreate", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_EVENT_FILTER_APPLY = JniMethod("eventFilterApply", "(JJJ)I", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_EVENT_FILTER_DESTROY = JniMethod("eventFilterDestroy", "(JJ)V", true);
+            
+            JniMethod M_PLATFORM_CALLBACK_UTILS_SERVICE_INIT = JniMethod("serviceInit", "(JJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_SERVICE_EXECUTE = JniMethod("serviceExecute", "(JJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_SERVICE_CANCEL = JniMethod("serviceCancel", "(JJJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_SERVICE_INVOKE_METHOD = JniMethod("serviceInvokeMethod", "(JJJJ)V", true);
+			
+            JniMethod M_PLATFORM_CALLBACK_UTILS_CLUSTER_NODE_FILTER_APPLY = JniMethod("clusterNodeFilterApply", "(JJ)I", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_NODE_INFO = JniMethod("nodeInfo", "(JJ)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_MEMORY_REALLOCATE = JniMethod("memoryReallocate", "(JJI)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_ON_START = JniMethod("onStart", "(JJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_ON_STOP = JniMethod("onStop", "(J)V", true);
+
+            JniMethod M_PLATFORM_CALLBACK_UTILS_EXTENSION_CALLBACK_IN_LONG_OUT_LONG = JniMethod("extensionCallbackInLongOutLong", "(JIJ)J", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_EXTENSION_CALLBACK_IN_LONG_LONG_OUT_LONG = JniMethod("extensionCallbackInLongLongOutLong", "(JIJJ)J", true);
+            
+            const char* C_PLATFORM_UTILS = "org/apache/ignite/internal/processors/platform/utils/PlatformUtils";
+            JniMethod M_PLATFORM_UTILS_REALLOC = JniMethod("reallocate", "(JI)V", true);
+            JniMethod M_PLATFORM_UTILS_ERR_DATA = JniMethod("errorData", "(Ljava/lang/Throwable;)[B", true);
+
+            const char* C_PLATFORM_IGNITION = "org/apache/ignite/internal/processors/platform/PlatformIgnition";
+            JniMethod M_PLATFORM_IGNITION_START = JniMethod("start", "(Ljava/lang/String;Ljava/lang/String;IJJ)Lorg/apache/ignite/internal/processors/platform/PlatformProcessor;", true);
+            JniMethod M_PLATFORM_IGNITION_INSTANCE = JniMethod("instance", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformProcessor;", true);
+            JniMethod M_PLATFORM_IGNITION_ENVIRONMENT_POINTER = JniMethod("environmentPointer", "(Ljava/lang/String;)J", true);
+            JniMethod M_PLATFORM_IGNITION_STOP = JniMethod("stop", "(Ljava/lang/String;Z)Z", true);
+            JniMethod M_PLATFORM_IGNITION_STOP_ALL = JniMethod("stopAll", "(Z)V", true);
+            
+            const char* C_PLATFORM_ABSTRACT_QRY_CURSOR = "org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor";
+            JniMethod M_PLATFORM_ABSTRACT_QRY_CURSOR_ITER = JniMethod("iterator", "()V", false);
+            JniMethod M_PLATFORM_ABSTRACT_QRY_CURSOR_ITER_HAS_NEXT = JniMethod("iteratorHasNext", "()Z", false);
+            JniMethod M_PLATFORM_ABSTRACT_QRY_CURSOR_CLOSE = JniMethod("close", "()V", false);
+
+            const char* C_PLATFORM_CONT_QRY = "org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery";
+            JniMethod M_PLATFORM_CONT_QRY_CLOSE = JniMethod("close", "()V", false);
+            JniMethod M_PLATFORM_CONT_QRY_GET_INITIAL_QUERY_CURSOR = JniMethod("getInitialQueryCursor", "()Lorg/apache/ignite/internal/processors/platform/PlatformTarget;", false);
+
+            const char* C_PLATFORM_EVENTS = "org/apache/ignite/internal/processors/platform/events/PlatformEvents";
+            JniMethod M_PLATFORM_EVENTS_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/events/PlatformEvents;", false);
+            JniMethod M_PLATFORM_EVENTS_STOP_LOCAL_LISTEN = JniMethod("stopLocalListen", "(J)Z", false);
+            JniMethod M_PLATFORM_EVENTS_LOCAL_LISTEN = JniMethod("localListen", "(JI)V", false);
+            JniMethod M_PLATFORM_EVENTS_IS_ENABLED = JniMethod("isEnabled", "(I)Z", false);
+            
+            const char* C_PLATFORM_SERVICES = "org/apache/ignite/internal/processors/platform/services/PlatformServices";
+			JniMethod M_PLATFORM_SERVICES_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
+			JniMethod M_PLATFORM_SERVICES_WITH_SERVER_KEEP_PORTABLE = JniMethod("withServerKeepPortable", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
+			JniMethod M_PLATFORM_SERVICES_CANCEL = JniMethod("cancel", "(Ljava/lang/String;)V", false);
+			JniMethod M_PLATFORM_SERVICES_CANCEL_ALL = JniMethod("cancelAll", "()V", false);
+			JniMethod M_PLATFORM_SERVICES_SERVICE_PROXY = JniMethod("dotNetServiceProxy", "(Ljava/lang/String;Z)Ljava/lang/Object;", false);
+
+            /* STATIC STATE. */
+            gcc::CriticalSection JVM_LOCK;
+            JniJvm JVM;
+            bool PRINT_EXCEPTION = false;
+
+            /* HELPER METHODS. */
+
+            /*
+             * Throw exception to Java in case of missing callback pointer. It means that callback is not implemented in
+             * native platform and Java -> platform operation cannot proceede further. As JniContext is not available at
+             * this point, we have to obtain exception details from scratch. This is not critical from performance
+             * perspective because missing handler usually denotes fatal condition.
+             *
+             * @param env JNI environment.
+             */
+            int ThrowOnMissingHandler(JNIEnv* env)
+            {
+                jclass cls = env->FindClass(C_PLATFORM_NO_CALLBACK_EXCEPTION);
+
+                env->ThrowNew(cls, "Callback handler is not set in native platform.");
+
+                return 0;
+            }
+
+            char* StringToChars(JNIEnv* env, jstring str, int* len) {
+                if (!str) {
+                    *len = 0;
+                    return NULL;
+                }
+
+                const char* strChars = env->GetStringUTFChars(str, 0);
+                const int strCharsLen = env->GetStringUTFLength(str);
+
+                char* strChars0 = new char[strCharsLen + 1];
+                std::strcpy(strChars0, strChars);
+                *(strChars0 + strCharsLen) = 0;
+
+                env->ReleaseStringUTFChars(str, strChars);
+
+                if (len)
+                    *len = strCharsLen;
+
+                return strChars0;
+            }
+
+            std::string JavaStringToCString(JNIEnv* env, jstring str, int* len)
+            {
+                char* resChars = StringToChars(env, str, len);
+
+                if (resChars)
+                {
+                    std::string res = std::string(resChars, *len);
+
+                    delete[] resChars;
+                    
+                    return res;
+                }
+                else
+                    return std::string();
+            }
+
+            jclass FindClass(JNIEnv* env, const char *name) {
+                jclass res = env->FindClass(name);
+
+                if (!res)
+                    throw JvmException();
+
+                jclass res0 = static_cast<jclass>(env->NewGlobalRef(res));
+
+                env->DeleteLocalRef(res);
+
+                return res0;
+            }
+
+            void DeleteClass(JNIEnv* env, jclass cls) {
+                if (cls)
+                    env->DeleteGlobalRef(cls);
+            }
+
+            void CheckClass(JNIEnv* env, const char *name)
+            {
+                jclass res = env->FindClass(name);
+
+                if (!res)
+                    throw JvmException();
+            }
+
+            jmethodID FindMethod(JNIEnv* env, jclass cls, JniMethod mthd) {
+                jmethodID mthd0 = mthd.isStatic ?
+                    env->GetStaticMethodID(cls, mthd.name, mthd.sign) : env->GetMethodID(cls, mthd.name, mthd.sign);
+
+                if (!mthd0)
+                    throw JvmException();
+
+                return mthd0;
+            }
+
+            void AddNativeMethod(JNINativeMethod* mthd, JniMethod jniMthd, void* fnPtr) {
+                mthd->name = jniMthd.name;
+                mthd->signature = jniMthd.sign;
+                mthd->fnPtr = fnPtr;
+            }
+
+            void JniJavaMembers::Initialize(JNIEnv* env) {
+                c_Class = FindClass(env, C_CLASS);
+                m_Class_getName = FindMethod(env, c_Class, M_CLASS_GET_NAME);
+
+                c_Throwable = FindClass(env, C_THROWABLE);
+                m_Throwable_getMessage = FindMethod(env, c_Throwable, M_THROWABLE_GET_MESSAGE);
+                m_Throwable_printStackTrace = FindMethod(env, c_Throwable, M_THROWABLE_PRINT_STACK_TRACE);
+            }
+
+            void JniJavaMembers::Destroy(JNIEnv* env) {
+                DeleteClass(env, c_Class);
+                DeleteClass(env, c_Throwable);
+            }
+
+            bool JniJavaMembers::WriteErrorInfo(JNIEnv* env, char** errClsName, int* errClsNameLen, char** errMsg, int* errMsgLen) {
+                if (env && env->ExceptionCheck()) {
+                    if (m_Class_getName && m_Throwable_getMessage) {
+                        jthrowable err = env->ExceptionOccurred();
+
+                        env->ExceptionClear();
+
+                        jclass errCls = env->GetObjectClass(err);
+
+                        jstring clsName = static_cast<jstring>(env->CallObjectMethod(errCls, m_Class_getName));
+                        *errClsName = StringToChars(env, clsName, errClsNameLen);
+
+                        jstring msg = static_cast<jstring>(env->CallObjectMethod(err, m_Throwable_getMessage));
+                        *errMsg = StringToChars(env, msg, errMsgLen);
+
+                        if (errCls)
+                            env->DeleteLocalRef(errCls);
+
+                        if (clsName)
+                            env->DeleteLocalRef(clsName);
+
+                        if (msg)
+                            env->DeleteLocalRef(msg);
+
+                        return true;
+                    }
+                    else {
+                        env->ExceptionClear();
+                    }
+                }
+
+                return false;
+            }
+
+            void JniMembers::Initialize(JNIEnv* env) {
+                c_PlatformAbstractQryCursor = FindClass(env, C_PLATFORM_ABSTRACT_QRY_CURSOR);
+                m_PlatformAbstractQryCursor_iter = FindMethod(env, c_PlatformAbstractQryCursor, M_PLATFORM_ABSTRACT_QRY_CURSOR_ITER);
+                m_PlatformAbstractQryCursor_iterHasNext = FindMethod(env, c_PlatformAbstractQryCursor, M_PLATFORM_ABSTRACT_QRY_CURSOR_ITER_HAS_NEXT);
+                m_PlatformAbstractQryCursor_close = FindMethod(env, c_PlatformAbstractQryCursor, M_PLATFORM_ABSTRACT_QRY_CURSOR_CLOSE);
+
+                c_PlatformAffinity = FindClass(env, C_PLATFORM_AFFINITY);
+                m_PlatformAffinity_partitions = FindMethod(env, c_PlatformAffinity, C_PLATFORM_AFFINITY_PARTITIONS);
+
+                c_PlatformCache = FindClass(env, C_PLATFORM_CACHE);
+                m_PlatformCache_withSkipStore = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_WITH_SKIP_STORE);
+                m_PlatformCache_withNoRetries = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_WITH_NO_RETRIES);
+                m_PlatformCache_withExpiryPolicy = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_WITH_EXPIRY_PLC);
+                m_PlatformCache_withAsync = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_WITH_ASYNC);
+                m_PlatformCache_withKeepPortable = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_WITH_KEEP_PORTABLE);
+                m_PlatformCache_clear = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_CLEAR);
+                m_PlatformCache_removeAll = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_REMOVE_ALL);
+                m_PlatformCache_iterator = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_ITERATOR);
+                m_PlatformCache_localIterator = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_LOCAL_ITERATOR);
+                m_PlatformCache_enterLock = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_ENTER_LOCK);
+                m_PlatformCache_exitLock = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_EXIT_LOCK);
+                m_PlatformCache_tryEnterLock = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_TRY_ENTER_LOCK);
+                m_PlatformCache_closeLock = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_CLOSE_LOCK);
+                m_PlatformCache_rebalance = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_REBALANCE);
+                m_PlatformCache_size = FindMethod(env, c_PlatformCache, M_PLATFORM_CACHE_SIZE);
+
+                c_PlatformCacheStoreCallback = FindClass(env, C_PLATFORM_CACHE_STORE_CALLBACK);
+                m_PlatformCacheStoreCallback_invoke = FindMethod(env, c_PlatformCacheStoreCallback, M_PLATFORM_CACHE_STORE_CALLBACK_INVOKE);
+
+                c_IgniteException = FindClass(env, C_IGNITE_EXCEPTION);
+
+                c_PlatformClusterGroup = FindClass(env, C_PLATFORM_CLUSTER_GRP);
+                m_PlatformClusterGroup_forOthers = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_FOR_OTHERS);
+                m_PlatformClusterGroup_forRemotes = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_FOR_REMOTES);
+                m_PlatformClusterGroup_forDaemons = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_FOR_DAEMONS);
+                m_PlatformClusterGroup_forRandom = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_FOR_RANDOM);
+                m_PlatformClusterGroup_forOldest = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_FOR_OLDEST);
+                m_PlatformClusterGroup_forYoungest = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_FOR_YOUNGEST);
+                m_PlatformClusterGroup_resetMetrics = FindMethod(env, c_PlatformClusterGroup, M_PLATFORM_CLUSTER_GRP_RESET_METRICS);
+
+                c_PlatformCompute = FindClass(env, C_PLATFORM_COMPUTE);
+                m_PlatformCompute_withNoFailover = FindMethod(env, c_PlatformCompute, M_PLATFORM_COMPUTE_WITH_NO_FAILOVER);
+                m_PlatformCompute_withTimeout = FindMethod(env, c_PlatformCompute, M_PLATFORM_COMPUTE_WITH_TIMEOUT);
+                m_PlatformCompute_executeNative = FindMethod(env, c_PlatformCompute, M_PLATFORM_COMPUTE_EXECUTE_NATIVE);
+
+                c_PlatformContinuousQuery = FindClass(env, C_PLATFORM_CONT_QRY);
+                m_PlatformContinuousQuery_close = FindMethod(env, c_PlatformContinuousQuery, M_PLATFORM_CONT_QRY_CLOSE);
+                m_PlatformContinuousQuery_getInitialQueryCursor = FindMethod(env, c_PlatformContinuousQuery, M_PLATFORM_CONT_QRY_GET_INITIAL_QUERY_CURSOR);
+
+                c_PlatformDataStreamer = FindClass(env, C_PLATFORM_DATA_STREAMER);
+                m_PlatformDataStreamer_listenTopology = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_LISTEN_TOPOLOGY);
+                m_PlatformDataStreamer_getAllowOverwrite = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_GET_ALLOW_OVERWRITE);
+                m_PlatformDataStreamer_setAllowOverwrite = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_SET_ALLOW_OVERWRITE);
+                m_PlatformDataStreamer_getSkipStore = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_GET_SKIP_STORE);
+                m_PlatformDataStreamer_setSkipStore = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_SET_SKIP_STORE);
+                m_PlatformDataStreamer_getPerNodeBufSize = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_GET_PER_NODE_BUFFER_SIZE);
+                m_PlatformDataStreamer_setPerNodeBufSize = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_SET_PER_NODE_BUFFER_SIZE);
+                m_PlatformDataStreamer_getPerNodeParallelOps = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_GET_PER_NODE_PARALLEL_OPS);
+                m_PlatformDataStreamer_setPerNodeParallelOps = FindMethod(env, c_PlatformDataStreamer, M_PLATFORM_DATA_STREAMER_SET_PER_NODE_PARALLEL_OPS);
+                
+                c_PlatformEvents = FindClass(env, C_PLATFORM_EVENTS);
+                m_PlatformEvents_withAsync = FindMethod(env, c_PlatformEvents, M_PLATFORM_EVENTS_WITH_ASYNC);
+                m_PlatformEvents_stopLocalListen = FindMethod(env, c_PlatformEvents, M_PLATFORM_EVENTS_STOP_LOCAL_LISTEN);
+                m_PlatformEvents_localListen = FindMethod(env, c_PlatformEvents, M_PLATFORM_EVENTS_LOCAL_LISTEN);
+                m_PlatformEvents_isEnabled = FindMethod(env, c_PlatformEvents, M_PLATFORM_EVENTS_IS_ENABLED);
+                
+				c_PlatformServices = FindClass(env, C_PLATFORM_SERVICES);
+				m_PlatformServices_withAsync = FindMethod(env, c_PlatformServices, M_PLATFORM_SERVICES_WITH_ASYNC);
+				m_PlatformServices_withServerKeepPortable = FindMethod(env, c_PlatformServices, M_PLATFORM_SERVICES_WITH_SERVER_KEEP_PORTABLE);
+				m_PlatformServices_cancel = FindMethod(env, c_PlatformServices, M_PLATFORM_SERVICES_CANCEL);
+				m_PlatformServices_cancelAll = FindMethod(env, c_PlatformServices, M_PLATFORM_SERVICES_CANCEL_ALL);
+				m_PlatformServices_serviceProxy = FindMethod(env, c_PlatformServices, M_PLATFORM_SERVICES_SERVICE_PROXY);
+
+                c_PlatformIgnition = FindClass(env, C_PLATFORM_IGNITION);
+                m_PlatformIgnition_start = FindMethod(env, c_PlatformIgnition, M_PLATFORM_IGNITION_START);
+                m_PlatformIgnition_instance = FindMethod(env, c_PlatformIgnition, M_PLATFORM_IGNITION_INSTANCE);
+                m_PlatformIgnition_environmentPointer = FindMethod(env, c_PlatformIgnition, M_PLATFORM_IGNITION_ENVIRONMENT_POINTER);
+                m_PlatformIgnition_stop = FindMethod(env, c_PlatformIgnition, M_PLATFORM_IGNITION_STOP);
+                m_PlatformIgnition_stopAll = FindMethod(env, c_PlatformIgnition, M_PLATFORM_IGNITION_STOP_ALL);
+
+                c_PlatformMessaging = FindClass(env, C_PLATFORM_MESSAGING);
+                m_PlatformMessaging_withAsync = FindMethod(env, c_PlatformMessaging, M_PLATFORM_MESSAGING_WITH_ASYNC);
+
+                c_PlatformProcessor = FindClass(env, C_PLATFORM_PROCESSOR);
+                m_PlatformProcessor_releaseStart = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_RELEASE_START);
+                m_PlatformProcessor_cache = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_CACHE);
+                m_PlatformProcessor_createCache = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_CREATE_CACHE);
+                m_PlatformProcessor_getOrCreateCache = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_GET_OR_CREATE_CACHE);
+                m_PlatformProcessor_affinity = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_AFFINITY);
+                m_PlatformProcessor_dataStreamer = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_DATA_STREAMER);
+                m_PlatformProcessor_transactions = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_TRANSACTIONS);
+                m_PlatformProcessor_projection = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_PROJECTION);
+                m_PlatformProcessor_compute = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_COMPUTE);
+                m_PlatformProcessor_message = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_MESSAGE);
+                m_PlatformProcessor_events = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_EVENTS);
+                m_PlatformProcessor_services = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_SERVICES);
+                m_PlatformProcessor_extensions = FindMethod(env, c_PlatformProcessor, M_PLATFORM_PROCESSOR_EXTENSIONS);
+
+                c_PlatformTarget = FindClass(env, C_PLATFORM_TARGET);
+                m_PlatformTarget_inStreamOutLong = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_STREAM_OUT_LONG);
+                m_PlatformTarget_inStreamOutObject = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_STREAM_OUT_OBJECT);
+                m_PlatformTarget_outLong = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_OUT_LONG);
+                m_PlatformTarget_outStream = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_OUT_STREAM);
+                m_PlatformTarget_outObject = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_OUT_OBJECT);
+                m_PlatformTarget_inStreamOutStream = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_STREAM_OUT_STREAM);
+                m_PlatformTarget_inObjectStreamOutStream = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_OBJECT_STREAM_OUT_STREAM);
+                m_PlatformTarget_listenFuture = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_LISTEN_FUTURE);
+                m_PlatformTarget_listenFutureForOperation = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_LISTEN_FOR_OPERATION);
+
+                c_PlatformTransactions = FindClass(env, C_PLATFORM_TRANSACTIONS);
+                m_PlatformTransactions_txStart = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_START);
+                m_PlatformTransactions_txCommit = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_COMMIT);
+                m_PlatformTransactions_txRollback = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_ROLLBACK);
+                m_PlatformTransactions_txCommitAsync = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_COMMIT_ASYNC);
+                m_PlatformTransactions_txRollbackAsync = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_ROLLBACK_ASYNC);
+                m_PlatformTransactions_txState = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_STATE);
+                m_PlatformTransactions_txSetRollbackOnly = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_SET_ROLLBACK_ONLY);
+                m_PlatformTransactions_txClose = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_TX_CLOSE);
+                m_PlatformTransactions_resetMetrics = FindMethod(env, c_PlatformTransactions, M_PLATFORM_TRANSACTIONS_RESET_METRICS);
+
+                c_PlatformUtils = FindClass(env, C_PLATFORM_UTILS);
+                m_PlatformUtils_reallocate = FindMethod(env, c_PlatformUtils, M_PLATFORM_UTILS_REALLOC);
+                m_PlatformUtils_errData = FindMethod(env, c_PlatformUtils, M_PLATFORM_UTILS_ERR_DATA);
+
+                // Find utility classes which are not used from context, but are still required in other places.
+                CheckClass(env, C_PLATFORM_NO_CALLBACK_EXCEPTION);
+            }
+
+            void JniMembers::Destroy(JNIEnv* env) {
+                DeleteClass(env, c_PlatformAbstractQryCursor);
+                DeleteClass(env, c_PlatformAffinity);
+                DeleteClass(env, c_PlatformCache);
+                DeleteClass(env, c_PlatformCacheStoreCallback);
+                DeleteClass(env, c_IgniteException);
+                DeleteClass(env, c_PlatformClusterGroup);
+                DeleteClass(env, c_PlatformCompute);
+                DeleteClass(env, c_PlatformContinuousQuery);
+                DeleteClass(env, c_PlatformDataStreamer);
+                DeleteClass(env, c_PlatformEvents);
+                DeleteClass(env, c_PlatformIgnition);
+                DeleteClass(env, c_PlatformMessaging);
+                DeleteClass(env, c_PlatformProcessor);
+                DeleteClass(env, c_PlatformTarget);
+                DeleteClass(env, c_PlatformTransactions);
+                DeleteClass(env, c_PlatformUtils);
+            }
+
+            JniJvm::JniJvm() : jvm(NULL), javaMembers(JniJavaMembers()), members(JniMembers())
+            {
+                // No-op.
+            }
+
+            JniJvm::JniJvm(JavaVM* jvm, JniJavaMembers javaMembers, JniMembers members) : 
+                jvm(jvm), javaMembers(javaMembers), members(members)
+            {
+                // No-op.
+            }
+
+            JavaVM* JniJvm::GetJvm()
+            {
+                return jvm;
+            }
+
+            JniJavaMembers& JniJvm::GetJavaMembers()
+            {
+                return javaMembers;
+            }
+
+            JniMembers& JniJvm::GetMembers()
+            {
+                return members;
+            }
+
+            /*
+             * Create JVM.
+             */
+            void CreateJvm(char** opts, int optsLen, JavaVM** jvm, JNIEnv** env) {
+                JavaVMOption* opts0 = new JavaVMOption[optsLen];
+
+                for (int i = 0; i < optsLen; i++)
+                    opts0[i].optionString = *(opts + i);
+
+                JavaVMInitArgs args;
+
+                args.version = JNI_VERSION_1_6;
+                args.nOptions = optsLen;
+                args.options = opts0;
+                args.ignoreUnrecognized = 0;
+
+                jint res = JNI_CreateJavaVM(jvm, reinterpret_cast<void**>(env), &args);
+
+                delete[] opts0;
+
+                if (res != JNI_OK)
+                    throw JvmException();
+            }
+
+            void RegisterNatives(JNIEnv* env) {
+                {
+					JNINativeMethod methods[52];
+
+                    int idx = 0;
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_CREATE, reinterpret_cast<void*>(JniCacheStoreCreate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_INVOKE, reinterpret_cast<void*>(JniCacheStoreInvoke));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_DESTROY, reinterpret_cast<void*>(JniCacheStoreDestroy));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_STORE_SESSION_CREATE, reinterpret_cast<void*>(JniCacheStoreSessionCreate));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_ENTRY_FILTER_CREATE, reinterpret_cast<void*>(JniCacheEntryFilterCreate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_ENTRY_FILTER_APPLY, reinterpret_cast<void*>(JniCacheEntryFilterApply));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_ENTRY_FILTER_DESTROY, reinterpret_cast<void*>(JniCacheEntryFilterDestroy));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CACHE_INVOKE, reinterpret_cast<void*>(JniCacheInvoke));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_MAP, reinterpret_cast<void*>(JniComputeTaskMap));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_JOB_RESULT, reinterpret_cast<void*>(JniComputeTaskJobResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_REDUCE, reinterpret_cast<void*>(JniComputeTaskReduce));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_TASK_COMPLETE, reinterpret_cast<void*>(JniComputeTaskComplete));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_SERIALIZE, reinterpret_cast<void*>(JniComputeJobSerialize));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_CREATE, reinterpret_cast<void*>(JniComputeJobCreate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_EXECUTE, reinterpret_cast<void*>(JniComputeJobExecute));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_DESTROY, reinterpret_cast<void*>(JniComputeJobDestroy));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_COMPUTE_JOB_CANCEL, reinterpret_cast<void*>(JniComputeJobCancel));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_LSNR_APPLY, reinterpret_cast<void*>(JniContinuousQueryListenerApply));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_FILTER_CREATE, reinterpret_cast<void*>(JniContinuousQueryFilterCreate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_FILTER_EVAL, reinterpret_cast<void*>(JniContinuousQueryFilterApply));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CONTINUOUS_QUERY_FILTER_RELEASE, reinterpret_cast<void*>(JniContinuousQueryFilterRelease));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_DATA_STREAMER_TOPOLOGY_UPDATE, reinterpret_cast<void*>(JniDataStreamerTopologyUpdate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_DATA_STREAMER_STREAM_RECEIVER_INVOKE, reinterpret_cast<void*>(JniDataStreamerStreamReceiverInvoke));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_BYTE_RES, reinterpret_cast<void*>(JniFutureByteResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_BOOL_RES, reinterpret_cast<void*>(JniFutureBoolResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_SHORT_RES, reinterpret_cast<void*>(JniFutureShortResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_CHAR_RES, reinterpret_cast<void*>(JniFutureCharResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_INT_RES, reinterpret_cast<void*>(JniFutureIntResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_FLOAT_RES, reinterpret_cast<void*>(JniFutureFloatResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_LONG_RES, reinterpret_cast<void*>(JniFutureLongResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_DOUBLE_RES, reinterpret_cast<void*>(JniFutureDoubleResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_OBJ_RES, reinterpret_cast<void*>(JniFutureObjectResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_NULL_RES, reinterpret_cast<void*>(JniFutureNullResult));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_FUTURE_ERR, reinterpret_cast<void*>(JniFutureError));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_LIFECYCLE_EVENT, reinterpret_cast<void*>(JniLifecycleEvent));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_MESSAGING_FILTER_CREATE, reinterpret_cast<void*>(JniMessagingFilterCreate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_MESSAGING_FILTER_APPLY, reinterpret_cast<void*>(JniMessagingFilterApply));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_MESSAGING_FILTER_DESTROY, reinterpret_cast<void*>(JniMessagingFilterDestroy));
+                    
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_EVENT_FILTER_CREATE, reinterpret_cast<void*>(JniEventFilterCreate));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_EVENT_FILTER_APPLY, reinterpret_cast<void*>(JniEventFilterApply));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_EVENT_FILTER_DESTROY, reinterpret_cast<void*>(JniEventFilterDestroy));
+                    
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_SERVICE_INIT, reinterpret_cast<void*>(JniServiceInit));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_SERVICE_EXECUTE, reinterpret_cast<void*>(JniServiceExecute));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_SERVICE_CANCEL, reinterpret_cast<void*>(JniServiceCancel));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_SERVICE_INVOKE_METHOD, reinterpret_cast<void*>(JniServiceInvokeMethod));
+					
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_CLUSTER_NODE_FILTER_APPLY, reinterpret_cast<void*>(JniClusterNodeFilterApply));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_NODE_INFO, reinterpret_cast<void*>(JniNodeInfo));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_MEMORY_REALLOCATE, reinterpret_cast<void*>(JniMemoryReallocate));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_ON_START, reinterpret_cast<void*>(JniOnStart));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_ON_STOP, reinterpret_cast<void*>(JniOnStop));
+
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_EXTENSION_CALLBACK_IN_LONG_OUT_LONG, reinterpret_cast<void*>(JniExtensionCallbackInLongOutLong));
+                    AddNativeMethod(methods + idx++, M_PLATFORM_CALLBACK_UTILS_EXTENSION_CALLBACK_IN_LONG_LONG_OUT_LONG, reinterpret_cast<void*>(JniExtensionCallbackInLongLongOutLong));
+
+                    jint res = env->RegisterNatives(FindClass(env, C_PLATFORM_CALLBACK_UTILS), methods, idx);
+
+                    if (res != JNI_OK)
+                        throw JvmException();
+                }  
+            }
+
+            JniContext::JniContext(JniJvm* jvm, JniHandlers hnds) : jvm(jvm), hnds(hnds) {
+                // No-op.
+            }
+
+            JniContext* JniContext::Create(char** opts, int optsLen, JniHandlers hnds) {
+                return Create(opts, optsLen, hnds, NULL);
+            }
+
+            JniContext* JniContext::Create(char** opts, int optsLen, JniHandlers hnds, JniErrorInfo* errInfo)
+            {
+                // Acquire global lock to instantiate the JVM.
+                JVM_LOCK.Enter();
+
+                // Define local variables.
+                JavaVM* jvm = NULL;
+                JNIEnv* env = NULL;
+
+                JniJavaMembers javaMembers;
+                memset(&javaMembers, 0, sizeof(javaMembers));
+
+                JniMembers members;
+                memset(&members, 0, sizeof(members));
+
+                JniContext* ctx = NULL;
+
+                std::string errClsName;
+                int errClsNameLen = 0;
+                std::string errMsg;
+                int errMsgLen = 0;
+
+                try {
+                    if (!JVM.GetJvm()) {
+                        // 1. Create JVM itself.    
+                        CreateJvm(opts, optsLen, &jvm, &env);
+
+                        // 2. Populate members;
+                        javaMembers.Initialize(env);
+                        members.Initialize(env);
+
+                        // 3. Register native functions.
+                        RegisterNatives(env);
+
+                        // 4. Create JNI JVM.
+                        JVM = JniJvm(jvm, javaMembers, members);
+
+                        char* printStack = getenv("IGNITE_CPP_PRINT_STACK");
+                        PRINT_EXCEPTION = printStack && strcmp("true", printStack) == 0;
+                    }
+
+                    ctx = new JniContext(&JVM, hnds);
+                }
+                catch (JvmException)
+                {
+                    char* errClsNameChars = NULL;
+                    char* errMsgChars = NULL;
+
+                    // Read error info if possible.
+                    javaMembers.WriteErrorInfo(env, &errClsNameChars, &errClsNameLen, &errMsgChars, &errMsgLen);
+
+                    if (errClsNameChars) {
+                        errClsName = errClsNameChars;
+
+                        delete[] errClsNameChars;
+                    }
+
+                    if (errMsgChars)
+                    {
+                        errMsg = errMsgChars;
+
+                        delete[] errMsgChars;
+                    }
+
+                    // Destroy mmebers.
+                    if (env) {
+                        members.Destroy(env);
+                        javaMembers.Destroy(env);
+                    }
+
+                    // Destroy faulty JVM.
+                    if (jvm)
+                        jvm->DestroyJavaVM();
+                }
+
+                // It safe to release the lock at this point.
+                JVM_LOCK.Leave();
+
+                // Notify err callback if needed.
+                if (!ctx) {
+                    if (errInfo) {
+                        JniErrorInfo errInfo0(IGNITE_JNI_ERR_JVM_INIT, errClsName.c_str(), errMsg.c_str());
+
+                        *errInfo = errInfo0;
+                    }
+
+                    if (hnds.error)
+                        hnds.error(hnds.target, IGNITE_JNI_ERR_JVM_INIT, errClsName.c_str(), errClsNameLen,
+                            errMsg.c_str(), errMsgLen, NULL, 0);
+                }
+
+                return ctx;
+            }
+
+            int JniContext::Reallocate(long long memPtr, int cap) {
+                JavaVM* jvm = JVM.GetJvm();
+
+                JNIEnv* env;
+
+                int attachRes = jvm->AttachCurrentThread(reinterpret_cast<void**>(&env), NULL);
+
+                if (attachRes == JNI_OK)
+                    AttachHelper::OnThreadAttach();
+                else
+                    return -1;
+
+                env->CallStaticVoidMethod(JVM.GetMembers().c_PlatformUtils, JVM.GetMembers().m_PlatformUtils_reallocate, memPtr, cap);
+
+                if (env->ExceptionCheck()) {
+                    env->ExceptionClear();
+
+                    return -1;
+                }
+
+                return 0;
+            }
+
+            void JniContext::Detach() {
+                gcc::Memory::Fence();
+
+                if (JVM.GetJvm()) {
+                    JNIEnv* env;
+
+                    JVM.GetJvm()->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
+
+                    if (env)
+                        JVM.GetJvm()->DetachCurrentThread();
+                }
+            }
+
+            jobject JniContext::IgnitionStart(char* cfgPath, char* gridName, int factoryId, long long dataPtr) {
+                return IgnitionStart(cfgPath, gridName, factoryId, dataPtr, NULL);
+            }
+            
+            jobject JniContext::IgnitionStart(char* cfgPath, char* gridName, int factoryId, long long dataPtr, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                jstring cfgPath0 = env->NewStringUTF(cfgPath);
+                jstring gridName0 = env->NewStringUTF(gridName);
+
+                jobject interop = env->CallStaticObjectMethod(
+                    jvm->GetMembers().c_PlatformIgnition,
+                    jvm->GetMembers().m_PlatformIgnition_start,
+                    cfgPath0,
+                    gridName0,
+                    factoryId,
+                    reinterpret_cast<long long>(&hnds),
+                    dataPtr
+                );
+
+                ExceptionCheck(env, errInfo);
+
+                return LocalToGlobal(env, interop);
+            }
+
+
+            jobject JniContext::IgnitionInstance(char* gridName)
+            {
+                return IgnitionInstance(gridName, NULL);
+            }
+
+            jobject JniContext::IgnitionInstance(char* gridName, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                jstring gridName0 = env->NewStringUTF(gridName);
+
+                jobject interop = env->CallStaticObjectMethod(jvm->GetMembers().c_PlatformIgnition,
+                    jvm->GetMembers().m_PlatformIgnition_instance, gridName0);
+
+                ExceptionCheck(env, errInfo);
+
+                return LocalToGlobal(env, interop);
+            }
+
+            long long JniContext::IgnitionEnvironmentPointer(char* gridName)
+            {
+                return IgnitionEnvironmentPointer(gridName, NULL);
+            }
+
+            long long JniContext::IgnitionEnvironmentPointer(char* gridName, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                jstring gridName0 = env->NewStringUTF(gridName);
+
+                long long res = env->CallStaticLongMethod(jvm->GetMembers().c_PlatformIgnition,
+                    jvm->GetMembers().m_PlatformIgnition_environmentPointer, gridName0);
+
+                ExceptionCheck(env, errInfo);
+
+                return res;
+            }
+
+            bool JniContext::IgnitionStop(char* gridName, bool cancel)
+            {
+                return IgnitionStop(gridName, cancel, NULL);
+            }
+
+            bool JniContext::IgnitionStop(char* gridName, bool cancel, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                jstring gridName0 = env->NewStringUTF(gridName);
+
+                jboolean res = env->CallStaticBooleanMethod(jvm->GetMembers().c_PlatformIgnition, jvm->GetMembers().m_PlatformIgnition_stop,
+                    gridName0, cancel);
+
+                ExceptionCheck(env, errInfo);
+
+                return res != 0;
+            }
+
+            void JniContext::IgnitionStopAll(bool cancel)
+            {
+                return IgnitionStopAll(cancel, NULL);
+            }
+
+            void JniContext::IgnitionStopAll(bool cancel, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                env->CallStaticVoidMethod(jvm->GetMembers().c_PlatformIgnition, jvm->GetMembers().m_PlatformIgnition_stopAll, cancel);
+
+                ExceptionCheck(env, errInfo);
+            }
+
+            void JniContext::ProcessorReleaseStart(jobject obj) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformProcessor_releaseStart);
+
+                ExceptionCheck(env);
+            }
+
+            jobject JniContext::ProcessorProjection(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject prj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_projection);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, prj);
+            }
+
+            jobject JniContext::ProcessorCache0(jobject obj, const char* name, jmethodID mthd, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                jstring name0 = name != NULL ? env->NewStringUTF(name) : NULL;
+
+                jobject cache = env->CallObjectMethod(obj, mthd, name0);
+
+                if (name0)
+                    env->DeleteLocalRef(name0);
+
+                ExceptionCheck(env, errInfo);
+
+                return LocalToGlobal(env, cache);
+            }
+
+            jobject JniContext::ProcessorCache(jobject obj, const char* name) {
+                return ProcessorCache(obj, name, NULL);
+            }
+
+            jobject JniContext::ProcessorCache(jobject obj, const char* name, JniErrorInfo* errInfo) {
+                return ProcessorCache0(obj, name, jvm->GetMembers().m_PlatformProcessor_cache, errInfo);
+            }
+
+            jobject JniContext::ProcessorCreateCache(jobject obj, const char* name) {
+                return ProcessorCreateCache(obj, name, NULL);
+            }
+
+            jobject JniContext::ProcessorCreateCache(jobject obj, const char* name, JniErrorInfo* errInfo)
+            {
+                return ProcessorCache0(obj, name, jvm->GetMembers().m_PlatformProcessor_createCache, errInfo);
+            }
+
+            jobject JniContext::ProcessorGetOrCreateCache(jobject obj, const char* name) {
+                return ProcessorGetOrCreateCache(obj, name, NULL);
+            }
+
+            jobject JniContext::ProcessorGetOrCreateCache(jobject obj, const char* name, JniErrorInfo* errInfo)
+            {
+                return ProcessorCache0(obj, name, jvm->GetMembers().m_PlatformProcessor_getOrCreateCache, errInfo);
+            }
+
+            jobject JniContext::ProcessorAffinity(jobject obj, const char* name) {
+                JNIEnv* env = Attach();
+
+                jstring name0 = name != NULL ? env->NewStringUTF(name) : NULL;
+
+                jobject aff = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_affinity, name0);
+
+                if (name0)
+                    env->DeleteLocalRef(name0);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, aff);
+            }
+
+            jobject JniContext::ProcessorDataStreamer(jobject obj, const char* name, bool keepPortable) {
+                JNIEnv* env = Attach();
+
+                jstring name0 = name != NULL ? env->NewStringUTF(name) : NULL;
+
+                jobject ldr = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_dataStreamer, name0,
+                    keepPortable);
+
+                if (name0)
+                    env->DeleteLocalRef(name0);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, ldr);
+            }
+
+            jobject JniContext::ProcessorTransactions(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject tx = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_transactions);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, tx);
+            }
+            
+            jobject JniContext::ProcessorCompute(jobject obj, jobject prj) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_compute, prj);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            jobject JniContext::ProcessorMessage(jobject obj, jobject prj) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_message, prj);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            jobject JniContext::ProcessorEvents(jobject obj, jobject prj) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_events, prj);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            jobject JniContext::ProcessorServices(jobject obj, jobject prj) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_services, prj);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+            
+            jobject JniContext::ProcessorExtensions(jobject obj)
+            {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformProcessor_extensions);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            long long JniContext::TargetInStreamOutLong(jobject obj, int opType, long long memPtr, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                long long res = env->CallLongMethod(obj, jvm->GetMembers().m_PlatformTarget_inStreamOutLong, opType, memPtr);
+
+                ExceptionCheck(env, err);
+
+                return res;
+            }
+
+            void JniContext::TargetInStreamOutStream(jobject obj, int opType, long long inMemPtr, long long outMemPtr, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_inStreamOutStream, opType, inMemPtr, outMemPtr);
+
+                ExceptionCheck(env, err);
+            }
+
+           jobject JniContext::TargetInStreamOutObject(jobject obj, int opType, long long memPtr, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformTarget_inStreamOutObject, opType, memPtr);
+
+                ExceptionCheck(env, err);
+
+                return LocalToGlobal(env, res);
+            }
+
+            void JniContext::TargetInObjectStreamOutStream(jobject obj, int opType, void* arg, long long inMemPtr, long long outMemPtr, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_inObjectStreamOutStream, opType, arg, inMemPtr, outMemPtr);
+
+                ExceptionCheck(env, err);
+            }
+
+            long long JniContext::TargetOutLong(jobject obj, int opType, JniErrorInfo* err)
+            {
+                JNIEnv* env = Attach();
+
+                jlong res = env->CallLongMethod(obj, jvm->GetMembers().m_PlatformTarget_outLong, opType);
+
+                ExceptionCheck(env, err);
+
+                return res;
+            }
+
+            void JniContext::TargetOutStream(jobject obj, int opType, long long memPtr, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_outStream, opType, memPtr);
+
+                ExceptionCheck(env, err);
+            }
+
+            jobject JniContext::TargetOutObject(jobject obj, int opType, JniErrorInfo* err)
+            {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformTarget_outObject, opType);
+
+                ExceptionCheck(env, err);
+
+                return LocalToGlobal(env, res);
+            }
+
+            void JniContext::TargetListenFuture(jobject obj, long long futId, int typ) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_listenFuture, futId, typ);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::TargetListenFutureForOperation(jobject obj, long long futId, int typ, int opId) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_listenFutureForOperation, futId, typ, opId);
+
+                ExceptionCheck(env);
+            }
+
+            int JniContext::AffinityPartitions(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jint parts = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformAffinity_partitions);
+
+                ExceptionCheck(env);
+
+                return parts;
+            }
+
+            jobject JniContext::CacheWithSkipStore(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject cache = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_withSkipStore);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, cache);
+            }
+
+            jobject JniContext::CacheWithNoRetries(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject cache = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_withNoRetries);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, cache);
+            }
+
+            jobject JniContext::CacheWithExpiryPolicy(jobject obj, long long create, long long update, long long access) {
+                JNIEnv* env = Attach();
+
+                jobject cache = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_withExpiryPolicy,
+                    create, update, access);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, cache);
+            }
+
+            jobject JniContext::CacheWithAsync(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject cache = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_withAsync);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, cache);
+            }
+
+            jobject JniContext::CacheWithKeepPortable(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject cache = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_withKeepPortable);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, cache);
+            }
+
+            void JniContext::CacheClear(jobject obj, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCache_clear);
+
+                ExceptionCheck(env, err);
+            }
+
+            void JniContext::CacheRemoveAll(jobject obj, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCache_removeAll);
+
+                ExceptionCheck(env, err);
+            }
+
+            jobject JniContext::CacheOutOpQueryCursor(jobject obj, int type, long long memPtr, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(
+                    obj, jvm->GetMembers().m_PlatformTarget_inStreamOutObject, type, memPtr);
+
+                ExceptionCheck(env, err);
+
+                return LocalToGlobal(env, res);
+            }
+
+            jobject JniContext::CacheOutOpContinuousQuery(jobject obj, int type, long long memPtr) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(
+                    obj, jvm->GetMembers().m_PlatformTarget_inStreamOutObject, type, memPtr);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            jobject JniContext::CacheIterator(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_iterator);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            jobject JniContext::CacheLocalIterator(jobject obj, int peekModes) {
+                JNIEnv*env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformCache_localIterator, peekModes);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+            void JniContext::CacheEnterLock(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCache_enterLock, id);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::CacheExitLock(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCache_exitLock, id);
+
+                ExceptionCheck(env);
+            }
+
+            bool JniContext::CacheTryEnterLock(jobject obj, long long id, long long timeout) {
+                JNIEnv* env = Attach();
+
+                jboolean res = env->CallBooleanMethod(obj, jvm->GetMembers().m_PlatformCache_tryEnterLock, id, timeout);
+
+                ExceptionCheck(env);
+
+                return res != 0;
+            }
+
+            void JniContext::CacheCloseLock(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCache_closeLock, id);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::CacheRebalance(jobject obj, long long futId) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCache_rebalance, futId);
+
+                ExceptionCheck(env);
+            }
+
+            int JniContext::CacheSize(jobject obj, int peekModes, bool loc, JniErrorInfo* err) {
+                JNIEnv* env = Attach();
+
+                jint res = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformCache_size, peekModes, loc);
+
+                ExceptionCheck(env, err);
+
+                return res;
+            }
+
+            void JniContext::CacheStoreCallbackInvoke(jobject obj, long long memPtr) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCacheStoreCallback_invoke, memPtr);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::ComputeWithNoFailover(jobject obj) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCompute_withNoFailover);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::ComputeWithTimeout(jobject obj, long long timeout) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCompute_withTimeout, timeout);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::ComputeExecuteNative(jobject obj, long long taskPtr, long long topVer) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformCompute_executeNative, taskPtr, topVer);
+
+                ExceptionCheck(env);
+            }
+
+            void JniContext::ContinuousQueryClose(jobject obj) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformContinuousQuery_close);
+
+                ExceptionCheck(env);
+            }
+
+            void* JniContext::ContinuousQueryGetInitialQueryCursor(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformContinuousQuery_getInitialQueryCursor);
+
+                ExceptionCheck(env);
+
+                return res;
+            }
+
+            void JniContext::DataStreamerListenTopology(jobject obj, long long ptr) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_listenTopology, ptr);
+
+                ExceptionCheck(env);
+            }
+
+            bool JniContext::DataStreamerAllowOverwriteGet(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jboolean res = env->CallBooleanMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_getAllowOverwrite);
+
+                ExceptionCheck(env);
+
+                return res != 0;
+            }
+
+            void JniContext::DataStreamerAllowOverwriteSet(jobject obj, bool val) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_setAllowOverwrite, val);
+
+                ExceptionCheck(env);
+            }
+
+            bool JniContext::DataStreamerSkipStoreGet(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jboolean res = env->CallBooleanMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_getSkipStore);
+
+                ExceptionCheck(env);
+
+                return res != 0;
+            }
+
+            void JniContext::DataStreamerSkipStoreSet(jobject obj, bool val) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_setSkipStore, val);
+
+                ExceptionCheck(env);
+            }
+
+            int JniContext::DataStreamerPerNodeBufferSizeGet(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jint res = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_getPerNodeBufSize);
+
+                ExceptionCheck(env);
+
+                return res;
+            }
+
+            void JniContext::DataStreamerPerNodeBufferSizeSet(jobject obj, int val) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_setPerNodeBufSize, val);
+
+                ExceptionCheck(env);
+            }
+
+            int JniContext::DataStreamerPerNodeParallelOperationsGet(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jint res = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_getPerNodeParallelOps);
+
+                ExceptionCheck(env);
+
+                return res;
+            }
+
+            void JniContext::DataStreamerPerNodeParallelOperationsSet(jobject obj, int val) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformDataStreamer_setPerNodeParallelOps, val);
+
+                ExceptionCheck(env);
+            }
+
+            jobject JniContext::MessagingWithAsync(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject msg = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformMessaging_withAsync);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, msg);
+            }
+
+            jobject JniContext::ProjectionForOthers(jobject obj, jobject prj) {
+                JNIEnv* env = Attach();
+
+                jobject newPrj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_forOthers, prj);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, newPrj);
+            }
+
+            jobject JniContext::ProjectionForRemotes(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject newPrj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_forRemotes);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, newPrj);
+            }
+
+            jobject JniContext::ProjectionForDaemons(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject newPrj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_forDaemons);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, newPrj);
+            }
+
+            jobject JniContext::ProjectionForRandom(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject newPrj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_forRandom);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, newPrj);
+            }
+
+            jobject JniContext::ProjectionForOldest(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject newPrj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_forOldest);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, newPrj);
+            }
+
+            jobject JniContext::ProjectionForYoungest(jobject obj) {
+                JNIEnv* env = Attach();
+
+                jobject newPrj = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_forYoungest);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, newPrj);
+            }
+
+            void JniContext::ProjectionResetMetrics(jobject obj) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformClusterGroup_resetMetrics);
+
+                ExceptionCheck(env);
+            }
+
+            jobject JniContext::ProjectionOutOpRet(jobject obj, int type, long long memPtr) {
+                JNIEnv* env = Attach();
+
+                jobject res = env->CallObjectMethod(
+                    obj, jvm->GetMembers().m_PlatformTarget_inStreamOutObject, type, memPtr);
+
+                ExceptionCheck(env);
+
+                return LocalToGlobal(env, res);
+            }
+
+
+            void JniContext::QueryCursorIterator(jobject obj, JniErrorInfo* errInfo) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformAbstractQryCursor_iter);
+
+                ExceptionCheck(env, errInfo);
+            }
+
+            bool JniContext::QueryCursorIteratorHasNext(jobject obj, JniErrorInfo* errInfo)
+            {
+                JNIEnv* env = Attach();
+
+                jboolean res = env->CallBooleanMethod(obj, jvm->GetMembers().m_PlatformAbstractQryCursor_iterHasNext);
+
+                ExceptionCheck(env, errInfo);
+
+                return res != 0;
+            }
+
+            void JniContext::QueryCursorClose(jobject obj, JniErrorInfo* errInfo) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformAbstractQryCursor_close);
+
+                ExceptionCheck(env, errInfo);
+            }
+
+            long long JniContext::TransactionsStart(jobject obj, int concurrency, int isolation, long long timeout, int txSize) {
+                JNIEnv* env = Attach();
+
+                long long id = env->CallLongMethod(obj, jvm->GetMembers().m_PlatformTransactions_txStart, concurrency, isolation, timeout, txSize);
+
+                ExceptionCheck(env);
+
+                return id;
+            }
+
+            int JniContext::TransactionsCommit(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                int res = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformTransactions_txCommit, id);
+
+                ExceptionCheck(env);
+
+                return res;
+            }
+
+            void JniContext::TransactionsCommitAsync(jobject obj, long long id, long long futId) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTransactions_txCommitAsync, id, futId);
+
+                ExceptionCheck(env);
+            }
+
+            int JniContext::TransactionsRollback(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                int res = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformTransactions_txRollback, id);
+
+                ExceptionCheck(env);
+
+                return res;
+            }
+
+            void JniContext::TransactionsRollbackAsync(jobject obj, long long id, long long futId) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTransactions_txRollbackAsync, id, futId);
+
+                ExceptionCheck(env);
+            }
+
+            int JniContext::TransactionsClose(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                jint state = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformTransactions_txClose, id);
+
+                ExceptionCheck(env);
+
+                return state;
+            }
+
+            int JniContext::TransactionsState(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                jint state = env->CallIntMethod(obj, jvm->GetMembers().m_PlatformTransactions_txState, id);
+
+                ExceptionCheck(env);
+
+                return state;
+            }
+
+            bool JniContext::TransactionsSetRollbackOnly(jobject obj, long long id) {
+                JNIEnv* env = Attach();
+
+                jboolean res = env->CallBooleanMethod(obj, jvm->GetMembers().m_PlatformTransactions_txSetRollbackOnly, id);
+
+                ExceptionCheck(env);
+
+                return res != 0;
+            }
+
+            void JniContext::TransactionsResetMetrics(jobject obj) {
+                JNIEnv* env = Attach();
+
+                env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTransactions_resetMetrics);
+
+                ExceptionCheck(env);
+            }
+
+            jobject JniContext::EventsWithAsync(jobject obj) {
+                JNIEnv * env = Attach();
+
+                jobject res = env->CallObjectMethod(

<TRUNCATED>

[79/82] [abbrv] ignite git commit: gg-10705

Posted by sb...@apache.org.
gg-10705


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

Branch: refs/heads/ignite-1093-2
Commit: fda434c89eaf19ce701cd54ad14d037cea9b7c1c
Parents: 0e25f55
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 1 13:20:31 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 1 13:20:31 2015 +0300

----------------------------------------------------------------------
 modules/core/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fda434c8/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 6f1cbf8..698606e 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -40,6 +40,10 @@
         </repository>
     </repositories>
 
+    <properties>
+        <ignite.update.notifier.product>apache-ignite</ignite.update.notifier.product>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>javax.cache</groupId>
@@ -310,7 +314,7 @@
 
                                         <replaceregexp file="${props.file}" byline="true">
                                             <regexp pattern="ignite.update.status.params=.*" />
-                                            <substitution expression="ignite.update.status.params=ver=${project.version}" />
+                                            <substitution expression="ignite.update.status.params=ver=${project.version}&amp;product=${ignite.update.notifier.product}" />
                                         </replaceregexp>
 
                                         <replaceregexp file="${props.file}" byline="true">


[41/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRangeInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRangeInputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRangeInputStream.java
index 1507d73..3bc1ac9 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRangeInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRangeInputStream.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.EOFException;
+import java.io.IOException;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Decorator for regular {@link org.apache.ignite.igfs.IgfsInputStream} which streams only data within the given range.
@@ -194,4 +194,4 @@ public final class IgfsRangeInputStream extends IgfsInputStream {
     @Override public String toString() {
         return S.toString(IgfsRangeInputStream.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
index cc1d73f..41b7af2 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * IGFS record resolver. When {@link IgfsTask} is split into {@link IgfsJob}s each produced job will obtain
@@ -53,4 +54,4 @@ public interface IgfsRecordResolver extends Serializable {
      */
     @Nullable public IgfsFileRange resolveRecords(IgniteFileSystem fs, IgfsInputStream stream,
         IgfsFileRange suggestedRecord) throws IgniteException, IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
index 9936140..34eb7da 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.igfs.IgfsBlockLocation;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * IGFS task which can be executed on the grid using one of {@code IgniteFs.execute()} methods. Essentially IGFS task
@@ -169,4 +177,4 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>,
 
         return res;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java
index 5ef5352..11c09b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.igfs.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.igfs.IgfsPath;
 
 /**
  * IGFS task arguments. When you initiate new IGFS task execution using one of {@code IgniteFs.execute(...)} methods,
@@ -79,4 +78,4 @@ public interface IgfsTaskArgs<T> {
      * @return Maximum range length.
      */
     public long maxRangeLength();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskNoReduceAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskNoReduceAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskNoReduceAdapter.java
index 25839a0..0a2d334 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskNoReduceAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskNoReduceAdapter.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.compute.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJobResult;
 
 /**
  * Convenient {@link IgfsTask} adapter with empty reduce step. Use this adapter in case you are not interested in
@@ -39,4 +38,4 @@ public abstract class IgfsTaskNoReduceAdapter<T, R> extends IgfsTask<T, R> {
     @Override public R reduce(List<ComputeJobResult> results) {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
index c9ed821..c8ded42 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
@@ -17,17 +17,24 @@
 
 package org.apache.ignite.igfs.mapreduce.records;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.mapreduce.IgfsFileRange;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Record resolver which adjusts records based on provided delimiters. Both start position and length are
@@ -344,4 +351,4 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte
             delims = new LinkedList<>();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsFixedLengthRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsFixedLengthRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsFixedLengthRecordResolver.java
index bcc8f69..1ea3966 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsFixedLengthRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsFixedLengthRecordResolver.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.igfs.mapreduce.records;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.mapreduce.IgfsFileRange;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Record resolver which adjusts records to fixed length. That is, start offset of the record is shifted to the
@@ -83,4 +87,4 @@ public class IgfsFixedLengthRecordResolver implements IgfsRecordResolver, Extern
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         recLen = in.readLong();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsNewLineRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsNewLineRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsNewLineRecordResolver.java
index 54dbd54..a5db7aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsNewLineRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsNewLineRecordResolver.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.igfs.mapreduce.records;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Record resolver based on new line detection. This resolver can detect new lines based on '\n' or '\r\n' sequences.
@@ -63,4 +62,4 @@ public class IgfsNewLineRecordResolver extends IgfsByteDelimiterRecordResolver {
     @Override public String toString() {
         return S.toString(IgfsNewLineRecordResolver.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsStringDelimiterRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsStringDelimiterRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsStringDelimiterRecordResolver.java
index 1aeacb6..5f1d388 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsStringDelimiterRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsStringDelimiterRecordResolver.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.igfs.mapreduce.records;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.charset.*;
+import java.io.Externalizable;
+import java.nio.charset.Charset;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Record resolver based on delimiters represented as strings. Works in the same way as
@@ -81,4 +80,4 @@ public class IgfsStringDelimiterRecordResolver extends IgfsByteDelimiterRecordRe
     @Override public String toString() {
         return S.toString(IgfsStringDelimiterRecordResolver.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
index cb69352..ca6ecb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.igfs.secondary;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.OutputStream;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsPath;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Secondary file system interface.
@@ -205,4 +206,4 @@ public interface IgfsSecondaryFileSystem {
      * @throws IgniteException in case of an error.
      */
     public void close() throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystemPositionedReadable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystemPositionedReadable.java b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystemPositionedReadable.java
index 3d36236..1ab5393 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystemPositionedReadable.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystemPositionedReadable.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.igfs.secondary;
 
-import java.io.*;
+import java.io.Closeable;
+import java.io.IOException;
 
 /**
  * The simplest data input interface to read from secondary file system.
@@ -35,4 +36,4 @@ public interface IgfsSecondaryFileSystemPositionedReadable extends Closeable {
      * @throws IOException In case of any exception.
      */
     public int read(long pos, byte[] buf, int off, int len) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/AsyncSupportAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/AsyncSupportAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/AsyncSupportAdapter.java
index e02cb89..a4bb37b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/AsyncSupportAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/AsyncSupportAdapter.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Adapter for {@link org.apache.ignite.lang.IgniteAsyncSupport}.
@@ -118,4 +119,4 @@ public class AsyncSupportAdapter<T extends IgniteAsyncSupport> implements Ignite
     protected <R> IgniteFuture<R> createFuture(IgniteInternalFuture<R> fut) {
         return new IgniteFutureImpl<>(fut);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
index 67dc5e6..ef81c6a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
 
 /**
  * Local node metrics MBean.
@@ -321,4 +321,4 @@ public class ClusterLocalNodeMetricsMXBeanImpl implements ClusterLocalNodeMetric
     @Override public String toString() {
         return S.toString(ClusterLocalNodeMetricsMXBeanImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index 6da45ea..8a0bc5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
-
-import static java.lang.Math.*;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 
 /**
  * Implementation for {@link ClusterMetrics} interface.
@@ -1402,4 +1406,4 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
     @Override public String toString() {
         return S.toString(ClusterMetricsSnapshot.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
index a76c17b..d511480 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
@@ -17,16 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionAttributeListener;
+import org.apache.ignite.compute.ComputeTaskSessionScope;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class provide implementation for task future.
@@ -250,4 +263,4 @@ public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
             return ((ComputeTaskInternalFuture<R>)fut).getTaskSession();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
----------------------------------------------------------------------
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 7c80db6..552dffa 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
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.plugin.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.CachePluginContext;
 
 /**
  * Cache plugin context.
@@ -75,4 +78,4 @@ public class GridCachePluginContext<C extends CachePluginConfiguration> implemen
     @Override public IgniteLogger log(Class<?> cls) {
         return ctx.log(cls);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridClosureCallMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridClosureCallMode.java b/modules/core/src/main/java/org/apache/ignite/internal/GridClosureCallMode.java
index ca3ec36..64e3aba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridClosureCallMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridClosureCallMode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Distribution modes for one or more closures executed via {@code Grid.call(...)} methods.
@@ -58,4 +58,4 @@ public enum GridClosureCallMode {
     @Nullable public static GridClosureCallMode fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index 65e0644..6078c5d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface for all main internal Ignite components (managers and processors).
@@ -134,4 +133,4 @@ public interface GridComponent {
      * @throws IgniteCheckedException If failed.
      */
     public void onReconnected(boolean clusterRestarted) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
index f8b8d64..19c12cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-
-import java.io.*;
-import java.lang.management.*;
-import java.net.*;
-import java.util.concurrent.*;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
 
 /**
  * This class run some basic network diagnostic tests in the background and
@@ -156,4 +156,4 @@ final class GridDiagnostic {
                 "Failed to start background network diagnostics.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridDirectCollection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDirectCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDirectCollection.java
index 58c1c29..2367c61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDirectCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDirectCollection.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  * Annotates iterable fields.
@@ -32,4 +34,4 @@ public @interface GridDirectCollection {
      * @return Item type.
      */
     Class<?> value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridDirectMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDirectMap.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDirectMap.java
index 9349a53..a495ed8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDirectMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDirectMap.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates map fields.
@@ -34,4 +37,4 @@ public @interface GridDirectMap {
      * @return Value type.
      */
     Class<?> valueType();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridDirectTransient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDirectTransient.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDirectTransient.java
index 0d64444..3874ab7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDirectTransient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDirectTransient.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates transient fields.
@@ -26,4 +29,4 @@ import java.lang.annotation.*;
 @Target(ElementType.FIELD)
 public @interface GridDirectTransient {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 0ae8050..93e01e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -17,25 +17,39 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager;
+import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.processors.platform.PlatformAwareEventFilter;
+import org.apache.ignite.internal.processors.platform.PlatformLocalEventListener;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P2;
+import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVTS_ALL;
 
 /**
  * Continuous routine handler for remote event listening.
@@ -506,4 +520,4 @@ class GridEventConsumeHandler implements GridContinuousHandler {
                 evt = (Event)in.readObject();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridInternalException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridInternalException.java b/modules/core/src/main/java/org/apache/ignite/internal/GridInternalException.java
index 25401d9..32cfccc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridInternalException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridInternalException.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * When log debug mode is disabled this exception should be logged in short form - without stack trace.
@@ -66,4 +65,4 @@ public class GridInternalException extends IgniteCheckedException {
     public GridInternalException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
index 76563e7..cfc3360 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
@@ -27,4 +27,4 @@ public interface GridInternalWrapper<T> {
      * @return User object.
      */
     public T userObject();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
index 9766171..6222e8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job cancellation request.
@@ -195,4 +196,4 @@ public class GridJobCancelRequest implements Message {
     @Override public String toString() {
         return S.toString(GridJobCancelRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
index 1dd3c71..804d228 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.job.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.internal.processors.job.GridJobWorker;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Remote job context implementation.
@@ -293,4 +300,4 @@ public class GridJobContextImpl implements ComputeJobContext, Externalizable {
     @Override public String toString() {
         return S.toString(GridJobContextImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index 667f620..471c485 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job execution request.
@@ -755,4 +763,4 @@ public class GridJobExecuteRequest implements Message {
     @Override public String toString() {
         return S.toString(GridJobExecuteRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
index be1f929..6659b52 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job execution response.
@@ -346,4 +348,4 @@ public class GridJobExecuteResponse implements Message {
     @Override public String toString() {
         return S.toString(GridJobExecuteResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobResultImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobResultImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobResultImpl.java
index 51cc633..aef4eac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobResultImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobResultImpl.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Class provides implementation for job result.
@@ -181,4 +182,4 @@ public class GridJobResultImpl implements ComputeJobResult {
     @Override public String toString() {
         return S.toString(GridJobResultImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
index 7d32586..6fc9969 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSessionImpl.java
@@ -17,14 +17,20 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTaskSessionAttributeListener;
+import org.apache.ignite.compute.ComputeTaskSessionScope;
+import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job session implementation.
@@ -299,4 +305,4 @@ public class GridJobSessionImpl implements GridTaskSessionInternal {
     @Override public String toString() {
         return S.toString(GridJobSessionImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
index b4e0f01..2d95f85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_CANCEL;
+import static org.apache.ignite.internal.GridTopic.TOPIC_TASK;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
 
 /**
  * This class provides implementation for job sibling.
@@ -193,4 +199,4 @@ public class GridJobSiblingImpl implements ComputeJobSibling, Externalizable {
     @Override public String toString() {
         return S.toString(GridJobSiblingImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
index 71fe5a7..3554824 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Job siblings request.
@@ -155,4 +156,4 @@ public class GridJobSiblingsRequest implements Message {
     @Override public String toString() {
         return S.toString(GridJobSiblingsRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
index 6ca0586..925c2de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Job siblings response.
@@ -134,4 +135,4 @@ public class GridJobSiblingsResponse implements Message {
     @Override public String toString() {
         return S.toString(GridJobSiblingsResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 4e15a7a..3f73c84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -17,51 +17,55 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.internal.managers.collision.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.managers.failover.*;
-import org.apache.ignite.internal.managers.indexing.*;
-import org.apache.ignite.internal.managers.loadbalancer.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.clock.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.processors.cluster.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.processors.job.*;
-import org.apache.ignite.internal.processors.jobmetrics.*;
-import org.apache.ignite.internal.processors.offheap.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.processors.port.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.schedule.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.processors.segmentation.*;
-import org.apache.ignite.internal.processors.service.*;
-import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.plugin.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
+import org.apache.ignite.internal.managers.collision.GridCollisionManager;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.failover.GridFailoverManager;
+import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
+import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.clock.GridClockSource;
+import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
+import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
+import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
+import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor;
+import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
+import org.apache.ignite.internal.processors.hadoop.HadoopProcessorAdapter;
+import org.apache.ignite.internal.processors.igfs.IgfsHelper;
+import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
+import org.apache.ignite.internal.processors.job.GridJobProcessor;
+import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
+import org.apache.ignite.internal.processors.platform.PlatformProcessor;
+import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
+import org.apache.ignite.internal.processors.port.GridPortProcessor;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.processors.rest.GridRestProcessor;
+import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
+import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
+import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
+import org.apache.ignite.internal.processors.service.GridServiceProcessor;
+import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
+import org.apache.ignite.internal.processors.task.GridTaskProcessor;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.IgniteExceptionRegistry;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.plugin.PluginNotFoundException;
+import org.apache.ignite.plugin.PluginProvider;
 
 /**
  *
@@ -568,4 +572,4 @@ public interface GridKernalContext extends Iterable<GridComponent> {
      * @return Platform processor.
      */
     public PlatformProcessor platform();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index d0a0fe7..6101836 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -17,62 +17,81 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.internal.managers.collision.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.managers.failover.*;
-import org.apache.ignite.internal.managers.indexing.*;
-import org.apache.ignite.internal.managers.loadbalancer.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.clock.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.processors.cluster.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.processors.datastreamer.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.processors.job.*;
-import org.apache.ignite.internal.processors.jobmetrics.*;
-import org.apache.ignite.internal.processors.offheap.*;
-import org.apache.ignite.internal.processors.platform.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.processors.port.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.schedule.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.internal.processors.segmentation.*;
-import org.apache.ignite.internal.processors.service.*;
-import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.nodevalidation.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.spring.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
+import org.apache.ignite.internal.managers.collision.GridCollisionManager;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.failover.GridFailoverManager;
+import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
+import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
+import org.apache.ignite.internal.processors.cache.CacheConflictResolutionManager;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.clock.GridClockSource;
+import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
+import org.apache.ignite.internal.processors.clock.GridJvmClockSource;
+import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
+import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
+import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor;
+import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
+import org.apache.ignite.internal.processors.hadoop.HadoopProcessorAdapter;
+import org.apache.ignite.internal.processors.igfs.IgfsHelper;
+import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
+import org.apache.ignite.internal.processors.job.GridJobProcessor;
+import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
+import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
+import org.apache.ignite.internal.processors.platform.PlatformProcessor;
+import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
+import org.apache.ignite.internal.processors.port.GridPortProcessor;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.processors.rest.GridRestProcessor;
+import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
+import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
+import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
+import org.apache.ignite.internal.processors.service.GridServiceProcessor;
+import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
+import org.apache.ignite.internal.processors.task.GridTaskProcessor;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.IgniteExceptionRegistry;
+import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.PluginNotFoundException;
+import org.apache.ignite.plugin.PluginProvider;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
+import static org.apache.ignite.internal.IgniteComponentType.SPRING;
 
 /**
  * Implementation of kernal context.
@@ -948,4 +967,4 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
     @Override public String toString() {
         return S.toString(GridKernalContextImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
index 1d50aa2..1b9da2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface guards access to implementations of public methods that access kernal
@@ -124,4 +124,3 @@ public interface GridKernalGateway {
      */
     public void onReconnected();
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
index f6a9e51..fe8c580 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
@@ -17,15 +17,18 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -219,4 +222,4 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
     @Override public String toString() {
         return S.toString(GridKernalGatewayImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalState.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalState.java
index 7d63578..dc51345 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalState.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Kernal life cycle states.
@@ -51,4 +51,4 @@ public enum GridKernalState {
     @Nullable public static GridKernalState fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
index 535d37f..742552b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
@@ -17,18 +17,23 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collections;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOG_GRID_NAME;
 
 /**
  *
@@ -215,4 +220,4 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz
     @Override public String toString() {
         return S.toString(GridLoggerProxy.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
index 4bfb57b..ff38949 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.continuous.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Continuous handler for message subscription.
@@ -212,4 +217,4 @@ public class GridMessageListenHandler implements GridContinuousHandler {
     @Override public String toString() {
         return S.toString(GridMessageListenHandler.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridNodeOrderComparator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridNodeOrderComparator.java b/modules/core/src/main/java/org/apache/ignite/internal/GridNodeOrderComparator.java
index 10f6ff1..1c60e07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridNodeOrderComparator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridNodeOrderComparator.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.cluster.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Comparator;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Node order comparator.
@@ -43,4 +42,4 @@ public class GridNodeOrderComparator implements Comparator<ClusterNode>, Seriali
     @Override public int compare(ClusterNode n1, ClusterNode n2) {
         return n1.order() < n2.order() ? -1 : n1.order() > n2.order() ? 1 : n1.id().compareTo(n2.id());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java
index 3bf9dfc..b040a97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED;
 
 /**
  * Grid performance suggestions.
@@ -87,4 +89,4 @@ public class GridPerformanceSuggestions {
     @Override public String toString() {
         return S.toString(GridPerformanceSuggestions.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index 55a84c6..ac2a3a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.plugin.PluginValidationException;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -110,4 +110,4 @@ public class GridPluginComponent implements GridComponent {
     @Override public void printMemoryStats() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java
index 7abe05b..92d1779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.plugin.PluginContext;
+import org.apache.ignite.spi.IgnitePortProtocol;
 
 /**
  *
@@ -89,4 +89,4 @@ public class GridPluginContext implements PluginContext {
     @Override public void deregisterPorts(Class<?> cls) {
         ctx.ports().deregisterPorts(cls);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridProxyListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProxyListener.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProxyListener.java
index ac32e13..8e76688 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProxyListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridProxyListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * Interception listener is notified about method apply. For each intercepted method
@@ -48,4 +48,4 @@ public interface GridProxyListener extends EventListener {
      * @param e Exception thrown by given method apply, if any. Can be {@code null}.
      */
     public void afterCall(Class<?> cls, String mtdName, Object[] args, Object res, Throwable e);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
index 32e082f..39f562f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Request for cancelling tasks.
@@ -118,4 +119,4 @@ public class GridTaskCancelRequest implements Message {
     @Override public String toString() {
         return S.toString(GridTaskCancelRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridTaskNameHashKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskNameHashKey.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskNameHashKey.java
index 2f05cd7..c362dc0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskNameHashKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskNameHashKey.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.processors.cache.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
 
 /**
  * Keys for task name hashing.
@@ -72,4 +74,4 @@ public class GridTaskNameHashKey implements Externalizable, GridCacheInternal {
     @Override public int hashCode() {
         return taskNameHash;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
index db46fb9..677d464 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
@@ -17,17 +17,29 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTaskSessionAttributeListener;
+import org.apache.ignite.compute.ComputeTaskSessionScope;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task session.
@@ -852,4 +864,4 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal {
     @Override public String toString() {
         return S.toString(GridTaskSessionImpl.class, this);
     }
-}
+}
\ No newline at end of file


[57/82] [abbrv] ignite git commit: ignite-1294: minor fixes and improvements in the processing of incoming SPI communication session

Posted by sb...@apache.org.
ignite-1294: minor fixes and improvements in the processing of incoming SPI communication session


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

Branch: refs/heads/ignite-1093-2
Commit: 90d8438473391fdf86656cc50108be723f306428
Parents: 1335580
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Aug 31 17:50:40 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Aug 31 17:50:40 2015 +0300

----------------------------------------------------------------------
 .../spi/communication/tcp/TcpCommunicationSpi.java      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/90d84384/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
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 25b219b..afe5d28 100644
--- 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
@@ -390,6 +390,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
                             ses.send(new RecoveryLastReceivedMessage(-1));
 
+                            fut.onDone(oldClient);
+
                             return;
                         }
                         else {
@@ -433,12 +435,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                         boolean reserved = recoveryDesc.tryReserve(msg0.connectCount(),
                                 new ConnectClosure(ses, recoveryDesc, rmtNode, msg0, !hasShmemClient, fut));
 
-                        if (reserved) {
-                            GridTcpNioCommunicationClient client =
-                                    connected(recoveryDesc, ses, rmtNode, msg0.received(), true, !hasShmemClient);
-
-                            fut.onDone(client);
-                        }
+                        if (reserved)
+                            connected(recoveryDesc, ses, rmtNode, msg0.received(), true, !hasShmemClient);
                     }
                 }
             }
@@ -1413,7 +1411,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
         if (slowClientQueueLimit > 0 && msgQueueLimit > 0 && slowClientQueueLimit >= msgQueueLimit) {
             U.quietAndWarn(log, "Slow client queue limit is set to a value greater than message queue limit " +
                 "(slow client queue limit will have no effect) [msgQueueLimit=" + msgQueueLimit +
-                    ", slowClientQueueLimit=" + slowClientQueueLimit + ']');
+                ", slowClientQueueLimit=" + slowClientQueueLimit + ']');
         }
 
         registerMBean(gridName, this, TcpCommunicationSpiMBean.class);


[49/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
index aa624bc..16437da 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringStoreExample.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.examples.datagrid.store.spring;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import java.util.UUID;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.FactoryBuilder;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListener;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Demonstrates usage of cache with underlying persistent store configured.
@@ -140,4 +144,4 @@ public class CacheSpringStoreExample {
 
         System.out.println("Read value after commit: " + cache.get(id));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
index 211239f..3f03bde 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Contains Spring-based cache store implementation.
  */
-package org.apache.ignite.examples.datagrid.store.spring;
+package org.apache.ignite.examples.datagrid.store.spring;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicLongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicLongExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicLongExample.java
index e83673f..058ed5b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicLongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicLongExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteCallable;
 
 /**
  * Demonstrates a simple usage of distributed atomic long.
@@ -71,4 +72,4 @@ public final class IgniteAtomicLongExample {
             System.out.println("Atomic long value after successful CAS: " + atomicLong.get());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicReferenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicReferenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicReferenceExample.java
index 76c1d5e..0b6d6f2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicReferenceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicReferenceExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicReference;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple usage of distributed atomic reference.
@@ -107,4 +108,4 @@ public final class IgniteAtomicReferenceExample {
             System.out.println("Atomic reference value is " + ref.get() + '.');
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
index 3052da5..756cb75 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicSequenceExample.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple usage of distributed atomic sequence.
@@ -88,4 +90,4 @@ public final class IgniteAtomicSequenceExample {
                 seq.get() + ']');
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicStampedExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicStampedExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicStampedExample.java
index 077ae89..8c96801 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicStampedExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteAtomicStampedExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicStamped;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple usage of distributed atomic stamped.
@@ -114,4 +115,4 @@ public final class IgniteAtomicStampedExample {
             System.out.println("Atomic stamped [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']');
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteCountDownLatchExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteCountDownLatchExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteCountDownLatchExample.java
index 3882a43..f1802fc 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteCountDownLatchExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteCountDownLatchExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCountDownLatch;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple usage of distributed count down latch.
@@ -92,4 +93,4 @@ public class IgniteCountDownLatchExample {
             System.out.println("Counted down [newCnt=" + newCnt + ", nodeId=" + Ignition.ignite().cluster().localNode().id() + ']');
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteExecutorServiceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteExecutorServiceExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteExecutorServiceExample.java
index d8f32d3..e840650 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteExecutorServiceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteExecutorServiceExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Simple example to demonstrate usage of distributed executor service provided by Ignite.
@@ -68,4 +69,4 @@ public final class IgniteExecutorServiceExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
index 79067e6..45f180f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteQueue;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Ignite cache distributed queue example. This example demonstrates {@code FIFO} unbounded
@@ -202,4 +204,4 @@ public class IgniteQueueExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
index 8d4fc89..184f865 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.examples.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSet;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Ignite cache distributed set example.
@@ -184,4 +186,4 @@ public class IgniteSetExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datastructures/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/package-info.java
index 09b9c66..962ba44 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates using of blocking and non-blocking queues and atomic data structures.
  */
-package org.apache.ignite.examples.datastructures;
+package org.apache.ignite.examples.datastructures;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
index dd23e14..6cc6659 100644
--- a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.examples.events;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.TaskSessionResource;
+
+import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION;
 
 /**
  * Demonstrates event consume API that allows to register event listeners on remote nodes.
@@ -141,4 +144,4 @@ public class EventsExample {
             });
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/events/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/events/package-info.java b/examples/src/main/java/org/apache/ignite/examples/events/package-info.java
index 3dd8543..8b66103 100644
--- a/examples/src/main/java/org/apache/ignite/examples/events/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/events/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates events management API.
  */
-package org.apache.ignite.examples.events;
+package org.apache.ignite.examples.events;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
index 8bfd38d..b040ace 100644
--- a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.examples.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.igfs.IgfsException;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Example that shows usage of {@link org.apache.ignite.IgniteFileSystem} API. It starts a node with {@code IgniteFs}
@@ -275,4 +281,4 @@ public final class IgfsExample {
         System.out.println();
         System.out.println("Information for " + path + ": " + fs.info(path));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
index f4fa95e..666e623 100644
--- a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
@@ -17,14 +17,31 @@
 
 package org.apache.ignite.examples.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.igfs.mapreduce.records.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.TreeSet;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.igfs.IgfsOutputStream;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.mapreduce.IgfsFileRange;
+import org.apache.ignite.igfs.mapreduce.IgfsInputStreamJobAdapter;
+import org.apache.ignite.igfs.mapreduce.IgfsJob;
+import org.apache.ignite.igfs.mapreduce.IgfsRangeInputStream;
+import org.apache.ignite.igfs.mapreduce.IgfsTask;
+import org.apache.ignite.igfs.mapreduce.IgfsTaskArgs;
+import org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver;
 
 /**
  * Example that shows how to use {@link org.apache.ignite.igfs.mapreduce.IgfsTask} to find lines matching particular pattern in the file in pretty
@@ -249,4 +266,4 @@ public class IgfsMapReduceExample {
             return line;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
index 20ddcbd..ac3e4e3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.examples.igfs;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
 
 /**
  * Starts up an empty node with IGFS configuration.
@@ -38,4 +39,4 @@ public class IgfsNodeStartup {
     public static void main(String[] args) throws IgniteException {
         Ignition.start("examples/config/filesystem/example-igfs.xml");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/igfs/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/package-info.java b/examples/src/main/java/org/apache/ignite/examples/igfs/package-info.java
index 6a48c2c..0fbb5f7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/igfs/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates usage of Ignite File System.
  */
-package org.apache.ignite.examples.igfs;
+package org.apache.ignite.examples.igfs;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
index a8a06fb..8f37d59 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.examples.messaging;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
 
 /**
  * Example that demonstrates how to exchange messages between nodes. Use such
@@ -170,4 +173,4 @@ public final class MessagingExample {
             }
         });
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index e4a0159..eca4a2c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.examples.messaging;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Demonstrates simple message exchange between local and remote nodes.
@@ -114,4 +116,4 @@ public class MessagingPingPongExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
index 79a64ec..cf976aa 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.examples.messaging;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.messaging.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.messaging.MessagingListenActor;
 
 /**
  * Demonstrates messaging with {@link MessagingListenActor} convenience adapter.
@@ -103,4 +107,4 @@ public class MessagingPingPongListenActorExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/messaging/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/package-info.java b/examples/src/main/java/org/apache/ignite/examples/messaging/package-info.java
index c1a6244..b22287c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates how to exchange messages between nodes.
  */
-package org.apache.ignite.examples.messaging;
+package org.apache.ignite.examples.messaging;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
index a15afd7..eb0e2d4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.examples.misc.client.memcache;
 
-import net.spy.memcached.*;
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+import net.spy.memcached.BinaryConnectionFactory;
+import net.spy.memcached.MemcachedClient;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteAtomicLong;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
 
 /**
  * This example shows how to use Memcache client for manipulating Ignite cache.
@@ -122,4 +125,4 @@ public class MemcacheRestExample {
 
         return new MemcachedClient(new BinaryConnectionFactory(), Arrays.asList(new InetSocketAddress(host, port)));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index 1c79b64..3c835be 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -17,18 +17,20 @@
 
 package org.apache.ignite.examples.misc.client.memcache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.configuration.DeploymentMode.*;
+import java.util.Collections;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  * Starts up an empty node with cache configuration that contains default cache.
@@ -89,4 +91,4 @@ public class MemcacheRestExampleNodeStartup {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/package-info.java
index b3e7c9d..67bbce2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates Java Client usage with Memcache protocol.
  */
-package org.apache.ignite.examples.misc.client.memcache;
+package org.apache.ignite.examples.misc.client.memcache;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/client/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/package-info.java
index e0c62e8..efbca4e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates Java Client usage.
  */
-package org.apache.ignite.examples.misc.client;
+package org.apache.ignite.examples.misc.client;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
index 5336620..9497ed7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
@@ -17,13 +17,22 @@
 
 package org.apache.ignite.examples.misc.deployment;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.examples.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Demonstrates how to explicitly deploy a task. Note that
@@ -126,4 +135,4 @@ public final class DeploymentExample {
             return null;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/deployment/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/package-info.java
index 20be358..44b0f79 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Deployment examples for direct deployments.
  */
-package org.apache.ignite.examples.misc.deployment;
+package org.apache.ignite.examples.misc.deployment;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
index 497872a..c603bbf 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.examples.misc.lifecycle;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.resources.IgniteInstanceResource;
 
-import static org.apache.ignite.lifecycle.LifecycleEventType.*;
+import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_START;
+import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_STOP;
 
 /**
  * This example shows how to provide your own {@link LifecycleBean} implementation
@@ -89,4 +93,4 @@ public final class LifecycleExample {
             return isStarted;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/package-info.java
index 2feda25..f830165 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates how to write and use lifecycle beans.
  */
-package org.apache.ignite.examples.misc.lifecycle;
+package org.apache.ignite.examples.misc.lifecycle;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/package-info.java
index c103603..616f24f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Contains examples taht are common across all editions.
  */
-package org.apache.ignite.examples.misc;
+package org.apache.ignite.examples.misc;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/schedule/ComputeScheduleExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/schedule/ComputeScheduleExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/schedule/ComputeScheduleExample.java
index f92285b..f8d0660 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/schedule/ComputeScheduleExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/schedule/ComputeScheduleExample.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.examples.misc.schedule;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.scheduler.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.scheduler.SchedulerFuture;
 
 /**
  * Demonstrates a cron-based {@link Runnable} execution scheduling.
@@ -78,4 +79,4 @@ public class ComputeScheduleExample {
             System.out.println(">>> Check all nodes for hello message output.");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/schedule/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/schedule/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/schedule/package-info.java
index 5888bc2..6602a6e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/schedule/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/schedule/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates usage of cron-based scheduler.
  */
-package org.apache.ignite.examples.misc.schedule;
+package org.apache.ignite.examples.misc.schedule;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
index 69c84f4..0b9d213 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.misc.springbean;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.springframework.context.support.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * Demonstrates a simple use of Ignite configured with Spring.
@@ -85,4 +86,4 @@ public final class SpringBeanExample {
             ctx.destroy();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package-info.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package-info.java
index 6f77b2e..42e83bb 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * HelloWorld example that accesses ignite started directly from Spring bean.
  */
-package org.apache.ignite.examples.misc.springbean;
+package org.apache.ignite.examples.misc.springbean;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/package-info.java b/examples/src/main/java/org/apache/ignite/examples/package-info.java
index ab184d8..5825225 100644
--- a/examples/src/main/java/org/apache/ignite/examples/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Basic examples for ignite functionality.
  */
-package org.apache.ignite.examples;
+package org.apache.ignite.examples;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
----------------------------------------------------------------------
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 ec8e54e..5fc85a4 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
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.examples.servicegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteServices;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.resources.ServiceResource;
 
 /**
  * Example that demonstrates how to deploy distributed services in Ignite.
@@ -166,4 +168,4 @@ public class ServicesExample {
             return mapSize;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapService.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapService.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapService.java
index 5e32bd2..8f2d31a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapService.java
+++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapService.java
@@ -46,4 +46,4 @@ public interface SimpleMapService<K, V> {
      * @return Map size.
      */
     int size();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
index 38db88b..69668d2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
+++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.examples.servicegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.services.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceContext;
 
 /**
  * Simple service which utilizes Ignite cache as a mechanism to provide
@@ -78,4 +80,4 @@ public class SimpleMapServiceImpl<K, V> implements Service, SimpleMapService<K,
     @Override public void execute(ServiceContext ctx) throws Exception {
         System.out.println("Executing distributed service: " + ctx.name());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/servicegrid/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/package-info.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/package-info.java
index 5873209..576df4e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates usage of grid-managed services.
  */
-package org.apache.ignite.examples.servicegrid;
+package org.apache.ignite.examples.servicegrid;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
----------------------------------------------------------------------
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 966fce2..2ef5e70 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
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.examples.streaming;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.stream.*;
-
-import javax.cache.processor.*;
-import java.util.*;
+import java.util.List;
+import java.util.Random;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.stream.StreamTransformer;
 
 /**
  * Stream random numbers into the streaming cache.
@@ -95,4 +99,4 @@ public class StreamTransformerExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
----------------------------------------------------------------------
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 baae5af..f2e1e9f 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
@@ -17,15 +17,20 @@
 
 package org.apache.ignite.examples.streaming;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.stream.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.stream.StreamVisitor;
 
 /**
  * Stream random numbers into the streaming cache.
@@ -163,4 +168,4 @@ public class StreamVisitorExample {
             this.latest = price;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/package-info.java b/examples/src/main/java/org/apache/ignite/examples/streaming/package-info.java
index 43fbab3..7cd31d1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Demonstrates usage of data streamer.
  */
-package org.apache.ignite.examples.streaming;
+package org.apache.ignite.examples.streaming;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
----------------------------------------------------------------------
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 d17b97d..4de9d90 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
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.examples.streaming.wordcount;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
+import javax.cache.configuration.FactoryBuilder;
+import javax.cache.expiry.CreatedExpiryPolicy;
+import javax.cache.expiry.Duration;
+import org.apache.ignite.cache.affinity.AffinityUuid;
+import org.apache.ignite.configuration.CacheConfiguration;
 
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-
-import static java.util.concurrent.TimeUnit.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Configuration for the streaming cache to store the stream of words.
@@ -45,4 +45,4 @@ public class CacheConfig {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
index 58c6ef2..034c0c2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.examples.streaming.wordcount;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.examples.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.AffinityUuid;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
 
 /**
  * Periodically query popular numbers from the streaming cache.
@@ -80,4 +82,4 @@ public class QueryWords {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
index 6024c4b..98b865e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
@@ -17,11 +17,16 @@
 
 package org.apache.ignite.examples.streaming.wordcount;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.examples.*;
-
-import java.io.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.AffinityUuid;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
 
 /**
  * Stream words into Ignite cache.
@@ -69,4 +74,4 @@ public class StreamWords {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/package-info.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/package-info.java
index 5d48ae3..a635f9f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Streaming word count example.
  */
-package org.apache.ignite.examples.streaming.wordcount;
+package org.apache.ignite.examples.streaming.wordcount;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerClient.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerClient.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerClient.java
index c4d7b8c..19830e0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerClient.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerClient.java
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.examples.streaming.wordcount.socket;
 
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.streaming.wordcount.*;
-import org.apache.ignite.stream.socket.*;
-
-import java.io.*;
-import java.net.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.streaming.wordcount.QueryWords;
+import org.apache.ignite.stream.socket.SocketStreamer;
 
 /**
  * Example demonstrates streaming of data from external components into Ignite cache.
@@ -79,4 +84,4 @@ public class WordsSocketStreamerClient {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
index 9e68096..8e961b9 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
@@ -17,17 +17,23 @@
 
 package org.apache.ignite.examples.streaming.wordcount.socket;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.streaming.wordcount.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.stream.*;
-import org.apache.ignite.stream.socket.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.AffinityUuid;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.streaming.wordcount.CacheConfig;
+import org.apache.ignite.examples.streaming.wordcount.QueryWords;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.stream.StreamTupleExtractor;
+import org.apache.ignite.stream.socket.SocketMessageConverter;
+import org.apache.ignite.stream.socket.SocketStreamer;
 
 /**
  * Example demonstrates streaming of data from external components into Ignite cache.
@@ -121,4 +127,4 @@ public class WordsSocketStreamerServer {
             ignite.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/package-info.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/package-info.java
index 048299f..04e1b49 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Contains {@link org.apache.ignite.stream.socket.SocketStreamer} usage examples.
  */
-package org.apache.ignite.examples.streaming.wordcount.socket;
+package org.apache.ignite.examples.streaming.wordcount.socket;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/ClusterGroupExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/ClusterGroupExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/ClusterGroupExample.java
index 508caf2..751032b 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/ClusterGroupExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/ClusterGroupExample.java
@@ -17,9 +17,13 @@
 
 package org.apache.ignite.examples.java8.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
 
 /**
  * Demonstrates new functional APIs.
@@ -79,4 +83,4 @@ public class ClusterGroupExample {
         ignite.compute(grp).broadcast(
             () -> System.out.println(">>> Hello Node: " + grp.ignite().cluster().localNode().id()));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/package-info.java
index 2cca35f..618e844 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/cluster/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Cluster group example.
  */
-package org.apache.ignite.examples.java8.cluster;
+package org.apache.ignite.examples.java8.cluster;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeAsyncExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeAsyncExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeAsyncExample.java
index b6922b8..77d1ac2 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeAsyncExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeAsyncExample.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.examples.java8.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple use of {@link IgniteRunnable}.
@@ -68,4 +72,4 @@ public class ComputeAsyncExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeBroadcastExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeBroadcastExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeBroadcastExample.java
index ded14b4..f839911 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeBroadcastExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeBroadcastExample.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.examples.java8.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
  * Demonstrates broadcasting computations within cluster.
@@ -98,4 +99,4 @@ public class ComputeBroadcastExample {
             System.out.println();
         });
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeCallableExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeCallableExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeCallableExample.java
index d15f564..2cbece8 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeCallableExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeCallableExample.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.examples.java8.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteCallable;
 
 /**
  * Demonstrates using of {@link IgniteCallable} job execution on the cluster.
@@ -70,4 +72,4 @@ public class ComputeCallableExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeClosureExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeClosureExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeClosureExample.java
index de22687..fc7564f 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeClosureExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeClosureExample.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.examples.java8.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
  * Demonstrates a simple use of Ignite with reduce closure.
@@ -66,4 +68,4 @@ public class ComputeClosureExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeRunnableExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeRunnableExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeRunnableExample.java
index 474ae20..4dc7c5f 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeRunnableExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeRunnableExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.java8.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple use of {@link IgniteRunnable}.
@@ -60,4 +61,4 @@ public class ComputeRunnableExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/package-info.java
index 7c88fc1..a293faa 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Basic examples for computational ignite functionality.
  */
-package org.apache.ignite.examples.java8.computegrid;
+package org.apache.ignite.examples.java8.computegrid;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
index 0424457..aa1fc25 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAffinityExample.java
@@ -17,15 +17,6 @@
 
 package org.apache.ignite.examples.java8.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-
 /**
  * This example demonstrates the simplest code that populates the distributed cache
  * and co-locates simple closure execution with each key. The goal of this particular
@@ -128,4 +119,4 @@ public final class CacheAffinityExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
index f0cb2ac..98f37c7 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.examples.java8.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
  * This example demonstrates some of the cache rich API capabilities.
@@ -100,4 +102,4 @@ public class CacheApiExample {
         b2 = cache.replace(7, "7", "777");
         assert b1 & !b2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
index 0a95169..1313181 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheAsyncApiExample.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.examples.java8.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * This example demonstrates some of the cache rich API capabilities.
@@ -79,4 +82,4 @@ public class CacheAsyncApiExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/package-info.java
index 2730f26..d8c45d6 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates data ignite cache usage.
  */
-package org.apache.ignite.examples.java8.datagrid;
+package org.apache.ignite.examples.java8.datagrid;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
index 2526f60..a0c9701 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.examples.java8.datastructures;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Simple example to demonstrate usage of distributed executor service provided by Ignite.
@@ -66,4 +67,4 @@ public final class IgniteExecutorServiceExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
index baa5769..79b2f9a 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates using of blocking and non-blocking queues and atomic data structures.
  */
-package org.apache.ignite.examples.java8.datastructures;
+package org.apache.ignite.examples.java8.datastructures;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/events/EventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/events/EventsExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/events/EventsExample.java
index d1c32a3..83a39ec 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/events/EventsExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/events/EventsExample.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.examples.java8.events;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.TaskSessionResource;
+
+import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION;
 
 /**
  * Demonstrates event consume API that allows to register event listeners on remote nodes.
@@ -129,4 +132,4 @@ public class EventsExample {
             });
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/events/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/events/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/events/package-info.java
index f31a4c6..2fadf17 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/events/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/events/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates events management API.
  */
-package org.apache.ignite.examples.java8.events;
+package org.apache.ignite.examples.java8.events;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingExample.java
index f992a82..f8f9242 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingExample.java
@@ -17,12 +17,6 @@
 
 package org.apache.ignite.examples.java8.messaging;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-
-import java.util.concurrent.*;
-
 /**
  * Example that demonstrates how to exchange messages between nodes. Use such
  * functionality for cases when you need to communicate to other nodes outside
@@ -160,4 +154,4 @@ public final class MessagingExample {
             return unorderedLatch.getCount() > 0;
         });
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
index 8285956..9962748 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/MessagingPingPongExample.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.examples.java8.messaging;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
 
 /**
  * Demonstrates simple message exchange between local and remote nodes.
@@ -108,4 +110,4 @@ public class MessagingPingPongExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/package-info.java b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/package-info.java
index 0b03ea7..c950225 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/messaging/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates how to exchange messages between nodes.
  */
-package org.apache.ignite.examples.java8.messaging;
+package org.apache.ignite.examples.java8.messaging;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/ComputeScheduleExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/ComputeScheduleExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/ComputeScheduleExample.java
index 64e4e2d..c250638 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/ComputeScheduleExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/misc/schedule/ComputeScheduleExample.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.examples.java8.misc.schedule;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.scheduler.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.scheduler.SchedulerFuture;
 
 /**
  * Demonstrates a cron-based {@link Runnable} execution scheduling.
@@ -63,4 +65,4 @@ public class ComputeScheduleExample {
             System.out.println(">>> Check all nodes for hello message output.");
         }
     }
-}
+}
\ No newline at end of file


[44/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
index 6800edc..ee0a4ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
@@ -17,15 +17,24 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.portable.*;
-import org.apache.ignite.marshaller.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.TreeMap;
+import java.util.UUID;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableBuilder;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableMarshalAware;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.portable.PortableSerializer;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines portable objects functionality. With portable objects you are able to:
@@ -359,4 +368,3 @@ public interface IgnitePortables {
      */
     public Collection<PortableMetadata> metadata() throws PortableException;
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
----------------------------------------------------------------------
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 3c32ed9..370916b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Closeable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This interface provides a rich API for working with distributed queues based on In-Memory Data Grid.
@@ -179,4 +181,4 @@ public interface IgniteQueue<T> extends BlockingQueue<T>, Closeable {
      * @return {@code true} if queue was removed from cache {@code false} otherwise.
      */
     public boolean removed();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java
----------------------------------------------------------------------
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 0cd0a0b..b0ea960 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.lang.*;
-import org.apache.ignite.scheduler.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.scheduler.SchedulerFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides functionality for scheduling jobs locally using UNIX cron-based syntax.
@@ -95,4 +96,4 @@ public interface IgniteScheduler {
      * @return Scheduled execution future.
      */
     public <R> SchedulerFuture<R> scheduleLocal(Callable<R> c, String ptrn);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
----------------------------------------------------------------------
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 7d1ca7c..08577c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.services.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteAsyncSupport;
+import org.apache.ignite.lang.IgniteAsyncSupported;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.services.ServiceDescriptor;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines functionality necessary to deploy distributed services on the grid.
@@ -350,4 +352,4 @@ public interface IgniteServices extends IgniteAsyncSupport {
 
     /** {@inheritDoc} */
     @Override public IgniteServices withAsync();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
----------------------------------------------------------------------
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 6063fe0..649a370 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
@@ -17,8 +17,10 @@
 
 package org.apache.ignite;
 
-import java.io.*;
-import java.util.*;
+import java.io.Closeable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * Set implementation based on on In-Memory Data Grid.
@@ -101,4 +103,4 @@ public interface IgniteSet<T> extends Set<T>, Closeable {
      * @return {@code True} if set was removed from cache {@code false} otherwise.
      */
     public boolean removed();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteState.java b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
index 1b8b193..e3c04c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteState.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.plugin.segmentation.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Possible states of {@link org.apache.ignite.Ignition}. You can register a listener for
@@ -57,4 +57,4 @@ public enum IgniteState {
     @Nullable public static IgniteState fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
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 7c808df..546a33d 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite;
 
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-import java.lang.management.*;
-import java.util.*;
+import java.lang.management.RuntimeMXBean;
+import java.util.Properties;
+import javax.net.ssl.HostnameVerifier;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Contains constants for all system properties and environmental variables in Ignite.
@@ -518,4 +517,4 @@ public final class IgniteSystemProperties {
     public static Properties snapshot() {
         return (Properties)System.getProperties().clone();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
index 29696c1..bb88d4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
@@ -17,9 +17,13 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.transactions.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.apache.ignite.transactions.TransactionMetrics;
 
 /**
  * Transactions facade provides ACID-compliant semantic when working with caches. You can
@@ -103,4 +107,4 @@ public interface IgniteTransactions {
      * Resets transaction metrics.
      */
     public void resetMetrics();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
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 d5d59a5..2c06881 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -17,16 +17,16 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines a factory for the main Ignite API. It controls Grid life cycle
@@ -540,4 +540,4 @@ public class Ignition {
     public static boolean removeListener(IgnitionListener lsnr) {
         return IgnitionEx.removeListener(lsnr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/IgnitionListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitionListener.java b/modules/core/src/main/java/org/apache/ignite/IgnitionListener.java
index 09281cc..0a709fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgnitionListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgnitionListener.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.EventListener;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Listener for gird state change notifications. Use
@@ -34,4 +33,4 @@ public interface IgnitionListener extends EventListener {
      * @param state New state.
      */
     public void onStateChange(@Nullable String name, IgniteState state);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
index 0ae9d76..a192bda 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache;
 
-import javax.cache.*;
+import javax.cache.CacheException;
 
 /**
  * Exception thrown when atomic operation timeout occurs.
@@ -44,4 +44,4 @@ public class CacheAtomicUpdateTimeoutException extends CacheException {
     public CacheAtomicUpdateTimeoutException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
index 0771ae9..38b4556 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache write ordering mode. This enumeration is taken into account only in {@link CacheAtomicityMode#ATOMIC}
@@ -61,4 +61,4 @@ public enum CacheAtomicWriteOrderMode {
     @Nullable public static CacheAtomicWriteOrderMode fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java
index 5b3cfd4..9e0f81e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache atomicity mode controls whether cache should maintain fully transactional semantics
@@ -76,4 +76,4 @@ public enum CacheAtomicityMode {
     @Nullable public static CacheAtomicityMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index a6a2aa3..d92f9fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.*;
-
-import javax.cache.*;
-import javax.cache.processor.*;
-import java.util.*;
+import java.util.Set;
+import javax.cache.Cache;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCache;
 
 /**
  * Cache entry that extends {@link javax.cache.Cache.Entry} by providing additional entry related information.
@@ -91,4 +90,4 @@ public interface CacheEntry<K, V> extends Cache.Entry<K, V> {
      * @return Time in milliseconds.
      */
     public long updateTime();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java
index f7c6bfb..e37eb9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.cache;
 
-import javax.cache.event.*;
-import java.io.*;
+import java.io.Serializable;
+import javax.cache.event.CacheEntryEventFilter;
 
 /**
  * This filter adds {@link Serializable} interface to {@link javax.cache.event.CacheEntryEventFilter} object.
  */
 public interface CacheEntryEventSerializableFilter<K, V> extends CacheEntryEventFilter<K, V>, Serializable {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryProcessor.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryProcessor.java
index 5969586..3057165 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryProcessor.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.cache;
 
-import javax.cache.processor.*;
-import java.io.*;
+import java.io.Serializable;
+import javax.cache.processor.EntryProcessor;
 
 /**
  * This processor adds {@link Serializable} interface to {@link EntryProcessor} object.
  */
 public interface CacheEntryProcessor<K, V, T> extends EntryProcessor<K, V, T>, Serializable {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
index 113f329..6c60a3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.cache;
 
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
+import javax.cache.CacheException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when cache must be created but it already exists.
@@ -49,4 +48,4 @@ public class CacheExistsException extends CacheException {
     public CacheExistsException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
index 5fc628d..436db6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.io.*;
+import java.io.Serializable;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache interceptor. Cache interceptor can be used for getting callbacks before
@@ -121,4 +120,4 @@ public interface CacheInterceptor<K, V> extends Serializable {
      *      entry is a copy.
      */
     public void onAfterRemove(Cache.Entry<K, V> entry);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorAdapter.java
index 3419055..00e1cf9 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptorAdapter.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache interceptor convenience adapter. It provides no-op implementations for all
@@ -54,4 +53,4 @@ public class CacheInterceptorAdapter<K, V> implements CacheInterceptor<K, V> {
     @Override public void onAfterRemove(Cache.Entry<K, V> entry) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index bc6df76..12254bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -17,25 +17,40 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.mxbean.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.management.*;
-import javax.management.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.configuration.CompleteConfiguration;
+import javax.cache.configuration.Configuration;
+import javax.cache.management.CacheMXBean;
+import javax.cache.management.CacheStatisticsMXBean;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalGateway;
+import org.apache.ignite.internal.GridKernalState;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.mxbean.IgniteStandardMXBean;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JCACHE_DEFAULT_ISOLATED;
+import static org.apache.ignite.IgniteSystemProperties.getBoolean;
 
 /**
  * Implementation of JSR-107 {@link CacheManager}.
@@ -423,4 +438,4 @@ public class CacheManager implements javax.cache.CacheManager {
 
         throw new IllegalArgumentException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
index 7a67fa5..a596824 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.cache.eviction.*;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
 
 /**
  * Defines set of memory modes. Memory modes help control whether cache entries are
@@ -58,4 +58,4 @@ public enum CacheMemoryMode {
      * to configured {@link EvictionPolicy}.
      */
     OFFHEAP_VALUES,
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
index 799aace..669c427 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import org.apache.ignite.IgniteCache;
 
 /**
  * Cache metrics used to obtain statistics on cache itself.
@@ -591,4 +591,4 @@ public interface CacheMetrics {
      * @see CacheWriter
      */
     public boolean isWriteThrough();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java
index 56d31fb..e75fa0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Enumeration of all supported caching modes. Cache mode is specified in {@link org.apache.ignite.configuration.CacheConfiguration}
@@ -72,4 +72,4 @@ public enum CacheMode {
     @Nullable public static CacheMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java
----------------------------------------------------------------------
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 50b26a8..f306fb5 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
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.internal.processors.cache.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import javax.cache.CacheException;
+import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException;
 
 /**
  * Exception thrown from non-transactional cache in case when update succeeded only partially.
@@ -44,4 +43,4 @@ public class CachePartialUpdateException extends CacheException {
     public <K> Collection<K> failedKeys() {
         return ((CachePartialUpdateCheckedException)getCause()).failedKeys();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java
index ea7037e..495202c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCache;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Enumeration of all supported cache peek modes. Peek modes can be passed
@@ -81,4 +81,4 @@ public enum CachePeekMode {
     @Nullable public static CachePeekMode fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
index 79d22f9..86692e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache rebalance mode. When rebalancing is enabled (i.e. has value other than {@link #NONE}), distributed caches
@@ -65,4 +65,4 @@ public enum CacheRebalanceMode {
     @Nullable public static CacheRebalanceMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
index f5ccac7..1975070 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
@@ -16,7 +16,7 @@
  */
 package org.apache.ignite.cache;
 
-import javax.cache.*;
+import javax.cache.CacheException;
 
 /**
  * Exception thrown when all data nodes left the grid.
@@ -46,4 +46,4 @@ public class CacheServerNotFoundException extends CacheException {
     public CacheServerNotFoundException(Throwable cause) {
         super(cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
index 7e6af7c..1ec2408 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Type field metadata.
@@ -147,4 +146,4 @@ public class CacheTypeFieldMetadata implements Serializable {
     @Override public String toString() {
         return S.toString(CacheTypeFieldMetadata.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index 93ce9dd..95a138d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Cache type metadata need for configuration of indexes or automatic persistence.
@@ -338,4 +341,4 @@ public class CacheTypeMetadata implements Serializable {
     @Override public String toString() {
         return S.toString(CacheTypeMetadata.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
index d44e65e..cdb12c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Mode indicating how Ignite should wait for write replies from other nodes. Default
@@ -66,4 +66,4 @@ public enum CacheWriteSynchronizationMode {
     @Nullable public static CacheWriteSynchronizationMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
----------------------------------------------------------------------
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 47d892f..ddd0c04 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
@@ -17,16 +17,24 @@
 
 package org.apache.ignite.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import java.net.*;
-import java.util.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.WeakHashMap;
+import javax.cache.CacheException;
+import javax.cache.configuration.OptionalFeature;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implementation of JSR-107 {@link javax.cache.spi.CachingProvider}.
@@ -280,4 +288,4 @@ public class CachingProvider implements javax.cache.spi.CachingProvider {
     @Override public boolean isSupported(OptionalFeature optionalFeature) {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
index 5efc58b..28dc0ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides affinity information to detect which node is primary and which nodes are
@@ -216,4 +216,4 @@ public interface Affinity<K> {
      *      always first.
      */
     public Collection<ClusterNode> mapPartitionToPrimaryAndBackups(int part);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java
index 7e76aa8..14f3e57 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.cache.affinity;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotation marker which identifies affinity function that must be calculated on one centralized node
@@ -28,4 +31,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface AffinityCentralizedFunction {
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunction.java
index 3278502..cd12ab3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunction.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.cluster.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Cache key affinity which maps keys to nodes. This interface is utilized for
@@ -107,4 +107,4 @@ public interface AffinityFunction extends Serializable {
      * @param nodeId ID of node to remove.
      */
     public void removeNode(UUID nodeId);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunctionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunctionContext.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunctionContext.java
index 9d22833..fd071cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunctionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityFunctionContext.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity function context. This context is passed to {@link AffinityFunction} for
@@ -69,4 +68,4 @@ public interface AffinityFunctionContext {
      *      not available.
      */
     @Nullable public DiscoveryEvent discoveryEvent();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
----------------------------------------------------------------------
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 4e840f9..ee6321c 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
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Optional wrapper for cache keys to provide support
@@ -186,4 +189,4 @@ public class AffinityKey<K> implements Externalizable {
     @Override public String toString() {
         return S.toString(AffinityKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java
index 4464972..dd42d5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.cache.affinity;
 
-import java.lang.annotation.*;
-import java.util.concurrent.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.Callable;
 
 /**
  * Optional annotation to specify custom key-to-node affinity. Affinity key is a key
@@ -107,4 +111,4 @@ import java.util.concurrent.*;
 @Target({ElementType.FIELD, ElementType.METHOD})
 public @interface AffinityKeyMapped {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapper.java
index 69835c8..4e2c624 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapper.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.affinity;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Affinity mapper which maps cache key to an affinity key. Affinity key is a key which will be
@@ -59,4 +59,4 @@ public interface AffinityKeyMapper extends Serializable {
      * has no initialization logic, leave this method empty.
      */
     public void reset();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
index 533174f..4ff54ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Node hash resolver which uses {@link ClusterNode#consistentId()} as alternate hash value.
@@ -42,4 +41,4 @@ public class AffinityNodeAddressHashResolver implements AffinityNodeHashResolver
     @Override public String toString() {
         return S.toString(AffinityNodeAddressHashResolver.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
index f990951..c879da6 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
 
 /**
  * Resolver which is used to provide node hash value for affinity function.
@@ -45,4 +44,4 @@ public interface AffinityNodeHashResolver extends Serializable {
      */
     @Deprecated
     public Object resolve(ClusterNode node);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
index 2580c69..a204a6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Node hash resolver which uses generated node ID as node hash value. As new node ID is generated
@@ -43,4 +42,4 @@ public class AffinityNodeIdHashResolver implements AffinityNodeHashResolver {
     @Override public String toString() {
         return S.toString(AffinityNodeIdHashResolver.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityUuid.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityUuid.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityUuid.java
index 79ed803..bbf74f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityUuid.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache.affinity;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Guaranteed unique affinity-based key.
@@ -47,4 +47,4 @@ public class AffinityUuid extends AffinityKey<IgniteUuid> {
     @Override public String toString() {
         return S.toString(AffinityUuid.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
index 14a4f53..cc04875 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
@@ -17,15 +17,29 @@
 
 package org.apache.ignite.cache.affinity.fair;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.RandomAccess;
+import java.util.UUID;
+import org.apache.ignite.cache.affinity.AffinityCentralizedFunction;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityFunctionContext;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Fair affinity function which tries to ensure that all nodes get equal number of partitions with
@@ -775,4 +789,4 @@ public class FairAffinityFunction implements AffinityFunction {
             return "PartSet [nodeId=" + node.id() + ", size=" + parts.size() + ", parts=" + parts + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 6736c4e..fd07eb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -17,20 +17,39 @@
 
 package org.apache.ignite.cache.affinity.rendezvous;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.security.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityFunctionContext;
+import org.apache.ignite.cache.affinity.AffinityNodeHashResolver;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity function for partitioned cache based on Highest Random Weight algorithm.
@@ -515,4 +534,4 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza
                 o1.get2().id().compareTo(o2.get2().id());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
----------------------------------------------------------------------
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 9f1889a..fbe82c3 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
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.cache.eviction;
 
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Evictable cache entry passed into {@link EvictionPolicy}.
@@ -100,4 +99,4 @@ public interface EvictableEntry<K, V> extends Cache.Entry<K, V> {
      * @return {@code True} if value was removed, {@code false} otherwise.
      */
     public <T> boolean removeMeta(T val);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionFilter.java
index 2b6ead1..a9b2d55 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionFilter.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.cache.eviction;
 
+import java.io.Serializable;
+import javax.cache.Cache;
 import org.apache.ignite.configuration.CacheConfiguration;
 
-import javax.cache.*;
-import java.io.*;
-
 /**
  * Eviction filter to specify which entries should not be evicted. Not applicable when
  * calling explicit evict via {@link EvictableEntry#evict()}.
@@ -40,4 +39,4 @@ public interface EvictionFilter<K, V> extends Serializable {
      * @return {@code True} if it is allowed to evict this entry.
      */
     public boolean evictAllowed(Cache.Entry<K, V> entry);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionPolicy.java
index 07c269d..a77514a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictionPolicy.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.cache.eviction;
 
-import org.apache.ignite.cache.eviction.fifo.*;
-import org.apache.ignite.cache.eviction.lru.*;
-import org.apache.ignite.cache.eviction.random.*;
-import org.apache.ignite.cache.eviction.sorted.*;
+import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
+import org.apache.ignite.cache.eviction.random.RandomEvictionPolicy;
+import org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicy;
 
 /**
  * Pluggable cache eviction policy. Usually, implementations will internally order
@@ -53,4 +53,4 @@ public interface EvictionPolicy<K, V> {
      * @param entry Accessed entry.
      */
     public void onEntryAccessed(boolean rmv, EvictableEntry<K, V> entry);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
index 1e06ffd..4d1c3f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.cache.eviction.fifo;
 
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import org.jsr166.*;
-import org.jsr166.ConcurrentLinkedDeque8.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jsr166.ConcurrentLinkedDeque8;
+import org.jsr166.ConcurrentLinkedDeque8.Node;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_SIZE;
 
 /**
  * Eviction policy based on {@code First In First Out (FIFO)} algorithm and supports batch eviction.
@@ -301,4 +306,4 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
     @Override public String toString() {
         return S.toString(FifoEvictionPolicy.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
index 793aa66..2615bbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.eviction.fifo;
 
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * MBean for {@code FIFO} eviction policy.
@@ -85,4 +85,4 @@ public interface FifoEvictionPolicyMBean {
      */
     @MXBeanDescription("Current FIFO queue size in bytes.")
     public long getCurrentMemorySize();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsEvictionFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsEvictionFilter.java
index 97d1dd1..a6c9f59 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsEvictionFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsEvictionFilter.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.cache.eviction.igfs;
 
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.processors.igfs.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.cache.eviction.EvictionFilter;
+import org.apache.ignite.internal.processors.igfs.IgfsBlockKey;
 
 /**
  * IGFS eviction filter which will not evict blocks of particular files.
@@ -35,4 +34,4 @@ public class IgfsEvictionFilter implements EvictionFilter {
 
         return !(key instanceof IgfsBlockKey && ((IgfsBlockKey)key).evictExclude());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicy.java
index f4d95df..a82d541 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicy.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.cache.eviction.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.jsr166.*;
-import org.jsr166.ConcurrentLinkedDeque8.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-import java.util.regex.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.processors.cache.CacheEvictableEntryImpl;
+import org.apache.ignite.internal.processors.igfs.IgfsBlockKey;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
+import org.jsr166.ConcurrentLinkedDeque8.Node;
+import org.jsr166.LongAdder8;
 
 /**
  * IGFS eviction policy which evicts particular blocks.
@@ -374,4 +381,4 @@ public class IgfsPerBlockLruEvictionPolicy implements EvictionPolicy<IgfsBlockKe
             return size;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicyMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicyMXBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicyMXBean.java
index 76e1016..c14572a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicyMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/IgfsPerBlockLruEvictionPolicyMXBean.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.cache.eviction.igfs;
 
-import org.apache.ignite.mxbean.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * MBean for {@code IGFS per-block LRU} eviction policy.
@@ -90,4 +89,4 @@ public interface IgfsPerBlockLruEvictionPolicyMXBean {
      */
     @MXBeanDescription("Current amount of blocks.")
     public int getCurrentBlocks();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
index ba6f88a..f321764 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicy.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.cache.eviction.lru;
 
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import org.jsr166.*;
-import org.jsr166.ConcurrentLinkedDeque8.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jsr166.ConcurrentLinkedDeque8;
+import org.jsr166.ConcurrentLinkedDeque8.Node;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_SIZE;
 
 /**
  * Eviction policy based on {@code Least Recently Used (LRU)} algorithm and supports batch eviction.
@@ -292,4 +297,4 @@ public class LruEvictionPolicy<K, V> implements EvictionPolicy<K, V>, LruEvictio
     @Override public String toString() {
         return S.toString(LruEvictionPolicy.class, this, "size", queue.sizex());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyMBean.java
----------------------------------------------------------------------
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 e17c057..6a3d060 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.eviction.lru;
 
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * MBean for {@code LRU} eviction policy.
@@ -85,4 +85,4 @@ public interface LruEvictionPolicyMBean {
      */
     @MXBeanDescription("Current queue size in  bytes.")
     public long getCurrentMemorySize();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
index 00a912f..bf04d92 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.cache.eviction.random;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.*;
-import java.io.*;
-
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_SIZE;
 
 /**
  * Cache eviction policy which will select random cache entry for eviction if cache
@@ -113,4 +117,4 @@ public class RandomEvictionPolicy<K, V> implements EvictionPolicy<K, V>, RandomE
     @Override public String toString() {
         return S.toString(RandomEvictionPolicy.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicyMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicyMBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicyMBean.java
index ec7fb87..3193483 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicyMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicyMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.eviction.random;
 
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * MBean for {@code random} eviction policy.
@@ -39,4 +39,4 @@ public interface RandomEvictionPolicyMBean {
      */
     @MXBeanDescription("Sets maximum allowed cache size.")
     public void setMaxSize(int max);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
index d99b3b0..6189552 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
@@ -17,19 +17,27 @@
 
 package org.apache.ignite.cache.eviction.sorted;
 
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static java.lang.Math.*;
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.internal.util.GridConcurrentSkipListSet;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
+
+import static java.lang.Math.abs;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_SIZE;
 
 /**
  * Cache eviction policy which will select the minimum cache entry for eviction.
@@ -508,4 +516,4 @@ public class SortedEvictionPolicy<K, V> implements EvictionPolicy<K, V>, SortedE
             return e;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyMBean.java
----------------------------------------------------------------------
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 7283453..b0a1823 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.eviction.sorted;
 
-import org.apache.ignite.mxbean.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * MBean for sorted eviction policy.
@@ -85,4 +85,4 @@ public interface SortedEvictionPolicyMBean {
      */
     @MXBeanDescription("Current sorted entries set size in bytes.")
     public long getCurrentMemorySize();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
index 8ffb8cb..df1bad3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-
-import javax.cache.*;
-import javax.cache.event.*;
+import javax.cache.Cache;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
 
 /**
  * API for configuring continuous cache queries.
@@ -281,4 +280,4 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> {
     public boolean isAutoUnsubscribe() {
         return autoUnsubscribe;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
index ad464c4..71161e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Base class for all Ignite cache queries.
@@ -98,4 +97,4 @@ public abstract class Query<R> implements Serializable {
     @Override public String toString() {
         return S.toString(Query.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/QueryCursor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryCursor.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryCursor.java
index b0c896a..84b6862 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryCursor.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryCursor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.query;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * Query result cursor. Implements {@link Iterable} only for convenience, e.g. {@link #iterator()}
@@ -42,4 +42,4 @@ public interface QueryCursor<T> extends Iterable<T>, AutoCloseable {
      * Closes all resources related to this cursor.
      */
     @Override public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java
index ef8fc49..e376561 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
 
 /**
  * Cache query metrics used to obtain statistics on query. Metrics for particular query
@@ -59,4 +59,4 @@ public interface QueryMetrics {
      * @return Total number of times a query execution failed.
      */
     public int fails();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
index 6e02ff9..c7fa3d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Scan query over cache entries. Will accept all the entries if no predicate was set.
@@ -133,4 +132,4 @@ public final class ScanQuery<K, V> extends Query<Cache.Entry<K, V>> {
     @Override public String toString() {
         return S.toString(ScanQuery.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/SpiQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SpiQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SpiQuery.java
index 71b9d23..0c11437 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SpiQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SpiQuery.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.indexing.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.indexing.IndexingSpi;
 
 /**
  * Query to be used by {@link IndexingSpi} implementations.
@@ -72,4 +71,4 @@ public final class SpiQuery<K, V> extends Query<Cache.Entry<K, V>> {
     @Override public String toString() {
         return S.toString(SpiQuery.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
----------------------------------------------------------------------
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 04131e2..b2dd181 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
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * SQL Fields query. This query can return specific fields of data based
@@ -155,4 +155,4 @@ public final class SqlFieldsQuery extends Query<List<?>> {
     @Override public String toString() {
         return S.toString(SqlFieldsQuery.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
----------------------------------------------------------------------
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 64a8d4c..be3b390 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
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * SQL Query.
@@ -151,4 +151,4 @@ public final class SqlQuery<K, V> extends Query<Cache.Entry<K, V>> {
     @Override public String toString() {
         return S.toString(SqlQuery.class, this);
     }
-}
+}
\ No newline at end of file


[62/82] [abbrv] ignite git commit: ignite-1334 Fixed concurrent destroyCache/node stop. Check initFut result in GridDhtPartitionsExchangeFuture.

Posted by sb...@apache.org.
ignite-1334 Fixed concurrent destroyCache/node stop. Check initFut result in GridDhtPartitionsExchangeFuture.


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

Branch: refs/heads/ignite-1093-2
Commit: afce2699644c8af1e50eb5ef595ed299734c68e5
Parents: 2814d0e
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 1 08:59:01 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 1 08:59:01 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    | 27 ++++--
 .../GridDhtPartitionsExchangeFuture.java        | 94 +++++++++++--------
 .../cache/IgniteDynamicCacheAndNodeStop.java    | 95 ++++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite2.java       |  3 +-
 4 files changed, 175 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/afce2699/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index bf203b8..c5f8168 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -156,6 +156,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     /** */
     private final Map<String, GridCacheAdapter<?, ?>> caches;
 
+    /** Caches stopped from onKernalStop callback. */
+    private final Map<String, GridCacheAdapter> stoppedCaches = new ConcurrentHashMap<>();
+
     /** Map of proxies. */
     private final Map<String, IgniteCacheProxy<?, ?>> jCacheProxies;
 
@@ -893,14 +896,16 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     @SuppressWarnings("unchecked")
     @Override public void stop(boolean cancel) throws IgniteCheckedException {
         for (String cacheName : stopSeq) {
-            GridCacheAdapter<?, ?> cache = caches.remove(maskNull(cacheName));
+            GridCacheAdapter<?, ?> cache = stoppedCaches.remove(maskNull(cacheName));
 
             if (cache != null)
                 stopCache(cache, cancel);
         }
 
-        for (GridCacheAdapter<?, ?> cache : caches.values())
-            stopCache(cache, cancel);
+        for (GridCacheAdapter<?, ?> cache : stoppedCaches.values()) {
+            if (cache == stoppedCaches.remove(maskNull(cache.name())))
+                stopCache(cache, cancel);
+        }
 
         List<? extends GridCacheSharedManager<?, ?>> mgrs = sharedCtx.managers();
 
@@ -932,15 +937,23 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         cacheStartedLatch.countDown();
 
         for (String cacheName : stopSeq) {
-            GridCacheAdapter<?, ?> cache = caches.get(maskNull(cacheName));
+            GridCacheAdapter<?, ?> cache = caches.remove(maskNull(cacheName));
+
+            if (cache != null) {
+                stoppedCaches.put(maskNull(cacheName), cache);
 
-            if (cache != null)
                 onKernalStop(cache, cancel);
+            }
         }
 
         for (Map.Entry<String, GridCacheAdapter<?, ?>> entry : caches.entrySet()) {
-            if (!stopSeq.contains(entry.getKey()))
+            GridCacheAdapter<?, ?> cache = entry.getValue();
+
+            if (cache == caches.remove(entry.getKey())) {
+                stoppedCaches.put(entry.getKey(), cache);
+
                 onKernalStop(entry.getValue(), cancel);
+            }
         }
 
         List<? extends GridCacheSharedManager<?, ?>> sharedMgrs = sharedCtx.managers();
@@ -3457,4 +3470,4 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             // No-op.
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/afce2699/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 414a152..865bbdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1146,52 +1146,54 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
         }
         else {
             initFut.listen(new CI1<IgniteInternalFuture<Boolean>>() {
-                @Override public void apply(IgniteInternalFuture<Boolean> t) {
+                @Override public void apply(IgniteInternalFuture<Boolean> f) {
                     try {
-                        if (!t.get()) // Just to check if there was an error.
+                        if (!f.get())
                             return;
+                    }
+                    catch (IgniteCheckedException e) {
+                        U.error(log, "Failed to initialize exchange future: " + this, e);
 
-                        ClusterNode loc = cctx.localNode();
+                        return;
+                    }
 
-                        singleMsgs.put(nodeId, msg);
+                    ClusterNode loc = cctx.localNode();
 
-                        boolean match = true;
+                    singleMsgs.put(nodeId, msg);
 
-                        // Check if oldest node has changed.
-                        if (!oldestNode.get().equals(loc)) {
-                            match = false;
+                    boolean match = true;
 
-                            synchronized (mux) {
-                                // Double check.
-                                if (oldestNode.get().equals(loc))
-                                    match = true;
-                            }
+                    // Check if oldest node has changed.
+                    if (!oldestNode.get().equals(loc)) {
+                        match = false;
+
+                        synchronized (mux) {
+                            // Double check.
+                            if (oldestNode.get().equals(loc))
+                                match = true;
                         }
+                    }
 
-                        if (match) {
-                            boolean allReceived;
+                    if (match) {
+                        boolean allReceived;
 
-                            synchronized (rcvdIds) {
-                                if (rcvdIds.add(nodeId))
-                                    updatePartitionSingleMap(msg);
+                        synchronized (rcvdIds) {
+                            if (rcvdIds.add(nodeId))
+                                updatePartitionSingleMap(msg);
 
-                                allReceived = allReceived();
-                            }
+                            allReceived = allReceived();
+                        }
 
-                            // If got all replies, and initialization finished, and reply has not been sent yet.
-                            if (allReceived && ready.get() && replied.compareAndSet(false, true)) {
-                                spreadPartitions();
+                        // If got all replies, and initialization finished, and reply has not been sent yet.
+                        if (allReceived && ready.get() && replied.compareAndSet(false, true)) {
+                            spreadPartitions();
 
-                                onDone(exchId.topologyVersion());
-                            }
-                            else if (log.isDebugEnabled())
-                                log.debug("Exchange future full map is not sent [allReceived=" + allReceived() +
-                                    ", ready=" + ready + ", replied=" + replied.get() + ", init=" + init.get() +
-                                    ", fut=" + this + ']');
+                            onDone(exchId.topologyVersion());
                         }
-                    }
-                    catch (IgniteCheckedException e) {
-                        U.error(log, "Failed to initialize exchange future: " + this, e);
+                        else if (log.isDebugEnabled())
+                            log.debug("Exchange future full map is not sent [allReceived=" + allReceived() +
+                                ", ready=" + ready + ", replied=" + replied.get() + ", init=" + init.get() +
+                                ", fut=" + this + ']');
                     }
                 }
             });
@@ -1254,7 +1256,17 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
         assert exchId.topologyVersion().equals(msg.topologyVersion());
 
         initFut.listen(new CI1<IgniteInternalFuture<Boolean>>() {
-            @Override public void apply(IgniteInternalFuture<Boolean> t) {
+            @Override public void apply(IgniteInternalFuture<Boolean> f) {
+                try {
+                    if (!f.get())
+                        return;
+                }
+                catch (IgniteCheckedException e) {
+                    U.error(log, "Failed to initialize exchange future: " + this, e);
+
+                    return;
+                }
+
                 ClusterNode curOldest = oldestNode.get();
 
                 if (!nodeId.equals(curOldest.id())) {
@@ -1343,8 +1355,18 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
 
         try {
             // Wait for initialization part of this future to complete.
-            initFut.listen(new CI1<IgniteInternalFuture<?>>() {
-                @Override public void apply(IgniteInternalFuture<?> f) {
+            initFut.listen(new CI1<IgniteInternalFuture<Boolean>>() {
+                @Override public void apply(IgniteInternalFuture<Boolean> f) {
+                    try {
+                        if (!f.get())
+                            return;
+                    }
+                    catch (IgniteCheckedException e) {
+                        U.error(log, "Failed to initialize exchange future: " + this, e);
+
+                        return;
+                    }
+
                     if (isDone())
                         return;
 
@@ -1571,4 +1593,4 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
             "remaining", remaining(),
             "super", super.toString());
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/afce2699/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheAndNodeStop.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheAndNodeStop.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheAndNodeStop.java
new file mode 100644
index 0000000..a389e1f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheAndNodeStop.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+
+/**
+ *
+ */
+public class IgniteDynamicCacheAndNodeStop extends GridCommonAbstractTest {
+    /** */
+    private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+        ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+        return cfg;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        super.afterTest();
+
+        stopAllGrids();
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheAndNodeStop() throws Exception {
+        final Ignite ignite = startGrid(0);
+
+        for (int i = 0; i < 3; i++) {
+            log.info("Iteration: " + i);
+
+            startGrid(1);
+
+            final  CacheConfiguration ccfg = new CacheConfiguration();
+
+            ignite.createCache(ccfg);
+
+            final CyclicBarrier barrier = new CyclicBarrier(2);
+
+            IgniteInternalFuture<?> fut1 = GridTestUtils.runAsync(new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    barrier.await();
+
+                    ignite.destroyCache(null);
+
+                    return null;
+                }
+            });
+
+            IgniteInternalFuture<?> fut2 = GridTestUtils.runAsync(new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    barrier.await();
+
+                    stopGrid(1);
+
+                    return null;
+                }
+            });
+
+            fut1.get();
+            fut2.get();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/afce2699/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index e903115..9b9bbba 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -238,7 +238,8 @@ public class IgniteCacheTestSuite2 extends TestSuite {
         suite.addTest(new TestSuite(IgniteAtomicCacheEntryProcessorNodeJoinTest.class));
         suite.addTest(new TestSuite(GridCacheNearTxForceKeyTest.class));
         suite.addTest(new TestSuite(CrossCacheTxRandomOperationsTest.class));
+        suite.addTest(new TestSuite(IgniteDynamicCacheAndNodeStop.class));
 
         return suite;
     }
-}
\ No newline at end of file
+}


[70/82] [abbrv] ignite git commit: IGNITE-1337: Moved "common" CPP project to Ignite.

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/win/include/ignite/common/common.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/win/include/ignite/common/common.h b/modules/platform/src/main/cpp/common/os/win/include/ignite/common/common.h
new file mode 100644
index 0000000..9e57bde
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/win/include/ignite/common/common.h
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef _IGNITE_COMMON_COMMON
+#define _IGNITE_COMMON_COMMON
+
+#define IGNITE_EXPORT __declspec(dllexport)
+#define IGNITE_IMPORT __declspec(dllimport)
+#define IGNITE_CALL __stdcall
+
+#define IGNITE_IMPORT_EXPORT IGNITE_EXPORT
+
+#include <iostream>
+
+#define IGNITE_TRACE_ALLOC(addr) \
+    std::cout << "ALLOC " << __FILE__ << "(" << __LINE__ << "): 0x" << (void*)addr << std::endl;
+
+/**
+ * Common construction to disable copy constructor and assignment for class.
+ */
+#define IGNITE_NO_COPY_ASSIGNMENT(cls) \
+    cls(const cls& src); \
+    cls& operator= (const cls& other); 
+
+namespace ignite
+{
+    namespace common
+    {
+        /**
+         * Helper class to manage attached threads.
+         */
+        class AttachHelper 
+        {
+        public:                       
+            /**
+             * Callback invoked on successful thread attach ot JVM.
+             */
+            static void OnThreadAttach();
+        };   
+    }
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/win/include/ignite/common/concurrent_os.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/win/include/ignite/common/concurrent_os.h b/modules/platform/src/main/cpp/common/os/win/include/ignite/common/concurrent_os.h
new file mode 100644
index 0000000..0a47beb
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/win/include/ignite/common/concurrent_os.h
@@ -0,0 +1,406 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_COMMON_CONCURRENT_OS
+#define _IGNITE_COMMON_CONCURRENT_OS
+
+#include <map>
+#include <stdint.h>
+#include <windows.h>
+
+#include "ignite/common/common.h"
+
+namespace ignite
+{
+    namespace common 
+    {
+        namespace concurrent 
+        {
+            /**
+             * Static class to manage memory visibility semantics. 
+             */
+            class IGNITE_IMPORT_EXPORT Memory {
+            public:
+                /**
+                 * Full fence. 
+                 */
+                static void Fence();
+            };
+
+            /**
+             * Critical section.
+             */
+            class IGNITE_IMPORT_EXPORT CriticalSection {
+            public:
+                /**
+                 * Constructor.
+                 */
+                CriticalSection();
+
+                /**
+                 * Destructor. 
+                 */
+                ~CriticalSection();
+
+                /**
+                 * Enter critical section.
+                 */
+                void Enter();
+
+                /**
+                 * Leave critical section.
+                 */
+                void Leave();
+            private:
+                /** Handle. */
+                CRITICAL_SECTION* hnd;
+
+                IGNITE_NO_COPY_ASSIGNMENT(CriticalSection)
+            };
+
+            /**
+             * Special latch with count = 1.
+             */
+            class IGNITE_IMPORT_EXPORT SingleLatch
+            {                
+            public:
+                /**
+                 * Constructor.
+                 */
+                SingleLatch();
+
+                /**
+                 * Destructor.
+                 */
+                ~SingleLatch();
+
+                /**
+                 * Perform the countdown.
+                 */
+                void CountDown();
+
+                /**
+                 * Await the countdown.
+                 */
+                void Await();
+            private:
+                /** Handle. */
+                void* hnd;
+
+                IGNITE_NO_COPY_ASSIGNMENT(SingleLatch)
+            };
+
+            /**
+             * Primitives for atomic access.
+             */
+            class IGNITE_IMPORT_EXPORT Atomics
+            {
+            public:
+                /**
+                 * Update the 32-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return True if update occurred as a result of this call, false otherwise.
+                 */
+                static bool CompareAndSet32(int32_t* ptr, int32_t expVal, int32_t newVal);
+
+                /**
+                 * Update the 32-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return Value which were observed during CAS attempt.
+                 */
+                static int32_t CompareAndSet32Val(int32_t* ptr, int32_t expVal, int32_t newVal);
+                
+                /**
+                 * Increment 32-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after increment.
+                 */
+                static int32_t IncrementAndGet32(int32_t* ptr);
+
+                /**
+                 * Decrement 32-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after decrement.
+                 */
+                static int32_t DecrementAndGet32(int32_t* ptr);
+
+                /**
+                 * Update the 64-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return True if update occurred as a result of this call, false otherwise.
+                 */
+                static bool CompareAndSet64(int64_t* ptr, int64_t expVal, int64_t newVal);
+
+                /**
+                 * Update the 64-bit integer value if it is equal to expected value.
+                 *
+                 * @param ptr Pointer.
+                 * @param expVal Expected value.
+                 * @param newVal New value.
+                 * @return Value which were observed during CAS attempt.
+                 */
+                static int64_t CompareAndSet64Val(int64_t* ptr, int64_t expVal, int64_t newVal);
+                
+                /**
+                 * Increment 64-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after increment.
+                 */
+                static int64_t IncrementAndGet64(int64_t* ptr);
+
+                /**
+                 * Decrement 64-bit integer and return new value.
+                 *
+                 * @param ptr Pointer.
+                 * @return Value after decrement.
+                 */
+                static int64_t DecrementAndGet64(int64_t* ptr);
+            };
+
+            /**
+             * Thread-local entry.
+             */
+            class IGNITE_IMPORT_EXPORT ThreadLocalEntry
+            {
+            public:
+                /**
+                 * Virtual destructor to allow for correct typed entries cleanup.
+                 */
+                virtual ~ThreadLocalEntry()
+                {
+                    // No-op.
+                }
+            };
+
+            /**
+             * Typed thread-local entry.
+             */
+            template<typename T>
+            class IGNITE_IMPORT_EXPORT ThreadLocalTypedEntry : public ThreadLocalEntry
+            {
+            public:
+                /**
+                 * Constructor.
+                 *
+                 * @param val Value.
+                 */
+                ThreadLocalTypedEntry(T val) : val(val)
+                {
+                    // No-op.
+                }
+                
+                ~ThreadLocalTypedEntry()
+                {
+                    // No-op.
+                }
+
+                /**
+                 * Get value.
+                 *
+                 * @return Value.
+                 */
+                T Get()
+                {
+                    return val;
+                }
+            private:
+                /** Value. */
+                T val; 
+            };
+
+            /**
+             * Thread-local abstraction.
+             */
+            class IGNITE_IMPORT_EXPORT ThreadLocal
+            {
+            public:
+                /**
+                 * Allocate thread-local index. Invoked once on DLL process attach.
+                 *
+                 * @return True if allocation was successful.
+                 */
+                static bool OnProcessAttach();
+
+                /**
+                 * Release thread-local entry. Invoked on DLL thread detach.
+                 */
+                static void OnThreadDetach();
+
+                /**
+                 * Release thread-local index. Invoked once on DLL process detach.
+                 */
+                static void OnProcessDetach();
+
+                /**
+                 * Get next available index to be used in thread-local storage.
+                 *
+                 * @return Index.
+                 */
+                static int32_t NextIndex();
+
+                /**
+                 * Get value by index.
+                 *
+                 * @param idx Index.
+                 * @return Value associated with the index or NULL.
+                 */
+                template<typename T>
+                static T Get(int32_t idx)
+                {
+                    void* winVal = Get0();
+
+                    if (winVal)
+                    {
+                        std::map<int32_t, ThreadLocalEntry*>* map = 
+                            static_cast<std::map<int32_t, ThreadLocalEntry*>*>(winVal);
+
+                        ThreadLocalTypedEntry<T>* entry = static_cast<ThreadLocalTypedEntry<T>*>((*map)[idx]);
+                        
+                        if (entry)
+                            return entry->Get();
+                    }
+
+                    return T();
+                }
+
+                /**
+                 * Set value at the given index.
+                 *
+                 * @param idx Index.
+                 * @param val Value to be associated with the index.
+                 */
+                template<typename T>
+                static void Set(int32_t idx, const T& val)
+                {
+                    void* winVal = Get0();
+
+                    if (winVal)
+                    {
+                        std::map<int32_t, ThreadLocalEntry*>* map = 
+                            static_cast<std::map<int32_t, ThreadLocalEntry*>*>(winVal);
+
+                        ThreadLocalEntry* appVal = (*map)[idx];
+
+                        if (appVal)
+                            delete appVal;
+
+                        (*map)[idx] = new ThreadLocalTypedEntry<T>(val);
+                    }
+                    else
+                    {
+                        std::map<int32_t, ThreadLocalEntry*>* map = new std::map<int32_t, ThreadLocalEntry*>();
+
+                        Set0(map);
+
+                        (*map)[idx] = new ThreadLocalTypedEntry<T>(val);
+                    }
+                }
+
+                /**
+                 * Remove value at the given index.
+                 *
+                 * @param idx Index.
+                 */
+                static void Remove(int32_t idx);
+
+            private:
+                /**
+                 * Internal get routine.
+                 *
+                 * @param Associated value.
+                 */
+                static void* Get0();
+
+                /**
+                 * Internal set routine.
+                 *
+                 * @param ptr Pointer.
+                 */
+                static void Set0(void* ptr);
+
+                /**
+                 * Internal thread-local map clear routine.
+                 *
+                 * @param mapPtr Pointer to map.
+                 */
+                static void Clear0(void* mapPtr);
+            };
+
+            /**
+             * Thread-local instance. Simplifies API avoiding direct index allocations.
+             */
+            template<typename T>
+            class IGNITE_IMPORT_EXPORT ThreadLocalInstance
+            {
+            public:
+                /**
+                 * Constructor.
+                 */
+                ThreadLocalInstance() : idx(ThreadLocal::NextIndex())
+                {
+                    // No-op.
+                }
+
+                /**
+                 * Get value.
+                 *
+                 * @return Value.
+                 */
+                T Get()
+                {
+                    return ThreadLocal::Get<T>(idx);
+                }
+
+                /**
+                 * Set instance.
+                 *
+                 * @param val Value.
+                 */
+                void Set(const T& val)
+                {
+                    ThreadLocal::Set<T>(idx, val);
+                }
+
+                /**
+                 * Remove instance.
+                 */
+                void Remove()
+                {
+                    ThreadLocal::Remove(idx);
+                }
+
+            private:
+                /** Index. */
+                int32_t idx; 
+            };
+        }
+    }
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/win/src/common.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/win/src/common.cpp b/modules/platform/src/main/cpp/common/os/win/src/common.cpp
new file mode 100644
index 0000000..e83e736
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/win/src/common.cpp
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <windows.h>
+
+#include "ignite/common/common.h"
+#include "ignite/common/concurrent.h"
+#include "ignite/common/java.h"
+
+using namespace ignite::common::concurrent;
+using namespace ignite::common::java;
+
+namespace ignite
+{
+    namespace common
+    {
+        void AttachHelper::OnThreadAttach()
+        {
+            // No-op.
+        }
+    }
+}
+
+BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved)
+{
+    switch (fdwReason)
+    {
+        case DLL_PROCESS_ATTACH:
+            if (!ThreadLocal::OnProcessAttach())
+                return FALSE;
+
+            break;
+
+        case DLL_THREAD_DETACH:
+            ThreadLocal::OnThreadDetach();
+
+            JniContext::Detach();
+
+            break;
+
+        case DLL_PROCESS_DETACH:
+            ThreadLocal::OnProcessDetach();
+
+            break;
+
+        default:
+            break;
+    }
+
+    return TRUE;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/os/win/src/concurrent_os.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/os/win/src/concurrent_os.cpp b/modules/platform/src/main/cpp/common/os/win/src/concurrent_os.cpp
new file mode 100644
index 0000000..a21f7ec
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/os/win/src/concurrent_os.cpp
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ignite/common/concurrent_os.h"
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace concurrent
+        {
+            /** Thread-local index for Windows. */
+            DWORD winTlsIdx;
+
+            void Memory::Fence() {
+                MemoryBarrier();
+            }
+
+            CriticalSection::CriticalSection() : hnd(new CRITICAL_SECTION) {
+                InitializeCriticalSection(hnd);
+
+                Memory::Fence();
+            }
+
+            CriticalSection::~CriticalSection() {
+                Memory::Fence();
+
+                delete hnd;
+            }
+
+            void CriticalSection::Enter() {
+                Memory::Fence();
+
+                EnterCriticalSection(hnd);
+            }
+
+            void CriticalSection::Leave() {
+                Memory::Fence();
+
+                LeaveCriticalSection(hnd);
+            }
+
+            SingleLatch::SingleLatch() : hnd(CreateEvent(NULL, TRUE, FALSE, NULL))
+            {
+                Memory::Fence();
+            }
+
+            SingleLatch::~SingleLatch()
+            {
+                Memory::Fence();
+
+                CloseHandle(hnd);
+            }
+
+            void SingleLatch::CountDown()
+            {
+                SetEvent(hnd);
+            }
+
+            void SingleLatch::Await()
+            {
+                WaitForSingleObject(hnd, INFINITE);
+            }
+
+            bool Atomics::CompareAndSet32(int32_t* ptr, int32_t expVal, int32_t newVal)
+            {
+                return CompareAndSet32Val(ptr, expVal, newVal) == expVal;
+            }
+
+            int32_t Atomics::CompareAndSet32Val(int32_t* ptr, int32_t expVal, int32_t newVal)
+            {
+                return InterlockedCompareExchange(reinterpret_cast<LONG*>(ptr), newVal, expVal);
+            }
+
+            int32_t Atomics::IncrementAndGet32(int32_t* ptr)
+            {
+                return InterlockedIncrement(reinterpret_cast<LONG*>(ptr));
+            }
+
+            int32_t Atomics::DecrementAndGet32(int32_t* ptr)
+            {
+                return InterlockedDecrement(reinterpret_cast<LONG*>(ptr));
+            }
+
+            bool Atomics::CompareAndSet64(int64_t* ptr, int64_t expVal, int64_t newVal)
+            {
+                return CompareAndSet64Val(ptr, expVal, newVal) == expVal;
+            }
+
+            int64_t Atomics::CompareAndSet64Val(int64_t* ptr, int64_t expVal, int64_t newVal)
+            {
+                return InterlockedCompareExchange64(reinterpret_cast<LONG64*>(ptr), newVal, expVal);
+            }
+
+            int64_t Atomics::IncrementAndGet64(int64_t* ptr)
+            {
+                return InterlockedIncrement64(reinterpret_cast<LONG64*>(ptr));
+            }
+
+            int64_t Atomics::DecrementAndGet64(int64_t* ptr)
+            {
+                return InterlockedDecrement64(reinterpret_cast<LONG64*>(ptr));
+            }
+            
+            bool ThreadLocal::OnProcessAttach()
+            {
+                return (winTlsIdx = TlsAlloc()) != TLS_OUT_OF_INDEXES;
+            }
+
+            void ThreadLocal::OnThreadDetach()
+            {
+                if (winTlsIdx != TLS_OUT_OF_INDEXES)
+                {
+                    void* mapPtr = Get0();
+
+                    Clear0(mapPtr);
+                }
+            }
+
+            void ThreadLocal::OnProcessDetach()
+            {
+                if (winTlsIdx != TLS_OUT_OF_INDEXES)
+                    TlsFree(winTlsIdx);
+            }
+
+            void* ThreadLocal::Get0()
+            {
+                return TlsGetValue(winTlsIdx);
+            }
+
+            void ThreadLocal::Set0(void* ptr)
+            {
+                TlsSetValue(winTlsIdx, ptr);
+            }
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/project/README.TXT
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/README.TXT b/modules/platform/src/main/cpp/common/project/README.TXT
new file mode 100644
index 0000000..97f4c64
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/project/README.TXT
@@ -0,0 +1 @@
+Contains IDE projects artifacts.

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/project/vs/README.TXT
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/README.TXT b/modules/platform/src/main/cpp/common/project/vs/README.TXT
new file mode 100644
index 0000000..f4fb456
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/project/vs/README.TXT
@@ -0,0 +1 @@
+Contains Visual Studio project artifacts.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
new file mode 100644
index 0000000..478932f
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4F7E4917-4612-4B96-9838-025711ADE391}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>common</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>ignite.common</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>ignite.common</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>ignite.common</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>ignite.common</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
+      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
+      <OptimizeReferences>false</OptimizeReferences>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <StringPooling>true</StringPooling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
+      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
+      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\ignite\common\concurrent.h" />
+    <ClInclude Include="..\..\include\ignite\common\exports.h" />
+    <ClInclude Include="..\..\include\ignite\common\java.h" />
+    <ClInclude Include="..\..\os\win\include\ignite\common\common.h" />
+    <ClInclude Include="..\..\os\win\include\ignite\common\concurrent_os.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\os\win\src\common.cpp" />
+    <ClCompile Include="..\..\os\win\src\concurrent_os.cpp" />
+    <ClCompile Include="..\..\src\concurrent.cpp" />
+    <ClCompile Include="..\..\src\exports.cpp" />
+    <ClCompile Include="..\..\src\java.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ItemGroup>
+    <None Include="module.def" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/project/vs/common.vcxproj.filters
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj.filters b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj.filters
new file mode 100644
index 0000000..3d4ae54
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj.filters
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Misc">
+      <UniqueIdentifier>{1dbec2be-5cb4-4f70-aef6-b4627d39b99b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Code">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\os\win\include\ignite\common\common.h">
+      <Filter>Code</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\os\win\include\ignite\common\concurrent_os.h">
+      <Filter>Code</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ignite\common\exports.h">
+      <Filter>Code</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ignite\common\java.h">
+      <Filter>Code</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ignite\common\concurrent.h">
+      <Filter>Code</Filter>
+    </ClInclude>
+    <ClInclude Include="targetver.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\os\win\src\common.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\concurrent.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\os\win\src\concurrent_os.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\exports.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\java.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="module.def">
+      <Filter>Misc</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/project/vs/module.def
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/module.def b/modules/platform/src/main/cpp/common/project/vs/module.def
new file mode 100644
index 0000000..d9e8d2b
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/project/vs/module.def
@@ -0,0 +1,99 @@
+LIBRARY ignite.common.dll
+EXPORTS
+IgniteReallocate @1 
+IgniteIgnitionStart @2 
+IgniteIgnitionInstance @3 
+IgniteIgnitionEnvironmentPointer @4 
+IgniteIgnitionStop @5 
+IgniteIgnitionStopAll @6 
+IgniteTargetOutLong @7
+IgniteProcessorReleaseStart @8 
+IgniteProcessorProjection @9 
+IgniteProcessorCache @10 
+IgniteProcessorCreateCache @11 
+IgniteProcessorGetOrCreateCache @12 
+IgniteProcessorAffinity @13 
+IgniteProcessorDataStreamer @14 
+IgniteProcessorTransactions @15 
+IgniteProcessorServices @16
+IgniteTargetInStreamOutObject @17 
+IgniteTargetInStreamOutLong @18 
+IgniteTargetOutStream @19 
+IgniteTargetInStreamOutStream @20 
+IgniteTargetInObjectStreamOutStream @21 
+IgniteTargetListenFuture @22 
+IgniteTargetListenFutureForOperation @23 
+IgniteAffinityPartitions @24 
+IgniteCacheWithSkipStore @25 
+IgniteCacheWithNoRetries @26 
+IgniteCacheWithExpiryPolicy @27 
+IgniteCacheWithAsync @28 
+IgniteCacheWithKeepPortable @29 
+IgniteCacheClear @30 
+IgniteCacheRemoveAll @31 
+IgniteCacheOutOpQueryCursor @32 
+IgniteCacheOutOpContinuousQuery @33 
+IgniteCacheIterator @34 
+IgniteCacheLocalIterator @35 
+IgniteCacheEnterLock @36 
+IgniteCacheExitLock @37 
+IgniteCacheTryEnterLock @38 
+IgniteCacheCloseLock @39 
+IgniteCacheRebalance @40 
+IgniteCacheSize @41 
+IgniteCacheStoreCallbackInvoke @42 
+IgniteComputeWithNoFailover @43 
+IgniteComputeWithTimeout @44 
+IgniteComputeExecuteNative @45 
+IgniteContinuousQueryClose @46 
+IgniteContinuousQueryGetInitialQueryCursor @47 
+IgniteDataStreamerListenTopology @48 
+IgniteDataStreamerAllowOverwriteGet @49 
+IgniteDataStreamerAllowOverwriteSet @50 
+IgniteDataStreamerSkipStoreGet @51 
+IgniteDataStreamerSkipStoreSet @52 
+IgniteDataStreamerPerNodeBufferSizeGet @53 
+IgniteDataStreamerPerNodeBufferSizeSet @54 
+IgniteDataStreamerPerNodeParallelOperationsGet @55 
+IgniteDataStreamerPerNodeParallelOperationsSet @56 
+IgniteMessagingWithAsync @57 
+IgniteProjectionForOthers @58 
+IgniteProjectionForRemotes @59 
+IgniteProjectionForDaemons @60 
+IgniteProjectionForRandom @61 
+IgniteProjectionForOldest @62 
+IgniteProjectionForYoungest @63 
+IgniteProcessorCompute @64 
+IgniteProcessorMessage @65 
+IgniteProcessorEvents @66 
+IgniteProjectionResetMetrics @67 
+IgniteProjectionOutOpRet @68 
+IgniteQueryCursorIterator @69 
+IgniteQueryCursorClose @70 
+IgniteTransactionsStart @71 
+IgniteTransactionsCommit @72 
+IgniteTransactionsCommitAsync @73 
+IgniteTransactionsRollback @74 
+IgniteTransactionsRollbackAsync @75 
+IgniteTransactionsClose @76 
+IgniteTransactionsState @77 
+IgniteTransactionsSetRollbackOnly @78 
+IgniteTransactionsResetMetrics @79 
+IgniteAcquire @80 
+IgniteRelease @81 
+IgniteThrowToJava @82 
+IgniteHandlersSize @83 
+IgniteCreateContext @84 
+IgniteDeleteContext @85 
+IgniteDestroyJvm @86 
+IgniteEventsWithAsync @87 
+IgniteEventsStopLocalListen @88 
+IgniteEventsLocalListen @89 
+IgniteEventsIsEnabled @90 
+IgniteTargetOutObject @91 
+IgniteServicesWithAsync @92
+IgniteServicesWithServerKeepPortable @93
+IgniteServicesCancel @94
+IgniteServicesCancelAll @95
+IgniteServicesGetServiceProxy @96
+IgniteProcessorExtensions @97
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/project/vs/targetver.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/targetver.h b/modules/platform/src/main/cpp/common/project/vs/targetver.h
new file mode 100644
index 0000000..4bea158
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/project/vs/targetver.h
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/src/concurrent.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/src/concurrent.cpp b/modules/platform/src/main/cpp/common/src/concurrent.cpp
new file mode 100644
index 0000000..3f85b65
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/src/concurrent.cpp
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ignite/common/concurrent.h"
+
+namespace ignite
+{
+    namespace common
+    {
+        namespace concurrent
+        {
+            /** Thread-local index generator for application. */
+            int32_t appTlsIdxGen = 0;
+
+            int32_t ThreadLocal::NextIndex()
+            {
+                return Atomics::IncrementAndGet32(&appTlsIdxGen);
+            }
+
+            void ThreadLocal::Remove(int32_t idx)
+            {
+                void* val = Get0();
+
+                if (val)
+                {
+                    std::map<int32_t, ThreadLocalEntry*>* map =
+                        static_cast<std::map<int32_t, ThreadLocalEntry*>*>(val);
+
+                    ThreadLocalEntry* appVal = (*map)[idx];
+
+                    if (appVal)
+                        delete appVal;
+
+                    map->erase(idx);
+
+                    if (map->size() == 0)
+                    {
+                        delete map;
+
+                        Set0(NULL);
+                    }
+                }
+            }
+
+            void ThreadLocal::Clear0(void* mapPtr)
+            {
+                if (mapPtr)
+                {
+                    std::map<int32_t, ThreadLocalEntry*>* map =
+                        static_cast<std::map<int32_t, ThreadLocalEntry*>*>(mapPtr);
+
+                    for (std::map<int32_t, ThreadLocalEntry*>::iterator it = map->begin(); it != map->end(); ++it)
+                        delete it->second;
+
+                    delete map;
+                }
+            }
+
+            SharedPointerImpl::SharedPointerImpl(void* ptr) : ptr(ptr), refCnt(1)
+            {
+                Memory::Fence();
+            }
+
+            void* SharedPointerImpl::Pointer()
+            {
+                return ptr;
+            }
+
+            void SharedPointerImpl::Increment()
+            {
+                Atomics::IncrementAndGet32(&refCnt);
+            }
+
+            bool SharedPointerImpl::Decrement()
+            {
+                return Atomics::DecrementAndGet32(&refCnt) == 0;
+            }
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca8cbc7/modules/platform/src/main/cpp/common/src/exports.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/src/exports.cpp b/modules/platform/src/main/cpp/common/src/exports.cpp
new file mode 100644
index 0000000..10e4801
--- /dev/null
+++ b/modules/platform/src/main/cpp/common/src/exports.cpp
@@ -0,0 +1,413 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ignite/common/exports.h"
+#include "ignite/common/java.h"
+
+namespace gcj = ignite::common::java;
+
+/* --- Target methods. --- */
+extern "C" {
+    int IGNITE_CALL IgniteReallocate(long long memPtr, int cap) {
+        return gcj::JniContext::Reallocate(memPtr, cap);
+    }
+
+    void* IGNITE_CALL IgniteIgnitionStart(gcj::JniContext* ctx, char* cfgPath, char* gridName, int factoryId, long long dataPtr) {
+        return ctx->IgnitionStart(cfgPath, gridName, factoryId, dataPtr);
+    }
+
+	void* IGNITE_CALL IgniteIgnitionInstance(gcj::JniContext* ctx, char* gridName) {
+        return ctx->IgnitionInstance(gridName);
+    }
+
+    long long IGNITE_CALL IgniteIgnitionEnvironmentPointer(gcj::JniContext* ctx, char* gridName) {
+        return ctx->IgnitionEnvironmentPointer(gridName);
+    }
+
+	bool IGNITE_CALL IgniteIgnitionStop(gcj::JniContext* ctx, char* gridName, bool cancel) {
+        return ctx->IgnitionStop(gridName, cancel);
+    }
+
+	void IGNITE_CALL IgniteIgnitionStopAll(gcj::JniContext* ctx, bool cancel) {
+        return ctx->IgnitionStopAll(cancel);
+    }
+
+    void IGNITE_CALL IgniteProcessorReleaseStart(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProcessorReleaseStart(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProcessorProjection(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProcessorProjection(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProcessorCache(gcj::JniContext* ctx, void* obj, char* name) {
+        return ctx->ProcessorCache(static_cast<jobject>(obj), name);
+    }
+
+    void* IGNITE_CALL IgniteProcessorCreateCache(gcj::JniContext* ctx, void* obj, char* name) {
+        return ctx->ProcessorCreateCache(static_cast<jobject>(obj), name);
+    }
+
+    void* IGNITE_CALL IgniteProcessorGetOrCreateCache(gcj::JniContext* ctx, void* obj, char* name) {
+        return ctx->ProcessorGetOrCreateCache(static_cast<jobject>(obj), name);
+    }
+
+    void* IGNITE_CALL IgniteProcessorAffinity(gcj::JniContext* ctx, void* obj, char* name) {
+        return ctx->ProcessorAffinity(static_cast<jobject>(obj), name);
+    }
+
+    void*IGNITE_CALL IgniteProcessorDataStreamer(gcj::JniContext* ctx, void* obj, char* name, bool keepPortable) {
+        return ctx->ProcessorDataStreamer(static_cast<jobject>(obj), name, keepPortable);
+    }
+    
+    void* IGNITE_CALL IgniteProcessorTransactions(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProcessorTransactions(static_cast<jobject>(obj));
+    }
+        
+    void* IGNITE_CALL IgniteProcessorCompute(gcj::JniContext* ctx, void* obj, void* prj) {
+        return ctx->ProcessorCompute(static_cast<jobject>(obj), static_cast<jobject>(prj));
+    }
+
+    void* IGNITE_CALL IgniteProcessorMessage(gcj::JniContext* ctx, void* obj, void* prj) {
+        return ctx->ProcessorMessage(static_cast<jobject>(obj), static_cast<jobject>(prj));
+    }
+
+    void* IGNITE_CALL IgniteProcessorEvents(gcj::JniContext* ctx, void* obj, void* prj) {
+        return ctx->ProcessorEvents(static_cast<jobject>(obj), static_cast<jobject>(prj));
+    }
+
+    void* IGNITE_CALL IgniteProcessorServices(gcj::JniContext* ctx, void* obj, void* prj) {
+        return ctx->ProcessorServices(static_cast<jobject>(obj), static_cast<jobject>(prj));
+    }
+
+    void* IGNITE_CALL IgniteProcessorExtensions(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProcessorExtensions(static_cast<jobject>(obj));
+    }
+
+    long long IGNITE_CALL IgniteTargetInStreamOutLong(gcj::JniContext* ctx, void* obj, int opType, long long memPtr) {
+        return ctx->TargetInStreamOutLong(static_cast<jobject>(obj), opType, memPtr);
+    }
+
+    void IGNITE_CALL IgniteTargetInStreamOutStream(gcj::JniContext* ctx, void* obj, int opType, long long inMemPtr, long long outMemPtr) {
+        ctx->TargetInStreamOutStream(static_cast<jobject>(obj), opType, inMemPtr, outMemPtr);
+    }
+
+    void* IGNITE_CALL IgniteTargetInStreamOutObject(gcj::JniContext* ctx, void* obj, int opType, long long memPtr) {
+        return ctx->TargetInStreamOutObject(static_cast<jobject>(obj), opType, memPtr);
+    }
+
+    void IGNITE_CALL IgniteTargetInObjectStreamOutStream(gcj::JniContext* ctx, void* obj, int opType, void* arg, long long inMemPtr, long long outMemPtr) {
+        ctx->TargetInObjectStreamOutStream(static_cast<jobject>(obj), opType, arg, inMemPtr, outMemPtr);
+    }
+    
+    long long IGNITE_CALL IgniteTargetOutLong(gcj::JniContext* ctx, void* obj, int opType) {
+        return ctx->TargetOutLong(static_cast<jobject>(obj), opType);
+    }
+
+    void IGNITE_CALL IgniteTargetOutStream(gcj::JniContext* ctx, void* obj, int opType, long long memPtr) {
+        ctx->TargetOutStream(static_cast<jobject>(obj), opType, memPtr);
+    }
+
+    void* IGNITE_CALL IgniteTargetOutObject(gcj::JniContext* ctx, void* obj, int opType) {
+        return ctx->TargetOutObject(static_cast<jobject>(obj), opType);
+    }
+
+    void IGNITE_CALL IgniteTargetListenFuture(gcj::JniContext* ctx, void* obj, long long futId, int typ) {
+        ctx->TargetListenFuture(static_cast<jobject>(obj), futId, typ);
+    }
+
+    void IGNITE_CALL IgniteTargetListenFutureForOperation(gcj::JniContext* ctx, void* obj, long long futId, int typ, int opId) {
+        ctx->TargetListenFutureForOperation(static_cast<jobject>(obj), futId, typ, opId);
+    }
+
+    int IGNITE_CALL IgniteAffinityPartitions(gcj::JniContext* ctx, void* obj) {
+        return ctx->AffinityPartitions(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteCacheWithSkipStore(gcj::JniContext* ctx, void* obj) {
+        return ctx->CacheWithSkipStore(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteCacheWithNoRetries(gcj::JniContext* ctx, void* obj) {
+        return ctx->CacheWithNoRetries(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteCacheWithExpiryPolicy(gcj::JniContext* ctx, void* obj, long long create, long long update, long long access) {
+        return ctx->CacheWithExpiryPolicy(static_cast<jobject>(obj), create, update, access);
+    }
+
+    void* IGNITE_CALL IgniteCacheWithAsync(gcj::JniContext* ctx, void* obj) {
+        return ctx->CacheWithAsync(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteCacheWithKeepPortable(gcj::JniContext* ctx, void* obj)
+    {
+        return ctx->CacheWithKeepPortable(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteCacheClear(gcj::JniContext* ctx, void* obj) {
+        ctx->CacheClear(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteCacheRemoveAll(gcj::JniContext* ctx, void* obj) {
+        ctx->CacheRemoveAll(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteCacheOutOpQueryCursor(gcj::JniContext* ctx, void* obj, int type, long long memPtr) {
+        return ctx->CacheOutOpQueryCursor(static_cast<jobject>(obj), type, memPtr);
+    }
+
+    void* IGNITE_CALL IgniteCacheOutOpContinuousQuery(gcj::JniContext* ctx, void* obj, int type, long long memPtr) {
+        return ctx->CacheOutOpContinuousQuery(static_cast<jobject>(obj), type, memPtr);
+    }
+
+    void* IGNITE_CALL IgniteCacheIterator(gcj::JniContext* ctx, void* obj) {
+        return ctx->CacheIterator(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteCacheLocalIterator(gcj::JniContext* ctx, void* obj, int peekModes) {
+        return ctx->CacheLocalIterator(static_cast<jobject>(obj), peekModes);
+    }
+
+    void IGNITE_CALL IgniteCacheEnterLock(gcj::JniContext* ctx, void* obj, long long id) {
+        ctx->CacheEnterLock(static_cast<jobject>(obj), id);
+    }
+
+    void IGNITE_CALL IgniteCacheExitLock(gcj::JniContext* ctx, void* obj, long long id) {
+        ctx->CacheExitLock(static_cast<jobject>(obj), id);
+    }
+
+    bool IGNITE_CALL IgniteCacheTryEnterLock(gcj::JniContext* ctx, void* obj, long long id, long long timeout) {
+        return ctx->CacheTryEnterLock(static_cast<jobject>(obj), id, timeout);
+    }
+
+    void IGNITE_CALL IgniteCacheCloseLock(gcj::JniContext* ctx, void* obj, long long id) {
+        ctx->CacheCloseLock(static_cast<jobject>(obj), id);
+    }
+
+    void IGNITE_CALL IgniteCacheRebalance(gcj::JniContext* ctx, void* obj, long long futId) {
+        ctx->CacheRebalance(static_cast<jobject>(obj), futId);
+    }
+
+    int IGNITE_CALL IgniteCacheSize(gcj::JniContext* ctx, void* obj, int peekModes, bool loc) {
+        return ctx->CacheSize(static_cast<jobject>(obj), peekModes, loc);
+    }
+
+    void IGNITE_CALL IgniteComputeWithNoFailover(gcj::JniContext* ctx, void* obj) {
+        ctx->ComputeWithNoFailover(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteComputeWithTimeout(gcj::JniContext* ctx, void* obj, long long timeout) {
+        ctx->ComputeWithTimeout(static_cast<jobject>(obj), timeout);
+    }
+
+    void IGNITE_CALL IgniteComputeExecuteNative(gcj::JniContext* ctx, void* obj, long long taskPtr, long long topVer) {
+        ctx->ComputeExecuteNative(static_cast<jobject>(obj), taskPtr, topVer);
+    }
+
+    void IGNITE_CALL IgniteContinuousQueryClose(gcj::JniContext* ctx, void* obj) {
+        ctx->ContinuousQueryClose(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteContinuousQueryGetInitialQueryCursor(gcj::JniContext* ctx, void* obj) {
+        return ctx->ContinuousQueryGetInitialQueryCursor(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteCacheStoreCallbackInvoke(gcj::JniContext* ctx, void* obj, long long memPtr) {
+        ctx->CacheStoreCallbackInvoke(static_cast<jobject>(obj), memPtr);
+    }
+
+    void IGNITE_CALL IgniteDataStreamerListenTopology(gcj::JniContext* ctx, void* obj, long long ptr) {
+        ctx->DataStreamerListenTopology(static_cast<jobject>(obj), ptr);
+    }
+
+    bool IGNITE_CALL IgniteDataStreamerAllowOverwriteGet(gcj::JniContext* ctx, void* obj) {
+        return ctx->DataStreamerAllowOverwriteGet(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteDataStreamerAllowOverwriteSet(gcj::JniContext* ctx, void* obj, bool val) {
+        ctx->DataStreamerAllowOverwriteSet(static_cast<jobject>(obj), val);
+    }
+
+    bool IGNITE_CALL IgniteDataStreamerSkipStoreGet(gcj::JniContext* ctx, void* obj) {
+        return ctx->DataStreamerSkipStoreGet(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteDataStreamerSkipStoreSet(gcj::JniContext* ctx, void* obj, bool val) {
+        ctx->DataStreamerSkipStoreSet(static_cast<jobject>(obj), val);
+    }
+
+    int IGNITE_CALL IgniteDataStreamerPerNodeBufferSizeGet(gcj::JniContext* ctx, void* obj) {
+        return ctx->DataStreamerPerNodeBufferSizeGet(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteDataStreamerPerNodeBufferSizeSet(gcj::JniContext* ctx, void* obj, int val) {
+        ctx->DataStreamerPerNodeBufferSizeSet(static_cast<jobject>(obj), val);
+    }
+
+    int IGNITE_CALL IgniteDataStreamerPerNodeParallelOperationsGet(gcj::JniContext* ctx, void* obj) {
+        return ctx->DataStreamerPerNodeParallelOperationsGet(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteDataStreamerPerNodeParallelOperationsSet(gcj::JniContext* ctx, void* obj, int val) {
+        ctx->DataStreamerPerNodeParallelOperationsSet(static_cast<jobject>(obj), val);
+    }
+
+    void* IGNITE_CALL IgniteMessagingWithAsync(gcj::JniContext* ctx, void* obj) {
+        return ctx->MessagingWithAsync(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionForOthers(gcj::JniContext* ctx, void* obj, void* prj) {
+        return ctx->ProjectionForOthers(static_cast<jobject>(obj), static_cast<jobject>(prj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionForRemotes(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProjectionForRemotes(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionForDaemons(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProjectionForDaemons(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionForRandom(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProjectionForRandom(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionForOldest(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProjectionForOldest(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionForYoungest(gcj::JniContext* ctx, void* obj) {
+        return ctx->ProjectionForYoungest(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteProjectionResetMetrics(gcj::JniContext* ctx, void* obj) {
+        ctx->ProjectionResetMetrics(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteProjectionOutOpRet(gcj::JniContext* ctx, void* obj, int type, long long memPtr) {
+        return ctx->ProjectionOutOpRet(static_cast<jobject>(obj), type, memPtr);
+    }
+
+    void IGNITE_CALL IgniteQueryCursorIterator(gcj::JniContext* ctx, void* obj) {
+        ctx->QueryCursorIterator(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteQueryCursorClose(gcj::JniContext* ctx, void* obj) {
+        ctx->QueryCursorClose(static_cast<jobject>(obj));
+    }
+
+    long long IGNITE_CALL IgniteTransactionsStart(gcj::JniContext* ctx, void* obj, int concurrency, int isolation, long long timeout, int txSize) {
+        return ctx->TransactionsStart(static_cast<jobject>(obj), concurrency, isolation, timeout, txSize);
+    }   
+
+    int IGNITE_CALL IgniteTransactionsCommit(gcj::JniContext* ctx, void* obj, long long id) {
+        return ctx->TransactionsCommit(static_cast<jobject>(obj), id);
+    }
+
+    void IGNITE_CALL IgniteTransactionsCommitAsync(gcj::JniContext* ctx, void* obj, long long id, long long futId) {
+        return ctx->TransactionsCommitAsync(static_cast<jobject>(obj), id, futId);
+    }
+
+    int IGNITE_CALL IgniteTransactionsRollback(gcj::JniContext* ctx, void* obj, long long id) {
+        return ctx->TransactionsRollback(static_cast<jobject>(obj), id);
+    }
+
+    void IGNITE_CALL IgniteTransactionsRollbackAsync(gcj::JniContext* ctx, void* obj, long long id, long long futId) {
+        return ctx->TransactionsRollbackAsync(static_cast<jobject>(obj), id, futId);
+    }
+
+    int IGNITE_CALL IgniteTransactionsClose(gcj::JniContext* ctx, void* obj, long long id) {
+        return ctx->TransactionsClose(static_cast<jobject>(obj), id);
+    }
+
+    int IGNITE_CALL IgniteTransactionsState(gcj::JniContext* ctx, void* obj, long long id) {
+        return ctx->TransactionsState(static_cast<jobject>(obj), id);
+    }
+
+    bool IGNITE_CALL IgniteTransactionsSetRollbackOnly(gcj::JniContext* ctx, void* obj, long long id) {
+        return ctx->TransactionsSetRollbackOnly(static_cast<jobject>(obj), id);
+    }
+
+    void IGNITE_CALL IgniteTransactionsResetMetrics(gcj::JniContext* ctx, void* obj) {
+        ctx->TransactionsResetMetrics(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteAcquire(gcj::JniContext* ctx, void* obj) {
+        return ctx->Acquire(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteRelease(void* obj) {
+        gcj::JniContext::Release(static_cast<jobject>(obj));
+    }
+
+    void IGNITE_CALL IgniteThrowToJava(gcj::JniContext* ctx, char* err) {
+        ctx->ThrowToJava(err);
+    }
+    
+    int IGNITE_CALL IgniteHandlersSize() {
+        return sizeof(gcj::JniHandlers);
+    }
+
+    void* IGNITE_CALL IgniteCreateContext(char** opts, int optsLen, gcj::JniHandlers* cbs) {
+        return gcj::JniContext::Create(opts, optsLen, *cbs);
+    }
+
+    void IGNITE_CALL IgniteDeleteContext(gcj::JniContext* ctx) {
+        delete ctx;
+    }
+
+    void IGNITE_CALL IgniteDestroyJvm(gcj::JniContext* ctx) {
+        ctx->DestroyJvm();
+    }
+
+    void* IGNITE_CALL IgniteEventsWithAsync(gcj::JniContext* ctx, void* obj) {
+        return ctx->EventsWithAsync(static_cast<jobject>(obj));
+    }
+
+    bool IGNITE_CALL IgniteEventsStopLocalListen(gcj::JniContext* ctx, void* obj, long long hnd) {
+        return ctx->EventsStopLocalListen(static_cast<jobject>(obj), hnd);
+    }
+
+    void IGNITE_CALL IgniteEventsLocalListen(gcj::JniContext* ctx, void* obj, long long hnd, int type) {
+        ctx->EventsLocalListen(static_cast<jobject>(obj), hnd, type);
+    }
+
+    bool IGNITE_CALL IgniteEventsIsEnabled(gcj::JniContext* ctx, void* obj, int type) {
+        return ctx->EventsIsEnabled(static_cast<jobject>(obj), type);
+    }    
+    
+	void* IGNITE_CALL IgniteServicesWithAsync(gcj::JniContext* ctx, void* obj) {
+		return ctx->ServicesWithAsync(static_cast<jobject>(obj));
+    }
+
+    void* IGNITE_CALL IgniteServicesWithServerKeepPortable(gcj::JniContext* ctx, void* obj) {
+    		return ctx->ServicesWithServerKeepPortable(static_cast<jobject>(obj));
+        }
+
+	void IGNITE_CALL IgniteServicesCancel(gcj::JniContext* ctx, void* obj, char* name) {
+		ctx->ServicesCancel(static_cast<jobject>(obj), name);
+    }
+
+	void IGNITE_CALL IgniteServicesCancelAll(gcj::JniContext* ctx, void* obj) {
+		ctx->ServicesCancelAll(static_cast<jobject>(obj));
+    }
+
+	void* IGNITE_CALL IgniteServicesGetServiceProxy(gcj::JniContext* ctx, void* obj, char* name, bool sticky) {
+		return ctx->ServicesGetServiceProxy(static_cast<jobject>(obj), name, sticky);
+    }
+}
\ No newline at end of file


[66/82] [abbrv] ignite git commit: Fixed compilation issue in Ignite.

Posted by sb...@apache.org.
Fixed compilation issue in Ignite.


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

Branch: refs/heads/ignite-1093-2
Commit: 16db3306ca1579e51eb42cb5efde7e9a9a6cf733
Parents: dfc1e40
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 10:30:05 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 10:30:05 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/16db3306/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index f246107..bd24e51 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -29,7 +29,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheVariableTopologySelf
 import org.apache.ignite.internal.processors.cache.IgniteAtomicCacheEntryProcessorNodeJoinTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorNodeJoinTest;
 import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdateTest;
-import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop
+import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop;
 import org.apache.ignite.internal.processors.cache.distributed.CacheLoadingConcurrentGridStartSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionNotLoadedEventSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedAffinityFilterSelfTest;


[77/82] [abbrv] ignite git commit: Improving platform interfaces.

Posted by sb...@apache.org.
Improving platform interfaces.


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

Branch: refs/heads/ignite-1093-2
Commit: 32579d450377f177fc6078c4d9686de88dd21220
Parents: 0e25f55
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 12:49:16 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 12:49:16 2015 +0300

----------------------------------------------------------------------
 .../internal/GridEventConsumeHandler.java       |  15 +-
 .../managers/communication/GridIoManager.java   |  50 +++---
 .../GridLifecycleAwareMessageFilter.java        |  38 -----
 .../eventstorage/GridEventStorageManager.java   |  16 +-
 .../platform/PlatformAwareEventFilter.java      |  39 -----
 .../processors/platform/PlatformContext.java    |  15 +-
 .../platform/PlatformEventFilterListener.java   |  39 +++++
 .../platform/PlatformLocalEventListener.java    |  28 ----
 .../platform/message/PlatformMessageFilter.java |  40 +++++
 .../platform/events/PlatformEventFilter.java    | 164 -------------------
 .../events/PlatformEventFilterListenerImpl.java | 163 ++++++++++++++++++
 .../platform/events/PlatformEvents.java         |  15 +-
 .../messaging/PlatformMessageFilter.java        | 110 -------------
 .../messaging/PlatformMessageFilterImpl.java    | 110 +++++++++++++
 .../messaging/PlatformMessageLocalFilter.java   |   9 +-
 .../platform/messaging/PlatformMessaging.java   |   7 +-
 16 files changed, 416 insertions(+), 442 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 93e01e5..599d301 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -38,8 +38,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
 import org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager;
 import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
-import org.apache.ignite.internal.processors.platform.PlatformAwareEventFilter;
-import org.apache.ignite.internal.processors.platform.PlatformLocalEventListener;
+import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.P2;
 import org.apache.ignite.internal.util.typedef.T3;
@@ -139,8 +138,8 @@ class GridEventConsumeHandler implements GridContinuousHandler {
         if (filter != null)
             ctx.resource().injectGeneric(filter);
 
-        if (filter instanceof PlatformAwareEventFilter)
-            ((PlatformAwareEventFilter)filter).initialize(ctx);
+        if (filter instanceof PlatformEventFilterListener)
+            ((PlatformEventFilterListener)filter).initialize(ctx);
 
         final boolean loc = nodeId.equals(ctx.localNodeId());
 
@@ -260,16 +259,16 @@ class GridEventConsumeHandler implements GridContinuousHandler {
         RuntimeException err = null;
 
         try {
-            if (filter instanceof PlatformAwareEventFilter)
-                ((PlatformAwareEventFilter)filter).close();
+            if (filter instanceof PlatformEventFilterListener)
+                ((PlatformEventFilterListener)filter).onClose();
         }
         catch(RuntimeException ex) {
             err = ex;
         }
 
         try {
-            if (cb instanceof PlatformLocalEventListener)
-                ((PlatformLocalEventListener)cb).close();
+            if (cb instanceof PlatformEventFilterListener)
+                ((PlatformEventFilterListener)cb).onClose();
         }
         catch (RuntimeException ex) {
             if (err == null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
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 aa73296..b8af8da 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
@@ -17,26 +17,6 @@
 
 package org.apache.ignite.internal.managers.communication;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Queue;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.cluster.ClusterNode;
@@ -54,6 +34,7 @@ import org.apache.ignite.internal.managers.GridManagerAdapter;
 import org.apache.ignite.internal.managers.deployment.GridDeployment;
 import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
 import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter;
 import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
 import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
 import org.apache.ignite.internal.util.GridSpinReadWriteLock;
@@ -83,6 +64,27 @@ import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 import org.jsr166.ConcurrentLinkedDeque8;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
 import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
 import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
 import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
@@ -1457,8 +1459,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
     public void addUserMessageListener(@Nullable final Object topic, @Nullable final IgniteBiPredicate<UUID, ?> p) {
         if (p != null) {
             try {
-                if (p instanceof GridLifecycleAwareMessageFilter)
-                    ((GridLifecycleAwareMessageFilter)p).initialize(ctx);
+                if (p instanceof PlatformMessageFilter)
+                    ((PlatformMessageFilter)p).initialize(ctx);
                 else
                     ctx.resource().injectGeneric(p);
 
@@ -1795,8 +1797,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         if (lsnr instanceof GridUserMessageListener) {
             GridUserMessageListener userLsnr = (GridUserMessageListener)lsnr;
 
-            if (userLsnr.predLsnr instanceof GridLifecycleAwareMessageFilter)
-                ((GridLifecycleAwareMessageFilter)userLsnr.predLsnr).close();
+            if (userLsnr.predLsnr instanceof PlatformMessageFilter)
+                ((PlatformMessageFilter)userLsnr.predLsnr).onClose();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
deleted file mode 100644
index 2d33a65..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.managers.communication;
-
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.lang.IgniteBiPredicate;
-
-/**
- * Special version of bi-predicate for messaging with initialize/close callbacks.
- */
-public interface GridLifecycleAwareMessageFilter<K, V> extends IgniteBiPredicate<K, V> {
-    /**
-     * Initializes the filter.
-     *
-     * @param ctx Kernal context.
-     */
-    public void initialize(GridKernalContext ctx);
-
-    /**
-     * Closes the filter.
-     */
-    public void close();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 7b8c759..ea01e52 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -47,8 +47,7 @@ import org.apache.ignite.internal.managers.GridManagerAdapter;
 import org.apache.ignite.internal.managers.communication.GridIoManager;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.managers.deployment.GridDeployment;
-import org.apache.ignite.internal.processors.platform.PlatformAwareEventFilter;
-import org.apache.ignite.internal.processors.platform.PlatformLocalEventListener;
+import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener;
 import org.apache.ignite.internal.util.GridConcurrentLinkedHashSet;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.typedef.F;
@@ -681,8 +680,8 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
         {
             IgnitePredicate p = ((UserListenerWrapper)lsnr).listener();
 
-            if (p instanceof PlatformLocalEventListener)
-                ((PlatformLocalEventListener)p).close();
+            if (p instanceof PlatformEventFilterListener)
+                ((PlatformEventFilterListener)p).onClose();
         }
 
         return found;
@@ -784,19 +783,20 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
      * @param p Grid event predicate.
      * @return Collection of grid events.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p) {
         assert p != null;
 
-        if (p instanceof PlatformAwareEventFilter) {
-            PlatformAwareEventFilter p0 = (PlatformAwareEventFilter)p;
+        if (p instanceof PlatformEventFilterListener) {
+            PlatformEventFilterListener p0 = (PlatformEventFilterListener)p;
 
             p0.initialize(ctx);
 
             try {
-                return getSpi().localEvents(p0);
+                return (Collection<T>)getSpi().localEvents(p0);
             }
             finally {
-                p0.close();
+                p0.onClose();
             }
         }
         else

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
deleted file mode 100644
index a423578..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform;
-
-import java.util.UUID;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.lang.IgnitePredicate;
-
-/**
- * Special version of predicate for events with initialize/close callbacks.
- */
-public interface PlatformAwareEventFilter<E extends Event> extends IgnitePredicate<E>, IgniteBiPredicate<UUID, E> {
-    /**
-     * Initializes the filter.
-     */
-    public void initialize(GridKernalContext ctx);
-
-    /**
-     * Closes the filter.
-     */
-    public void close();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index cea8326..1febf07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -18,13 +18,10 @@
 package org.apache.ignite.internal.processors.platform;
 
 import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cluster.ClusterMetrics;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.events.Event;
-import org.apache.ignite.events.EventAdapter;
 import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.managers.communication.GridLifecycleAwareMessageFilter;
 import org.apache.ignite.internal.portable.PortableRawReaderEx;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
@@ -39,10 +36,10 @@ import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManager;
 import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.UUID;
 
 /**
  * Platform context. Acts as an entry point for platform operations.
@@ -178,7 +175,7 @@ public interface PlatformContext {
      * @param ptr Pointer of deployed native filter.
      * @return Filter.
      */
-    public GridLifecycleAwareMessageFilter<UUID, Object> createRemoteMessageFilter(Object filter, long ptr);
+    public PlatformMessageFilter createRemoteMessageFilter(Object filter, long ptr);
 
     /**
      * Check whether the given event type is supported.
@@ -192,9 +189,9 @@ public interface PlatformContext {
      * Write event.
      *
      * @param writer Writer.
-     * @param event Event.
+     * @param evt Event.
      */
-    public void writeEvent(PortableRawWriterEx writer, EventAdapter event);
+    public void writeEvent(PortableRawWriterEx writer, Event evt);
 
     /**
      * Create local event filter.
@@ -202,7 +199,7 @@ public interface PlatformContext {
      * @param hnd Native handle.
      * @return Filter.
      */
-    public <E extends Event> PlatformAwareEventFilter<E> createLocalEventFilter(long hnd);
+    public PlatformEventFilterListener createLocalEventFilter(long hnd);
 
     /**
      * Create remote event filter.
@@ -211,7 +208,7 @@ public interface PlatformContext {
      * @param types Event types.
      * @return Filter.
      */
-    public <E extends Event> PlatformAwareEventFilter<E> createRemoteEventFilter(Object pred, final int... types);
+    public PlatformEventFilterListener createRemoteEventFilter(Object pred, final int... types);
 
     /**
      * Create native exception.

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformEventFilterListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformEventFilterListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformEventFilterListener.java
new file mode 100644
index 0000000..77f0ac8
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformEventFilterListener.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform;
+
+import java.util.UUID;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/**
+ * Platform event filter and listener.
+ */
+public interface PlatformEventFilterListener extends IgnitePredicate<Event>, IgniteBiPredicate<UUID, Event> {
+    /**
+     * Initializes the filter.
+     */
+    public void initialize(GridKernalContext ctx);
+
+    /**
+     * Callback invoked when filter is closed.
+     */
+    public void onClose();
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
deleted file mode 100644
index f38d8e0..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform;
-
-/**
- * Special version of listener for events with close callbacks.
- */
-public interface PlatformLocalEventListener {
-    /**
-     * Closes the listener.
-     */
-    public void close();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/message/PlatformMessageFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/message/PlatformMessageFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/message/PlatformMessageFilter.java
new file mode 100644
index 0000000..e5cec0a
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/message/PlatformMessageFilter.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.message;
+
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.lang.IgniteBiPredicate;
+
+import java.util.UUID;
+
+/**
+ * Platform message filter.
+ */
+public interface PlatformMessageFilter extends IgniteBiPredicate<UUID, Object> {
+    /**
+     * Initializes the filter.
+     *
+     * @param ctx Kernal context.
+     */
+    public void initialize(GridKernalContext ctx);
+
+    /**
+     * Closes the filter.
+     */
+    public void onClose();
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilter.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilter.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilter.java
deleted file mode 100644
index 32daa1c..0000000
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform.events;
-
-import java.util.UUID;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.events.EventAdapter;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.platform.PlatformAwareEventFilter;
-import org.apache.ignite.internal.processors.platform.PlatformContext;
-import org.apache.ignite.internal.processors.platform.PlatformLocalEventListener;
-import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
-import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
-import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
-
-/**
- * Platform event filter. Delegates apply to native platform.
- */
-public class PlatformEventFilter<E extends Event> implements PlatformAwareEventFilter<E>, PlatformLocalEventListener
-{
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
-    private final Object pred;
-
-    /** Event types. */
-    private final int[] types;
-
-    /** */
-    protected transient long hnd;
-
-    /** */
-    private transient PlatformContext ctx;
-
-    /**
-     * Constructor.
-     *
-     * @param hnd Handle in the native platform.
-     * @param ctx Context.
-     */
-    public PlatformEventFilter(long hnd, PlatformContext ctx) {
-        assert ctx != null;
-        assert hnd != 0;
-
-        this.hnd = hnd;
-        this.ctx = ctx;
-
-        pred = null;
-        types = null;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param pred .Net portable predicate.
-     */
-    public PlatformEventFilter(Object pred, final int... types) {
-        assert pred != null;
-
-        this.pred = pred;
-        this.types = types;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean apply(E evt) {
-        return apply0(null, evt);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean apply(UUID uuid, E evt) {
-        return apply0(uuid, evt);
-    }
-
-    /**
-     * Apply impl.
-     * @param uuid Node if.
-     * @param evt Event.
-     * @return Result.
-     */
-    private boolean apply0(final UUID uuid, final E evt) {
-        if (!ctx.isEventTypeSupported(evt.type()))
-            return false;
-
-        if (types != null) {
-            boolean match = false;
-
-            for (int type : types) {
-                if (type == evt.type()) {
-                    match = true;
-                    break;
-                }
-            }
-
-            if (!match)
-                return false;
-        }
-
-        try (PlatformMemory mem = ctx.memory().allocate()) {
-            PlatformOutputStream out = mem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            ctx.writeEvent(writer, (EventAdapter)evt);
-
-            writer.writeUuid(uuid);
-
-            out.synchronize();
-
-            int res = ctx.gateway().eventFilterApply(hnd, mem.pointer());
-
-            return res != 0;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() {
-        ctx.gateway().eventFilterDestroy(hnd);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void initialize(GridKernalContext gridCtx) {
-        ctx = PlatformUtils.platformContext(gridCtx.grid());
-
-        try (PlatformMemory mem = ctx.memory().allocate()) {
-            PlatformOutputStream out = mem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            writer.writeObjectDetached(pred);
-
-            out.synchronize();
-
-            hnd = ctx.gateway().eventFilterCreate(mem.pointer());
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean equals(Object o) {
-        return this == o || o != null && o instanceof PlatformEventFilter &&
-            hnd == ((PlatformEventFilter)o).hnd;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        return (int)(hnd ^ (hnd >>> 32));
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
new file mode 100644
index 0000000..b2dfd1c
--- /dev/null
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.events;
+
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.processors.platform.PlatformContext;
+import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
+
+import java.util.UUID;
+
+/**
+ * Platform event filter. Delegates apply to native platform.
+ */
+public class PlatformEventFilterListenerImpl implements PlatformEventFilterListener
+{
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** */
+    private final Object pred;
+
+    /** Event types. */
+    private final int[] types;
+
+    /** */
+    protected transient long hnd;
+
+    /** */
+    private transient PlatformContext ctx;
+
+    /**
+     * Constructor.
+     *
+     * @param hnd Handle in the native platform.
+     * @param ctx Context.
+     */
+    public PlatformEventFilterListenerImpl(long hnd, PlatformContext ctx) {
+        assert ctx != null;
+        assert hnd != 0;
+
+        this.hnd = hnd;
+        this.ctx = ctx;
+
+        pred = null;
+        types = null;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param pred .Net portable predicate.
+     */
+    public PlatformEventFilterListenerImpl(Object pred, final int... types) {
+        assert pred != null;
+
+        this.pred = pred;
+        this.types = types;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean apply(Event evt) {
+        return apply0(null, evt);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean apply(UUID uuid, Event evt) {
+        return apply0(uuid, evt);
+    }
+
+    /**
+     * Apply impl.
+     * @param uuid Node if.
+     * @param evt Event.
+     * @return Result.
+     */
+    private boolean apply0(final UUID uuid, final Event evt) {
+        if (!ctx.isEventTypeSupported(evt.type()))
+            return false;
+
+        if (types != null) {
+            boolean match = false;
+
+            for (int type : types) {
+                if (type == evt.type()) {
+                    match = true;
+                    break;
+                }
+            }
+
+            if (!match)
+                return false;
+        }
+
+        try (PlatformMemory mem = ctx.memory().allocate()) {
+            PlatformOutputStream out = mem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            ctx.writeEvent(writer, evt);
+
+            writer.writeUuid(uuid);
+
+            out.synchronize();
+
+            int res = ctx.gateway().eventFilterApply(hnd, mem.pointer());
+
+            return res != 0;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void onClose() {
+        ctx.gateway().eventFilterDestroy(hnd);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void initialize(GridKernalContext gridCtx) {
+        ctx = PlatformUtils.platformContext(gridCtx.grid());
+
+        try (PlatformMemory mem = ctx.memory().allocate()) {
+            PlatformOutputStream out = mem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            writer.writeObjectDetached(pred);
+
+            out.synchronize();
+
+            hnd = ctx.gateway().eventFilterCreate(mem.pointer());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        return this == o || o != null && o instanceof PlatformEventFilterListenerImpl &&
+            hnd == ((PlatformEventFilterListenerImpl)o).hnd;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        return (int)(hnd ^ (hnd >>> 32));
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
index fde6be5..997c019 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
@@ -22,11 +22,12 @@ import java.util.Collection;
 import java.util.UUID;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteEvents;
+import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventAdapter;
 import org.apache.ignite.internal.portable.PortableRawReaderEx;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
 import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
-import org.apache.ignite.internal.processors.platform.PlatformAwareEventFilter;
+import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener;
 import org.apache.ignite.internal.processors.platform.PlatformContext;
 import org.apache.ignite.internal.processors.platform.utils.PlatformFutureUtils;
 import org.apache.ignite.internal.util.typedef.F;
@@ -205,14 +206,14 @@ public class PlatformEvents extends PlatformAbstractTarget {
 
                 boolean hasLocFilter = reader.readBoolean();
 
-                PlatformAwareEventFilter locFilter = hasLocFilter ? localFilter(reader.readLong()) : null;
+                PlatformEventFilterListener locFilter = hasLocFilter ? localFilter(reader.readLong()) : null;
 
                 boolean hasRmtFilter = reader.readBoolean();
 
                 UUID listenId;
 
                 if (hasRmtFilter) {
-                    PlatformAwareEventFilter rmtFilter = platformCtx.createRemoteEventFilter(
+                    PlatformEventFilterListener rmtFilter = platformCtx.createRemoteEventFilter(
                         reader.readObjectDetached(), readEventTypes(reader));
 
                     listenId = events.remoteListen(bufSize, interval, autoUnsubscribe, locFilter, rmtFilter);
@@ -233,16 +234,16 @@ public class PlatformEvents extends PlatformAbstractTarget {
 
                 int[] types = readEventTypes(reader);
 
-                PlatformAwareEventFilter filter = platformCtx.createRemoteEventFilter(pred, types);
+                PlatformEventFilterListener filter = platformCtx.createRemoteEventFilter(pred, types);
 
-                Collection<EventAdapter> result = events.remoteQuery(filter, timeout);
+                Collection<Event> result = events.remoteQuery(filter, timeout);
 
                 if (result == null)
                     writer.writeInt(-1);
                 else {
                     writer.writeInt(result.size());
 
-                    for (EventAdapter e : result)
+                    for (Event e : result)
                         platformCtx.writeEvent(writer, e);
                 }
 
@@ -325,7 +326,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
      * @param hnd Handle.
      * @return Interop filter.
      */
-    private PlatformAwareEventFilter localFilter(long hnd) {
+    private PlatformEventFilterListener localFilter(long hnd) {
         return platformCtx.createLocalEventFilter(hnd);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilter.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilter.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilter.java
deleted file mode 100644
index 4237665..0000000
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.platform.messaging;
-
-import java.util.UUID;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.managers.communication.GridLifecycleAwareMessageFilter;
-import org.apache.ignite.internal.portable.PortableRawWriterEx;
-import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
-import org.apache.ignite.internal.processors.platform.PlatformContext;
-import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
-import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
-import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
-
-/**
- * Interop filter. Delegates apply to native platform.
- */
-public class PlatformMessageFilter extends PlatformAbstractPredicate
-    implements GridLifecycleAwareMessageFilter<UUID, Object> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Constructor.
-     */
-    public PlatformMessageFilter()
-    {
-        super();
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param pred .Net portable predicate.
-     * @param ptr Pointer to predicate in the native platform.
-     * @param ctx Kernal context.
-     */
-    protected PlatformMessageFilter(Object pred, long ptr, PlatformContext ctx) {
-        super(pred, ptr, ctx);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean apply(UUID uuid, Object m) {
-        if (ptr == 0)
-            return false;  // Destroyed.
-
-        try (PlatformMemory mem = ctx.memory().allocate()) {
-            PlatformOutputStream out = mem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            writer.writeObject(uuid);
-            writer.writeObject(m);
-
-            out.synchronize();
-
-            return ctx.gateway().messagingFilterApply(ptr, mem.pointer()) != 0;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void initialize(GridKernalContext kernalCtx) {
-        if (ptr != 0)
-            return;
-
-        ctx = PlatformUtils.platformContext(kernalCtx.grid());
-
-        try (PlatformMemory mem = ctx.memory().allocate()) {
-            PlatformOutputStream out = mem.output();
-
-            PortableRawWriterEx writer = ctx.writer(out);
-
-            writer.writeObject(pred);
-
-            out.synchronize();
-
-            ptr = ctx.gateway().messagingFilterCreate(mem.pointer());
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() {
-        if (ptr == 0) // Already destroyed or not initialized yet.
-            return;
-
-        try {
-            assert ctx != null;
-
-            ctx.gateway().messagingFilterDestroy(ptr);
-        }
-        finally {
-            ptr = 0;
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
new file mode 100644
index 0000000..1e42914
--- /dev/null
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.platform.messaging;
+
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate;
+import org.apache.ignite.internal.processors.platform.PlatformContext;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter;
+import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
+
+import java.util.UUID;
+
+/**
+ * Platform message filter. Delegates apply to native platform.
+ */
+public class PlatformMessageFilterImpl extends PlatformAbstractPredicate implements PlatformMessageFilter {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Constructor.
+     */
+    public PlatformMessageFilterImpl()
+    {
+        super();
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param pred .Net portable predicate.
+     * @param ptr Pointer to predicate in the native platform.
+     * @param ctx Kernal context.
+     */
+    protected PlatformMessageFilterImpl(Object pred, long ptr, PlatformContext ctx) {
+        super(pred, ptr, ctx);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean apply(UUID uuid, Object m) {
+        if (ptr == 0)
+            return false;  // Destroyed.
+
+        try (PlatformMemory mem = ctx.memory().allocate()) {
+            PlatformOutputStream out = mem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            writer.writeObject(uuid);
+            writer.writeObject(m);
+
+            out.synchronize();
+
+            return ctx.gateway().messagingFilterApply(ptr, mem.pointer()) != 0;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void initialize(GridKernalContext kernalCtx) {
+        if (ptr != 0)
+            return;
+
+        ctx = PlatformUtils.platformContext(kernalCtx.grid());
+
+        try (PlatformMemory mem = ctx.memory().allocate()) {
+            PlatformOutputStream out = mem.output();
+
+            PortableRawWriterEx writer = ctx.writer(out);
+
+            writer.writeObject(pred);
+
+            out.synchronize();
+
+            ptr = ctx.gateway().messagingFilterCreate(mem.pointer());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void onClose() {
+        if (ptr == 0) // Already destroyed or not initialized yet.
+            return;
+
+        try {
+            assert ctx != null;
+
+            ctx.gateway().messagingFilterDestroy(ptr);
+        }
+        finally {
+            ptr = 0;
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
index 8a27508..50643e1 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.internal.processors.platform.messaging;
 
-import java.util.UUID;
 import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.managers.communication.GridLifecycleAwareMessageFilter;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
 import org.apache.ignite.internal.processors.platform.PlatformContext;
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
 import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter;
+
+import java.util.UUID;
 
 /**
  * Interop local filter. Delegates apply to native platform, uses id to identify native target.
  */
-public class PlatformMessageLocalFilter implements GridLifecycleAwareMessageFilter<UUID, Object> {
+public class PlatformMessageLocalFilter implements PlatformMessageFilter {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -71,7 +72,7 @@ public class PlatformMessageLocalFilter implements GridLifecycleAwareMessageFilt
     }
 
     /** {@inheritDoc} */
-    @Override public void close() {
+    @Override public void onClose() {
         platformCtx.gateway().messagingFilterDestroy(hnd);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/32579d45/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
index 968edd5..6dfd570 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
@@ -17,17 +17,18 @@
 
 package org.apache.ignite.internal.processors.platform.messaging;
 
-import java.util.UUID;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.internal.managers.communication.GridLifecycleAwareMessageFilter;
 import org.apache.ignite.internal.portable.PortableRawReaderEx;
 import org.apache.ignite.internal.portable.PortableRawWriterEx;
 import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
 import org.apache.ignite.internal.processors.platform.PlatformContext;
+import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter;
 import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
 import org.apache.ignite.lang.IgniteFuture;
 
+import java.util.UUID;
+
 /**
  * Interop messaging.
  */
@@ -144,7 +145,7 @@ public class PlatformMessaging extends PlatformAbstractTarget {
 
                 Object topic = reader.readObjectDetached();
 
-                GridLifecycleAwareMessageFilter filter = platformCtx.createRemoteMessageFilter(nativeFilter, ptr);
+                PlatformMessageFilter filter = platformCtx.createRemoteMessageFilter(nativeFilter, ptr);
 
                 UUID listenId = messaging.remoteListen(topic, filter);
 


[20/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index 983292c..aee8a1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -17,25 +17,46 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.top;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.port.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheAttributes;
+import org.apache.ignite.internal.processors.port.GridPortRecord;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestProtocol;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeMetricsBean;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestTopologyRequest;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.IgnitePortProtocol;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CACHE;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_ADDRS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_HOST_NAMES;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_PORT;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_SUBJECT;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_CONFIG;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.NODE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.TOPOLOGY;
 
 /**
  * Command handler for API requests.
@@ -324,4 +345,4 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter {
     @Override public String toString() {
         return S.toString(GridTopologyCommandHandler.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
index bf09d30..0e1e164 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
@@ -17,17 +17,19 @@
 
 package org.apache.ignite.internal.processors.rest.handlers.version;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import java.util.Collection;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
-import java.util.*;
-
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.NAME;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.VERSION;
 
 /**
  * Handler for {@link GridRestCommand#VERSION} and {@link GridRestCommand#NAME} command.
@@ -64,4 +66,4 @@ public class GridVersionCommandHandler extends GridRestCommandHandlerAdapter {
 
         return new GridFinishedFuture<>();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java
index bb68633..3eb594f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java
@@ -17,21 +17,25 @@
 
 package org.apache.ignite.internal.processors.rest.protocols;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.StringTokenizer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.rest.GridRestProtocol;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.BASE64Encoder;
 
 /**
  * Abstract protocol adapter.
@@ -193,4 +197,4 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol {
     @Override public void onKernalStart() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
index e47e825..2ffa2df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
@@ -32,4 +32,4 @@ public enum GridClientPacketType {
 
     /** Ignite message. */
     IGNITE
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
index 12c5d2e..a6f8984 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Memcached protocol request.
@@ -485,4 +485,4 @@ public class GridMemcachedMessage implements GridClientMessage {
     @Override public String toString() {
         return S.toString(GridMemcachedMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 3259f53..b403654 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -17,25 +17,50 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.cache.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
-import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*;
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheRestMetrics;
+import org.apache.ignite.internal.processors.rest.request.DataStructuresRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_DECREMENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_INCREMENT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_ADD;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_APPEND;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_METRICS;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PREPEND;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.NOOP;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.QUIT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.VERSION;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.FAILURE;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.KEY_NOT_FOUND;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_REQ_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.SUCCESS;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.LAST_FUT;
 
 /**
  * Handles memcache requests.
@@ -437,4 +462,4 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
 
         return new GridTuple3<>(cmd, quiet, retKey);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
index 9a24b40..bf177cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
@@ -17,24 +17,69 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.handlers.cache.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
-import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*;
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientAuthenticationRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest;
+import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheRestMetrics;
+import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestTaskRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestTopologyRequest;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_APPEND;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CAS;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_METRICS;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PREPEND;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE_ALL;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.NODE;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.NOOP;
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.TOPOLOGY;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.GET;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.GET_ALL;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.METRICS;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PREPEND;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PUT;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PUT_ALL;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.REPLACE;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV;
+import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV_ALL;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER;
 
 /**
  * Listener for nio server that handles incoming tcp rest packets.
@@ -315,4 +360,4 @@ public class GridTcpRestNioListener extends GridNioServerListenerAdapter<GridCli
     @Override public void onSessionIdleTimeout(GridNioSession ses) {
         ses.close();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
index c7f8c70..5beff75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -17,23 +17,49 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.charset.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*;
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.Date;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest;
+import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.GridClientByteUtils;
+import org.apache.ignite.internal.util.nio.GridNioParser;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.BOOLEAN_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.BYTE_ARR_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.BYTE_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.DATE_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.DOUBLE_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.FLAGS_LENGTH;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.FLOAT_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.HDR_LEN;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_HANDSHAKE_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_HANDSHAKE_RES_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.INT_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.LONG_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_REQ_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_RES_FLAG;
+import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.SERIALIZED_FLAG;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER;
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.PARSER_STATE;
 
 /**
  * Parser for extended memcache protocol. Handles parsing and encoding activity.
@@ -938,4 +964,4 @@ public class GridTcpRestParser implements GridNioParser {
             return destId;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 689e050..8e08481 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -17,32 +17,41 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.marshaller.*;
-import org.apache.ignite.internal.client.marshaller.jdk.*;
-import org.apache.ignite.internal.client.marshaller.optimized.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.processors.rest.protocols.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.nio.ssl.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
+import org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller;
+import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
+import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
+import org.apache.ignite.internal.processors.rest.protocols.GridRestProtocolAdapter;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioParser;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioServerListener;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.spi.IgnitePortProtocol;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER;
 
 /**
  * TCP binary protocol implementation.
@@ -281,4 +290,4 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
     @Override protected String getPortPropertyName() {
         return IgniteNodeAttributes.ATTR_REST_TCP_PORT;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java
index 13f03cd..5ba2bbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java
@@ -71,4 +71,4 @@ public class DataStructuresRequest extends GridRestRequest {
     public void initial(Long init) {
         this.init = init;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java
index 0174201..b932036 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.request;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  *
@@ -148,4 +147,4 @@ public class GridRestCacheRequest extends GridRestRequest {
     @Override public String toString() {
         return S.toString(GridRestCacheRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
index 4537fbd..38a9a81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.rest.request;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Grid command request of log file.
@@ -78,4 +78,4 @@ public class GridRestLogRequest extends GridRestRequest {
     @Override public String toString() {
         return S.toString(GridRestLogRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java
index 2a80bbc..57cb91b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.rest.request;
 
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Grid command request.
@@ -147,4 +146,4 @@ public class GridRestRequest {
     @Override public String toString() {
         return S.toString(GridRestRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java
index 5b9bfa3..73e59a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.request;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Grid task command request.
@@ -114,4 +113,4 @@ public class GridRestTaskRequest extends GridRestRequest {
     @Override public String toString() {
         return S.toString(GridRestTaskRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java
index 522bb2c..b028367 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.request;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Grid command topology request.
@@ -97,4 +96,4 @@ public class GridRestTopologyRequest extends GridRestRequest {
     @Override public String toString() {
         return S.toString(GridRestTopologyRequest.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java
index 5ba3a50..b6ab339 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java
@@ -122,4 +122,4 @@ public class RestSqlQueryRequest extends GridRestRequest {
     public String typeName() {
         return typeName;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java
index 4712b89..0686348 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.processors.schedule;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Scheduled task statistics.
@@ -179,4 +180,4 @@ class GridScheduleStatistics {
     @Override public String toString() {
         return S.toString(GridScheduleStatistics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
index 4d90be8..f622fbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.schedule;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.scheduler.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.scheduler.SchedulerFuture;
 
 /**
  * No-op implementation of {@link IgniteScheduleProcessorAdapter}, throws exception on usage attempt.
@@ -51,4 +50,4 @@ public class IgniteNoopScheduleProcessor extends IgniteScheduleProcessorAdapter
         return new IgniteException("Current Ignite configuration does not support schedule functionality " +
             "(consider adding ignite-schedule module to classpath).");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java
index e512d1d..1c28055 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.schedule;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.scheduler.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.scheduler.SchedulerFuture;
 
 /**
  * Schedules cron-based execution of grid tasks and closures. Abstract class was introduced to
@@ -50,4 +49,4 @@ public abstract class IgniteScheduleProcessorAdapter extends GridProcessorAdapte
      * @return Descriptor of the scheduled execution.
      */
     public abstract <R> SchedulerFuture<R> schedule(Callable<R> c, String pattern);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
index 1a32f56..ef53566 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.internal.processors.security;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.plugin.security.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.GridProcessor;
+import org.apache.ignite.plugin.security.AuthenticationContext;
+import org.apache.ignite.plugin.security.SecurityCredentials;
 import org.apache.ignite.plugin.security.SecurityException;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface defines a grid authentication processor.
@@ -95,4 +98,4 @@ public interface GridSecurityProcessor extends GridProcessor {
      * @return GridSecurityProcessor is enable.
      */
     public boolean enabled();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
index 3151f68..ef46713 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.processors.security;
 
-import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.plugin.security.SecuritySubject;
 
 /**
  * Security context.
@@ -53,4 +54,4 @@ public interface SecurityContext {
      * @return {@code True} if system operation is allowed.
      */
     public boolean systemOperationAllowed(SecurityPermission perm);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java
index 4b81041..42f9661 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.internal.processors.security.os;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.security.*;
-import org.apache.ignite.plugin.security.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
+import org.apache.ignite.internal.processors.security.SecurityContext;
+import org.apache.ignite.plugin.security.AuthenticationContext;
+import org.apache.ignite.plugin.security.SecurityCredentials;
 import org.apache.ignite.plugin.security.SecurityException;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation for {@link GridSecurityProcessor}.
@@ -80,4 +85,4 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri
     @Override public boolean enabled() {
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java
index fd3ea5c..3a4d651 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.segmentation;
 
-import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.processors.GridProcessor;
 
 /**
  * Kernal processor responsible for checking network segmentation issues.
@@ -48,4 +48,4 @@ public interface GridSegmentationProcessor extends GridProcessor {
      * @return {@code True} if segment is correct.
      */
     public boolean isValidSegment();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java
index 3d78d58..9d1b3bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.segmentation.os;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.segmentation.*;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
 
 /**
  * No-op implementation for {@link GridSegmentationProcessor}.
@@ -36,4 +36,4 @@ public class GridOsSegmentationProcessor extends GridProcessorAdapter implements
     @Override public boolean isValidSegment() {
         return true;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java
index 91a53a7..c629a48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.services.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceConfiguration;
 
 /**
  * Service per-node assignment.
@@ -132,4 +134,4 @@ public class GridServiceAssignments implements Serializable, GridCacheInternal {
     @Override public String toString() {
         return S.toString(GridServiceAssignments.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java
index 41663ef..5b26f9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Service configuration key.
@@ -60,4 +60,4 @@ public class GridServiceAssignmentsKey extends GridCacheUtilityKey<GridServiceAs
     @Override public String toString() {
         return S.toString(GridServiceAssignmentsKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java
index d0f7d2f..f25c38e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.services.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.cache.GridCacheInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.services.ServiceConfiguration;
 
 /**
  * Service deployment.
@@ -92,4 +91,4 @@ public class GridServiceDeployment implements GridCacheInternal, Serializable {
     @Override public String toString() {
         return S.toString(GridServiceDeployment.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
index 4c487ef..c7d28fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.services.*;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.services.ServiceConfiguration;
 
 /**
  * Service deployment future.
@@ -49,4 +49,4 @@ public class GridServiceDeploymentFuture extends GridFutureAdapter<Object> {
     @Override public String toString() {
         return S.toString(GridServiceDeploymentFuture.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java
index 6870bbe..80415bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Service configuration key.
@@ -60,4 +60,4 @@ public class GridServiceDeploymentKey extends GridCacheUtilityKey<GridServiceDep
     @Override public String toString() {
         return S.toString(GridServiceDeploymentKey.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java
index 2ab611c..c3b70ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Arrays;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown if service is not found.
@@ -40,4 +39,4 @@ public class GridServiceMethodNotFoundException extends IgniteException {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java
index 3772f60..6dc0c32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import java.util.*;
+import java.util.Arrays;
 
 /**
  * Method reflection key.
@@ -74,4 +74,4 @@ class GridServiceMethodReflectKey {
 
         return hash = 31 * mtdName.hashCode() + Arrays.hashCode(argTypes);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java
index 21f012f..e23db7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Exception thrown if service is not found.
@@ -37,4 +37,4 @@ public class GridServiceNotFoundException extends IgniteCheckedException {
     @Override public String toString() {
         return getClass() + ": " + getMessage();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 0f43b8a..7e8669a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -17,40 +17,75 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.services.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.event.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.configuration.DeploymentMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import javax.cache.Cache;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryListenerException;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
+import org.apache.ignite.internal.processors.cache.CacheIteratorConverter;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.services.ServiceDescriptor;
+import org.apache.ignite.thread.IgniteThreadFactory;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.configuration.DeploymentMode.ISOLATED;
+import static org.apache.ignite.configuration.DeploymentMode.PRIVATE;
+import static org.apache.ignite.events.EventType.EVTS_DISCOVERY;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.UTILITY_CACHE_NAME;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Grid service processor.
@@ -1400,4 +1435,4 @@ public class GridServiceProcessor extends GridProcessorAdapter {
             return S.toString(ServiceAssignmentsPredicate.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
index 556beea..e54ec7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
@@ -17,24 +17,40 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.services.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.GridClosureCallMode.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.services.ServiceDescriptor;
+import org.jsr166.ThreadLocalRandom8;
+
+import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
 
 /**
  * Wrapper for making {@link org.apache.ignite.services.Service} class proxies.
@@ -387,4 +403,4 @@ class GridServiceProxy<T> implements Serializable {
             return S.toString(ServiceProxyCallable.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
index b468231..b17beeb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.services.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.lang.reflect.Method;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceContext;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Service context implementation.
@@ -153,4 +155,4 @@ public class ServiceContextImpl implements ServiceContext {
     @Override public String toString() {
         return S.toString(ServiceContextImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java
index 2e7ce17..7671a2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.service;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.services.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceDescriptor;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Service descriptor.
@@ -98,4 +99,4 @@ public class ServiceDescriptorImpl implements ServiceDescriptor {
     @Override public String toString() {
         return S.toString(ServiceDescriptorImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
index 1278d36..2ac39c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
@@ -17,18 +17,20 @@
 
 package org.apache.ignite.internal.processors.session;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  */
@@ -175,4 +177,4 @@ public class GridTaskSessionProcessor extends GridProcessorAdapter {
         X.println(">>> Task session processor memory stats [grid=" + ctx.gridName() + ']');
         X.println(">>>  sesMapSize: " + sesMap.size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java
index 4e2a974..111198e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.internal.processors.task;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Indicates that annotated task should always be loaded with local deployment,
@@ -32,4 +36,4 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE})
 public @interface GridInternal {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java
index cc6b34d..63e4ac0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.task;
 
-import org.apache.ignite.internal.*;
-
-import java.util.*;
+import java.util.EventListener;
+import java.util.UUID;
+import org.apache.ignite.internal.GridJobSiblingImpl;
 
 /**
  * Listener for task events.
@@ -53,4 +53,4 @@ interface GridTaskEventListener extends EventListener {
      * @param worker Task worker for finished grid task.
      */
     public void onTaskFinished(GridTaskWorker<?, ?> worker);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 7a07505..b8d1d78 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -17,34 +17,75 @@
 
 package org.apache.ignite.internal.processors.task;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.compute.ComputeTaskMapAsync;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.ComputeTaskInternalFuture;
+import org.apache.ignite.internal.GridJobExecuteResponse;
+import org.apache.ignite.internal.GridJobSiblingImpl;
+import org.apache.ignite.internal.GridJobSiblingsRequest;
+import org.apache.ignite.internal.GridJobSiblingsResponse;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskCancelRequest;
+import org.apache.ignite.internal.GridTaskNameHashKey;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.GridTaskSessionRequest;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.CachePeekModes;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.util.GridConcurrentFactory;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_TASK_SESSION_ATTR_SET;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_SIBLINGS;
+import static org.apache.ignite.internal.GridTopic.TOPIC_TASK;
+import static org.apache.ignite.internal.GridTopic.TOPIC_TASK_CANCEL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBJ_ID;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TASK_NAME;
+import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TIMEOUT;
 
 /**
  * This class defines task processor.
@@ -1325,4 +1366,4 @@ public class GridTaskProcessor extends GridProcessorAdapter {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java
index df706cf..3bb1924 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java
@@ -35,4 +35,4 @@ public enum GridTaskThreadContextKey {
 
     /** Security subject ID. */
     TC_SUBJ_ID
-}
+}
\ No newline at end of file


[30/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 0985ae3..854a83d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -17,44 +17,104 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.io.Externalizable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
+import org.apache.ignite.internal.processors.cache.CacheInvokeResult;
+import org.apache.ignite.internal.processors.cache.CacheLazyEntry;
+import org.apache.ignite.internal.processors.cache.CacheMetricsImpl;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.CacheStorePartialUpdateException;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheUpdateAtomicResult;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrExpirationInfo;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.CO;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_BACKUP;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_PRIMARY;
 
 /**
  * Non-transactional partitioned cache.
@@ -2906,4 +2966,4 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
             pendingResponses.remove(nodeId, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
index 9ded1f1..78870c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
@@ -17,10 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * DHT atomic cache entry.
@@ -55,4 +59,4 @@ public class GridDhtAtomicCacheEntry extends GridDhtCacheEntry {
     @Override public synchronized String toString() {
         return S.toString(GridDhtAtomicCacheEntry.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
index db14b3d..f3ecdb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Deferred dht atomic update response.
@@ -131,4 +133,4 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheMessage implem
     @Override public byte fieldsCount() {
         return 4;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicOffHeapCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicOffHeapCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicOffHeapCacheEntry.java
index 91a8e65..bd3dc10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicOffHeapCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicOffHeapCacheEntry.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 
 /**
  * DHT atomic cache entry for off-heap tiered or off-heap values modes.
@@ -60,4 +63,4 @@ public class GridDhtAtomicOffHeapCacheEntry extends GridDhtAtomicCacheEntry {
     @Override protected void offHeapPointer(long valPtr) {
         this.valPtr = valPtr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 04128b4..d9f6840 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -17,29 +17,40 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.processor.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheAtomicFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * DHT atomic cache backup update future.
@@ -407,4 +418,4 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void>
     @Override public String toString() {
         return S.toString(GridDhtAtomicUpdateFuture.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 514ab5b..f5231ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -17,22 +17,34 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Lite dht cache backup update request.
@@ -901,4 +913,4 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid
     @Override public String toString() {
         return S.toString(GridDhtAtomicUpdateRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 8a2befb..33651bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * DHT atomic cache backup update response.
@@ -279,4 +287,4 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
     @Override public String toString() {
         return S.toString(GridDhtAtomicUpdateResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
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 3f22808..65b1d38 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
@@ -17,32 +17,55 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager;
+import org.apache.ignite.internal.processors.cache.GridCacheAtomicFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccManager;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheTryPutFailedException;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
 
 /**
  * DHT atomic cache near update future.
@@ -1165,4 +1188,4 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
     public String toString() {
         return S.toString(GridNearAtomicUpdateFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 670995b..5f5fbb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -17,26 +17,42 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteExternalizableExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
 
 /**
  * Lite DHT cache update request sent from near node to primary node.
@@ -939,4 +955,4 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri
         return S.toString(GridNearAtomicUpdateRequest.class, this, "filter", Arrays.toString(filter),
             "parent", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 3bf99c0..8bc145c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -17,20 +17,31 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * DHT atomic cache near update response.
@@ -619,4 +630,4 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
     @Override public String toString() {
         return S.toString(GridNearAtomicUpdateResponse.class, this, "parent");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index eb7c78f..c8425e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -17,26 +17,62 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException;
+import org.apache.ignite.internal.processors.cache.GridCacheLockTimeoutException;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheReturn;
+import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtEmbeddedFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFinishedFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearUnlockRequest;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Colocated cache.
@@ -856,4 +892,4 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
     @Override public String toString() {
         return S.toString(GridDhtColocatedCache.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
index fab9605..f5cd961 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Cache entry for colocated cache.
@@ -55,4 +58,4 @@ public class GridDhtColocatedCacheEntry extends GridDhtCacheEntry {
     @Override public synchronized String toString() {
         return S.toString(GridDhtColocatedCacheEntry.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 90ca8df..ce547b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -17,31 +17,60 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheFuture;
+import org.apache.ignite.internal.processors.cache.GridCacheLockTimeoutException;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockMapping;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
+import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.C2;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
 
 /**
  * Colocated cache lock future.
@@ -1386,4 +1415,4 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
             return S.toString(MiniFuture.class, this, "node", node.id(), "super", super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedOffHeapCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedOffHeapCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedOffHeapCacheEntry.java
index ed842ad..ce17474 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedOffHeapCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedOffHeapCacheEntry.java
@@ -17,8 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 
 /**
  * Cache entry for colocated cache for off-heap tiered or off-heap values modes.
@@ -60,4 +63,4 @@ public class GridDhtColocatedOffHeapCacheEntry extends GridDhtColocatedCacheEntr
     @Override protected void offHeapPointer(long valPtr) {
         this.valPtr = valPtr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
index 2c84bd4..c08f956 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Detached cache entry.
@@ -94,4 +97,4 @@ public class GridDhtDetachedCacheEntry extends GridDistributedCacheEntry {
         // No-op for detached cache entry.
         return true;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 1d57ef7..36a2da1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -17,29 +17,51 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_LOADED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_PRELOAD;
 
 /**
  * Force keys request future.
@@ -566,4 +588,4 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
             return S.toString(MiniFuture.class, this, super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index 83d139c..3268e26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -17,19 +17,24 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Force keys request. This message is sent by node while preloading to force
@@ -259,4 +264,4 @@ public class GridDhtForceKeysRequest extends GridCacheMessage implements GridCac
     @Override public String toString() {
         return S.toString(GridDhtForceKeysRequest.class, this, "keyCnt", keyCount(), "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index 8bb6b3a..d31f096 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -17,17 +17,27 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Force keys response. Contains absent keys.
@@ -305,4 +315,4 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa
     @Override public String toString() {
         return S.toString(GridDhtForceKeysResponse.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index 4beee06..b588372 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.HashSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Partition demand request.
@@ -326,4 +330,4 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage {
         return S.toString(GridDhtPartitionDemandMessage.class, this, "partCnt", parts.size(), "super",
             super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index a6e6c4d..e993a88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -17,36 +17,67 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_LOADED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_PART_LOADED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_STOPPED;
+import static org.apache.ignite.internal.GridTopic.TOPIC_CACHE;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_PRELOAD;
 
 /**
  * Thread pool for requesting partitions from other nodes
@@ -1158,4 +1189,4 @@ public class GridDhtPartitionDemandPool {
             return S.toString(SupplyMessage.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
index 3320d62..b4d2558 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
@@ -17,17 +17,24 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
 
 /**
@@ -236,4 +243,4 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa
             "nodeId", U.id8(nodeId),
             "evt", U.gridEventName(evt));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
index d64b3e4..ce2ba6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
@@ -17,10 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Full partition map.
@@ -239,4 +245,4 @@ public class GridDhtPartitionFullMap extends HashMap<UUID, GridDhtPartitionMap>
     @Override public String toString() {
         return S.toString(GridDhtPartitionFullMap.class, this, "size", size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
index a06e94c..86372ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
@@ -17,13 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
 
 /**
  * Partition map.
@@ -264,4 +270,4 @@ public class GridDhtPartitionMap implements Comparable<GridDhtPartitionMap>, Ext
     @Override public String toString() {
         return S.toString(GridDhtPartitionMap.class, this, "size", size());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index bda526b..3ccc5ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -17,16 +17,29 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Partition supply message.
@@ -394,4 +407,4 @@ public class GridDhtPartitionSupplyMessage extends GridCacheMessage implements G
             "parts", infos.keySet(),
             "super", super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index 13cfef3..fe328ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -17,28 +17,38 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
+import java.io.Externalizable;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.locks.ReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryInfoCollectSwapListener;
+import org.apache.ignite.internal.processors.cache.GridCacheSwapEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
 
 /**
  * Thread pool for supplying partitions to demanding nodes.
@@ -542,4 +552,4 @@ class GridDhtPartitionSupplyPool {
             return "DemandMessage [senderId=" + senderId() + ", msg=" + message() + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index ff40daa..cc7d439 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Request for single partition info.
@@ -147,4 +147,4 @@ abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage {
     @Override public String toString() {
         return S.toString(GridDhtPartitionsAbstractMessage.class, this, super.toString());
     }
-}
+}
\ No newline at end of file


[33/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index bbac42b..555bbda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -17,31 +17,57 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.util.GridConcurrentFactory.*;
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheMappedVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.GridConcurrentFactory;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.util.GridConcurrentFactory.newMap;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q;
 
 /**
  * Manages lock order within a thread.
@@ -1199,4 +1225,4 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
                 return S.toString(FinishLockFuture.class, this, super.toString());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
index d9ee44c..f4ddf89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Unsafe;
 
 /**
  * GridCacheSwapEntry over offheap pointer.
@@ -191,4 +192,4 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
     @Override public String toString() {
         return S.toString(GridCacheOffheapSwapEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index e00d3b7..2ae9e7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -17,40 +17,77 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridClientPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloaderAssignments;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.GridListSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_AFFINITY_HISTORY_SIZE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_PRELOAD_RESEND_TIMEOUT;
+import static org.apache.ignite.IgniteSystemProperties.getInteger;
+import static org.apache.ignite.IgniteSystemProperties.getLong;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_STARTED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader.*;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader.DFLT_PRELOAD_RESEND_TIMEOUT;
 
 /**
  * Partition exchange manager.
@@ -1396,4 +1433,4 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
             return done;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
index b8bb08e..755958e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloaderAssignments;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache preloader that is responsible for loading cache entries either from remote
@@ -132,4 +132,4 @@ public interface GridCachePreloader {
      * Unwinds undeploys.
      */
     public void unwindUndeploys();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
index 0adf510..5405449 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloaderAssignments;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Adapter for preloading which always assumes that preloading finished.
@@ -145,4 +146,4 @@ public class GridCachePreloaderAdapter implements GridCachePreloader {
     @Override public void addAssignments(GridDhtPreloaderAssignments assignments, boolean forcePreload) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index dd4d30b..bf203b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -17,66 +17,130 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.fair.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.datastructures.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.jta.*;
-import org.apache.ignite.internal.processors.cache.local.*;
-import org.apache.ignite.internal.processors.cache.local.atomic.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.query.continuous.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
-import javax.management.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.configuration.CacheConfiguration.*;
-import static org.apache.ignite.configuration.DeploymentMode.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.configuration.Factory;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheExistsException;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityFunctionContext;
+import org.apache.ignite.cache.affinity.AffinityNodeAddressHashResolver;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridPerformanceSuggestions;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteComponentType;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.IgniteTransactionsEx;
+import org.apache.ignite.internal.managers.discovery.CustomEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCache;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridNoStorageCacheMap;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrManager;
+import org.apache.ignite.internal.processors.cache.jta.CacheJtaManagerAdapter;
+import org.apache.ignite.internal.processors.cache.local.GridLocalCache;
+import org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache;
+import org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager;
+import org.apache.ignite.internal.processors.cache.query.GridCacheLocalQueryManager;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager;
+import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTransactionsImpl;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
+import org.apache.ignite.internal.processors.plugin.CachePluginManager;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.IgniteSystemProperties.getBoolean;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_MODE;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_MEMORY_MODE;
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.ISOLATED;
+import static org.apache.ignite.configuration.DeploymentMode.PRIVATE;
+import static org.apache.ignite.configuration.DeploymentMode.SHARED;
+import static org.apache.ignite.internal.IgniteComponentType.JTA;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CONSISTENCY_CHECK_SKIPPED;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_CONFIG;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 
 /**
  * Cache processor.
@@ -3393,4 +3457,4 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 3bbd4af..4d26bd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -17,27 +17,37 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.affinity.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.mxbean.CacheMetricsMXBean;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache proxy.
@@ -1526,4 +1536,4 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public String toString() {
         return S.toString(GridCacheProxyImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 073dd2e..22b9f8d 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
@@ -17,17 +17,28 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Return value for cases where both, value and success flag need to be returned.
@@ -448,4 +459,4 @@ public class GridCacheReturn implements Externalizable, Message {
     @Override public String toString() {
         return S.toString(GridCacheReturn.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 10d2796..beffdd1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -17,30 +17,40 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.jta.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.jta.CacheJtaManagerAdapter;
+import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
+import org.apache.ignite.internal.processors.cache.transactions.TransactionMetricsAdapter;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Shared context.
@@ -668,4 +678,4 @@ public class GridCacheSharedContext<K, V> {
 
         return mgr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManager.java
index 668bd00..e0e4090 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManager.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Cache manager shared across all caches.
@@ -61,4 +61,4 @@ public interface GridCacheSharedManager<K, V> {
      * NOTE: this method is for testing and profiling purposes only.
      */
     public void printMemoryStats();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java
index 6ad76ca..cdaa68d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Convenience adapter for cache managers.
@@ -173,4 +173,4 @@ public class GridCacheSharedManagerAdapter<K, V> implements GridCacheSharedManag
     @Override public String toString() {
         return S.toString(GridCacheSharedManagerAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntry.java
index 4391918..73519eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntry.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Swap entry.
@@ -79,4 +79,4 @@ public interface GridCacheSwapEntry {
      * @return If entry is offheap based returns offheap address, otherwise 0.
      */
     public long offheapPointer();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
index acf1961..81490a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Unsafe;
 
 /**
  * Swap entry.
@@ -336,4 +338,4 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
     @Override public String toString() {
         return S.toString(GridCacheSwapEntryImpl.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapListener.java
index 811b951f..2e6b3ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Provides ability to listen to swap events in cache which is necessary for preloading.
@@ -30,4 +30,4 @@ public interface GridCacheSwapListener {
      * @throws IgniteCheckedException If failed.
      */
     public void onEntryUnswapped(int part, KeyCacheObject key, GridCacheSwapEntry e) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index ea9b0fd..6a8a11a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -17,30 +17,55 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.offheap.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.offheap.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import java.lang.ref.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.events.EventType.*;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionAware;
+import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridEmptyCloseableIterator;
+import org.apache.ignite.internal.util.GridEmptyIterator;
+import org.apache.ignite.internal.util.GridWeakIterator;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEvictListener;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.spi.swapspace.SwapKey;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_FROM_OFFHEAP;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_SWAPPED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_TO_OFFHEAP;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNSWAPPED;
 
 /**
  * Handles all swap operations.
@@ -2348,4 +2373,4 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
             throw new UnsupportedOperationException();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTryPutFailedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTryPutFailedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTryPutFailedException.java
index 10bc35f..e4217e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTryPutFailedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTryPutFailedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Try put failed exception.
@@ -25,4 +25,4 @@ import org.apache.ignite.*;
 public class GridCacheTryPutFailedException extends IgniteCheckedException {
     /** */
     private static final long serialVersionUID = 0L;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index 9bd6321..bdb1f18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.thread.*;
-
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.GridConcurrentSkipListSet;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.LongAdder8;
 
 /**
  * Eagerly removes expired entries from cache when
@@ -257,4 +257,4 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter {
             return e;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
index c6bcccf..3674284 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.processor.*;
+import javax.cache.processor.EntryProcessor;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache entry atomic update result.
@@ -161,4 +161,4 @@ public class GridCacheUpdateAtomicResult {
     @Override public String toString() {
         return S.toString(GridCacheUpdateAtomicResult.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateTxResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateTxResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateTxResult.java
index 8230024..ffda7a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateTxResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateTxResult.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache entry transactional update result.
@@ -61,4 +61,4 @@ public class GridCacheUpdateTxResult {
     @Override public String toString() {
         return S.toString(GridCacheUpdateTxResult.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtilityKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtilityKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtilityKey.java
index 77fdac7..48b6b45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtilityKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtilityKey.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Key for system utility cache.
@@ -42,4 +42,4 @@ public abstract class GridCacheUtilityKey<K extends GridCacheUtilityKey> impleme
 
     /** {@inheritDoc} */
     public abstract int hashCode();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index bf55f59..980971c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -17,47 +17,95 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.transactions.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.configuration.Factory;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheAtomicUpdateTimeoutException;
+import org.apache.ignite.cache.CachePartialUpdateException;
+import org.apache.ignite.cache.CacheServerNotFoundException;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.util.lang.IgniteInClosureX;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.P2;
 import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteReducer;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.GridTopic.TOPIC_REPLICATION;
+import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
 
 /**
  * Cache utility methods.
@@ -1756,4 +1804,4 @@ public class GridCacheUtils {
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
index bd3f305..2d1686e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import javax.cache.Cache;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridSerializableCollection;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Value collection based on provided entries with all remove operations backed
@@ -157,4 +161,4 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V
 
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
index abe734a..f82c5f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper for {@link ExpiryPolicy} used to track information about cache entries
@@ -75,4 +76,4 @@ public interface IgniteCacheExpiryPolicy {
      * @return Readers for updated entries.
      */
     @Nullable Map<UUID, Collection<IgniteBiTuple<KeyCacheObject, GridCacheVersion>>> readers();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java
index 9233f24..74cccc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java
@@ -17,11 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Implementation of public API future for cache.
@@ -50,4 +55,4 @@ public class IgniteCacheFutureImpl<V> extends IgniteFutureImpl<V> {
 
         return CU.convertToCacheException(e);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 3381403..7c88b98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -17,35 +17,73 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.locks.Lock;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.configuration.CacheEntryListenerConfiguration;
+import javax.cache.configuration.Configuration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CompletionListener;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.cache.CacheManager;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.locks.*;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.query.ContinuousQuery;
+import org.apache.ignite.cache.query.Query;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.QueryMetrics;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cache.query.SpiQuery;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.TextQuery;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.AsyncSupportAdapter;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.query.CacheQuery;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
+import org.apache.ignite.internal.util.GridEmptyIterator;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.mxbean.CacheMetricsMXBean;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache proxy.
@@ -1846,4 +1884,4 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     @Override public String toString() {
         return S.toString(IgniteCacheProxy.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index 42c648b..07650da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -17,27 +17,38 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.mxbean.CacheMetricsMXBean;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface provides a rich API for working with distributed caches. It includes the following
@@ -1791,4 +1802,4 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> {
      * @return Future to be completed whenever loading completes.
      */
     public IgniteInternalFuture<?> localLoadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
index 66021a2..c214ce3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
@@ -30,4 +30,4 @@ public interface KeyCacheObject extends CacheObject {
      * @return {@code True} if internal cache key.
      */
     public boolean internal();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
index e5fa891..6958c87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -109,4 +109,4 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
 
         return val.equals(other.val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
----------------------------------------------------------------------
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 d68c377..672a37d 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
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.cache.query.QueryCursorEx;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
 
 /**
  * Query cursor implementation.
@@ -120,4 +122,4 @@ public class QueryCursorImpl<T> implements QueryCursorEx<T> {
     @Override public List<GridQueryFieldMetadata> fieldsMeta() {
         return fieldsMeta;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
index 0790052..33ab3f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
@@ -17,16 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache.affinity;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity interface implementation.
@@ -209,4 +215,4 @@ public class GridCacheAffinityImpl<K, V> implements Affinity<K> {
     private AffinityTopologyVersion topologyVersion() {
         return cctx.affinity().affinityTopologyVersion();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java
index d7d4eca..07ca3cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java
@@ -17,13 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache.affinity;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheGateway;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Affinity interface implementation.
@@ -259,4 +265,4 @@ public class GridCacheAffinityProxy<K, V> implements Affinity<K>, Externalizable
     private Object readResolve() throws ObjectStreamException {
         return cctx.grid().affinity(cctx.cache().name());
     }
-}
+}
\ No newline at end of file


[17/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
index 8c3f29e..e7b420e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
@@ -17,25 +17,43 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.RandomAccessFile;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.channels.FileLock;
+import java.nio.channels.FileLockInterruptionException;
+import java.nio.channels.OverlappingFileLockException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.ipc.IpcEndpointBindException;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.lang.IgnitePair;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Server shared memory IPC endpoint.
@@ -739,4 +757,4 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
index 249d995..bdf73cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import java.io.Closeable;
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import java.io.*;
-import java.nio.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_IPC_SHMEM_SPACE_DEBUG;
 
 /**
  *
@@ -371,4 +372,4 @@ public class IpcSharedMemorySpace implements Closeable {
     @Override public String toString() {
         return S.toString(IpcSharedMemorySpace.class, this, "closed", closed.get());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtils.java
index 71bcac4..be7f42b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtils.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.util.ipc.shmem;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.lang.management.*;
-import java.nio.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.management.ManagementFactory;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * NOTE: Native library should be loaded, before methods of this class are called.
@@ -239,4 +241,4 @@ public class IpcSharedMemoryUtils {
         else
             throw new IllegalStateException("This OS is not supported.");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
index 7cc6ee5..7ba4271 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.lang.*;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Defines a convenient absolute, i.e. {@code no-arg} and {@code no return value} closure. This closure
@@ -49,4 +49,4 @@ public abstract class GridAbsClosure implements IgniteRunnable {
     @Override public final void run() {
         apply();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosureX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosureX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosureX.java
index 6a794cf..8e14609 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosureX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosureX.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Convenient abs-closure subclass that allows for thrown grid exception. This class
@@ -45,4 +45,4 @@ public abstract class GridAbsClosureX extends GridAbsClosure {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract void applyx() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicate.java
index 04ba747..bec9951 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicate.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.P1;
 
 /**
  * Defines absolute (no-arg) predicate construct. Predicate like closure is a first-class function
@@ -41,4 +41,4 @@ public interface GridAbsPredicate {
      * @return Return value.
      */
     public boolean apply();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicateX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicateX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicateX.java
index 2150a16..8912eb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicateX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsPredicateX.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Convenient predicate subclass that allows for thrown grid exception. This class
@@ -43,4 +43,4 @@ public abstract class GridAbsPredicateX implements GridAbsPredicate {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the predicate.
      */
     public abstract boolean applyx() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridCloseableIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridCloseableIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridCloseableIterator.java
index 622c9b5..0cea229 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridCloseableIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridCloseableIterator.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
 
 /**
  * Defines "rich" closeable iterator interface that is also acts like lambda function and iterable.
@@ -59,4 +59,4 @@ public interface GridCloseableIterator<T> extends GridIterator<T>, IgniteSpiClos
      * @return {@code True} if iterator has been closed.
      */
     public boolean isClosed();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3.java
index 4365034..0af4645 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.C3;
 
 /**
  * Defines generic {@code for-each} type of closure. Closure is a first-class function that is defined with
@@ -49,4 +49,4 @@ public interface GridClosure3<E1, E2, E3, R> {
      * @return Optional return value.
      */
     public R apply(E1 e1, E2 e2, E3 e3);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3X.java
index 0a53e71..ebce5df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosure3X.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.CX3;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Convenient closure subclass that allows for thrown grid exception. This class
@@ -48,4 +49,4 @@ public abstract class GridClosure3X<E1, E2, E3, R> implements GridClosure3<E1, E
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract R applyx(E1 e1, E2 e2, E3 e3) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosureException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosureException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosureException.java
index eb5adb7..a88d782 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosureException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridClosureException.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
 
 /**
  * This exception provides closures with facility to throw exceptions. Closures can't
@@ -47,4 +48,4 @@ public class GridClosureException extends IgniteException {
     public Throwable unwrap() {
         return getCause();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFilteredIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFilteredIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFilteredIterator.java
index f3240d7..8f074d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFilteredIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFilteredIterator.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 /**
  * Filtered iterator.
@@ -84,4 +85,4 @@ public abstract class GridFilteredIterator<T> implements Iterator<T> {
     @Override public void remove() {
         throw new UnsupportedOperationException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 5c43ad9..a9e6cd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -17,21 +17,65 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.RandomAccess;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridEmptyIterator;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.GridSerializableCollection;
+import org.apache.ignite.internal.util.GridSerializableIterator;
+import org.apache.ignite.internal.util.GridSerializableList;
+import org.apache.ignite.internal.util.GridSerializableMap;
+import org.apache.ignite.internal.util.GridSerializableSet;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.R1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+import org.jsr166.ThreadLocalRandom8;
 
 /**
  * Contains factory and utility methods for {@code closures}, {@code predicates}, and {@code tuples}.
@@ -4514,4 +4558,4 @@ public class GridFunc {
     public static IgnitePredicate<IgniteInternalFuture<?>> unfinishedFutures() {
         return UNFINISHED_FUTURE;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridInClosure3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridInClosure3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridInClosure3.java
index 7308036..8420384 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridInClosure3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridInClosure3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.C3;
+import org.apache.ignite.internal.util.typedef.CI3;
 
 /**
  * Defines a convenient {@code side-effect only} closure, i.e. the closure that has {@code void} return type.
@@ -46,4 +47,4 @@ public interface GridInClosure3<E1, E2, E3> {
      * @param e3 Third bound free variable, i.e. the element the closure is called or closed on.
      */
     public void apply(E1 e1, E2 e2, E3 e3);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterable.java
index ca1ebf7..5b7db68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterable.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import java.util.*;
+import java.util.Iterator;
 
 /**
  * Defines "rich" iterable interface that is also acts as lambda function and iterator.
@@ -32,4 +32,4 @@ public interface GridIterable<T> extends GridIterator<T> {
      * @return Instance of new {@link GridIterator}.
      */
     @Override public GridIterator<T> iterator();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterableAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterableAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterableAdapter.java
index 63c1285..b463513 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterableAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterableAdapter.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Convenient adapter for "rich" iterable interface.
@@ -117,4 +117,4 @@ public class GridIterableAdapter<T> implements GridIterable<T> {
             it.remove();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterator.java
index 2fcc323..d0b196b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIterator.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-
-import java.util.*;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridSerializableIterator;
 
 /**
  * Defines "rich" iterator interface that is also acts like lambda function and iterable.
@@ -64,4 +64,4 @@ public interface GridIterator<T> extends Iterable<T>, GridSerializableIterator<T
      * @throws IgniteCheckedException If failed.
      */
     public void removeX() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIteratorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIteratorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIteratorAdapter.java
index 09ff8bd..2fd3cf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIteratorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridIteratorAdapter.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
 
 /**
  * Convenient adapter for "rich" iterator interface.
@@ -63,4 +63,4 @@ public abstract class GridIteratorAdapter<T> implements GridIterator<T> {
     @Override public final Iterator<T> iterator() {
         return this;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMapEntry.java
index ff6e178..eed017f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMapEntry.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Map;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Simple {@link java.util.Map.Entry} implementation.
@@ -89,4 +88,4 @@ public class GridMapEntry<K, V> implements Map.Entry<K, V>, Serializable {
     @Override public String toString() {
         return S.toString(GridMapEntry.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
index a67f83d..decc244 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenient adapter for working with metadata. <h2 class="header">Thread Safety</h2> This class provides necessary
@@ -389,4 +391,4 @@ public class GridMetadataAwareAdapter {
             throw new InternalError();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
index b85acd8..4ce0b35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
@@ -17,14 +17,20 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenient node predicate as a separate class. It allows to avoid "dragging" enclosing
@@ -154,4 +160,4 @@ public class GridNodePredicate implements IgnitePredicate<ClusterNode>, Iterable
     @Override public String toString() {
         return S.toString(GridNodePredicate.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
index dcaa7cc..eaf2fa8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Represents any class that needs to maintain or carry on peer deployment information.
@@ -49,4 +49,4 @@ public interface GridPeerDeployAware extends Serializable {
      * @return Class loader for the class.
      */
     public ClassLoader classLoader();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
index 20d8481..7b3f502 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Adapter for common interfaces in closures, reducers and predicates.
@@ -66,4 +66,4 @@ public class GridPeerDeployAwareAdapter implements GridPeerDeployAware {
 
         return pda.classLoader();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainAbsClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainAbsClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainAbsClosure.java
index 87ac592..37fe6d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainAbsClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainAbsClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Plain closure that does not accept any arguments, returns nothing and do not implement
@@ -30,4 +30,4 @@ public interface GridPlainAbsClosure {
      * @throws IgniteCheckedException If error occurred.
      */
     public void apply() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainCallable.java
index 8f8905b..621e455 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainCallable.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
 
 /**
  * Callable instance that should never be deployed or injected.
  */
 public interface GridPlainCallable<T> extends Callable<T> {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure.java
index ccf1bc9..d36f496 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Closure that takes argument, returns result and do not implement {@code GridPeerDeployAware}.
@@ -29,4 +29,4 @@ public interface GridPlainClosure<T, R> {
      * @throws IgniteCheckedException If error occurred.
      */
     public R apply(T arg) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure2.java
index c21b626..f74e019 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainClosure2.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Closure taking 2 arguments.
@@ -30,4 +30,4 @@ public interface GridPlainClosure2<T1, T2, R> {
      * @throws IgniteCheckedException If error occurred.
      */
     public R apply(T1 arg1, T2 arg2) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainInClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainInClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainInClosure.java
index 85c469e..e47f248 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainInClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainInClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Plain closure that takes one input argument and does not implement {@code GridPeerDeployAware}.
@@ -28,4 +28,4 @@ public interface GridPlainInClosure<T> {
      * @throws IgniteCheckedException If error occurred.
      */
     public void apply(T arg) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainOutClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainOutClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainOutClosure.java
index 4616303..96ea9c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainOutClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainOutClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Closure that takes no arguments, returns result and does not implement {@code GridPeerDeployAware}.
@@ -28,4 +28,4 @@ public interface GridPlainOutClosure<R> {
      * @throws IgniteCheckedException If error occurred.
      */
     public R apply() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainRunnable.java
index 00bc0c7..94794ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPlainRunnable.java
@@ -22,4 +22,4 @@ package org.apache.ignite.internal.util.lang;
  */
 public interface GridPlainRunnable extends Runnable {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3.java
index 5538733..615f467 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.P3;
 
 /**
  * Defines predicate construct. Predicate like closure is a first-class function
@@ -54,4 +54,4 @@ public interface GridPredicate3<E1, E2, E3> {
      * @return Return value.
      */
     public abstract boolean apply(E1 e1, E2 e2, E3 e3);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3X.java
index 2337949..958ae63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPredicate3X.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.PX3;
 
 /**
  * Convenient predicate subclass that allows for thrown grid exception. This class
@@ -48,4 +49,4 @@ public abstract class GridPredicate3X<E1, E2, E3> implements GridPredicate3<E1,
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the predicate.
      */
     public abstract boolean applyx(E1 e1, E2 e2, E3 e3) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTriple.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTriple.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTriple.java
index f12f6b6..a392ed6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTriple.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTriple.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Simple extension over {@link GridTuple3} for three objects of the same type.
@@ -51,4 +50,4 @@ public class GridTriple<T> extends GridTuple3<T, T, T> {
     @Override public Object clone() {
         return super.clone();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
index 8e274b7..2342239 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience class representing mutable tuple of a single value.
@@ -144,4 +147,4 @@ public class GridTuple<V> implements Iterable<V>, Cloneable, Externalizable {
     @Override public String toString() {
         return S.toString(GridTuple.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
index 5ab4fb4..b999e2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience class representing mutable tuple of three values.
@@ -223,4 +226,4 @@ public class GridTuple3<V1, V2, V3> implements Iterable<Object>, Externalizable,
     @Override public String toString() {
         return S.toString(GridTuple3.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
index 310e0fb..835cdcb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience class representing mutable tuple of four values.
@@ -254,4 +257,4 @@ public class GridTuple4<V1, V2, V3, V4> implements Iterable<Object>, Externaliza
     @Override public String toString() {
         return S.toString(GridTuple4.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
index 578f5a8..9790f48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience class representing mutable tuple of five values.
@@ -285,4 +288,4 @@ public class GridTuple5<V1, V2, V3, V4, V5> implements Iterable<Object>, Externa
     @Override public String toString() {
         return S.toString(GridTuple5.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
index 1f8b330..044944b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
@@ -17,13 +17,16 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience class representing mutable tuple of six values.
@@ -319,4 +322,4 @@ public class GridTuple6<V1, V2, V3, V4, V5, V6> implements Iterable<Object>, Ext
     @Override public String toString() {
         return S.toString(GridTuple6.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
index 6945ac3..225366a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
@@ -17,11 +17,17 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Constructs a tuple over a given array.
@@ -185,4 +191,4 @@ public class GridTupleV implements Iterable<Object>, Externalizable, Cloneable {
     @Override public String toString() {
         return S.toString(GridTupleV.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosure2X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosure2X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosure2X.java
index ed01add..9c243f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosure2X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosure2X.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiClosure;
 
 /**
  * Convenient closure subclass that allows for thrown grid exception. This class
@@ -50,4 +51,4 @@ public abstract class IgniteClosure2X<E1, E2, R> implements IgniteBiClosure<E1,
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract R applyx(E1 e1, E2 e2) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosureX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosureX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosureX.java
index a7a276d..a1914cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosureX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteClosureX.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.CX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteClosure;
 
 /**
  * Convenient closure subclass that allows for thrown grid exception. This class
@@ -49,4 +50,4 @@ public abstract class IgniteClosureX<E, R> implements IgniteClosure<E, R> {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract R applyx(E e) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosure2X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosure2X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosure2X.java
index 2fcc930..edaf35f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosure2X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosure2X.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.CIX2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiInClosure;
 
 /**
  * Convenient in-closure subclass that allows for thrown grid exception. This class
@@ -49,4 +50,4 @@ public abstract class IgniteInClosure2X<E1, E2> implements IgniteBiInClosure<E1,
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract void applyx(E1 e1, E2 e2) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosureX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosureX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosureX.java
index 8abb94a..a408a5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosureX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteInClosureX.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Convenient in-closure subclass that allows for thrown grid exception. This class
@@ -48,4 +49,4 @@ public abstract class IgniteInClosureX<T> implements IgniteInClosure<T> {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract void applyx(T t) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteOutClosureX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteOutClosureX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteOutClosureX.java
index 84aea09..0f4eb84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteOutClosureX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteOutClosureX.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteOutClosure;
 
 /**
  * Convenient out-closure subclass that allows for thrown grid exception. This class
@@ -47,4 +47,4 @@ public abstract class IgniteOutClosureX<T> implements IgniteOutClosure<T> {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the closure.
      */
     public abstract T applyx() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePair.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePair.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePair.java
index decc7fc..a6acce4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePair.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePair.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Simple extension over {@link org.apache.ignite.lang.IgniteBiTuple} for pair of objects of the same type.
@@ -51,4 +50,4 @@ public class IgnitePair<T> extends IgniteBiTuple<T, T> {
     @Override public Object clone() {
         return super.clone();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicate2X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicate2X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicate2X.java
index a7ed105..094005b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicate2X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicate2X.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.PX2;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Convenient predicate subclass that allows for thrown grid exception. This class
@@ -50,4 +51,4 @@ public abstract class IgnitePredicate2X<E1, E2> implements IgniteBiPredicate<E1,
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the predicate.
      */
     public abstract boolean applyx(E1 e1, E2 e2) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicateX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicateX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicateX.java
index 4e54fb2..f3cf8d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicateX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgnitePredicateX.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.PX1;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Convenient predicate subclass that allows for thrown grid exception. This class
@@ -49,4 +50,4 @@ public abstract class IgnitePredicateX<E1> implements IgnitePredicate<E1> {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the predicate.
      */
     public abstract boolean applyx(E1 e) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2.java
index 19c189e..308d41e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines generic {@code for-all} or {@code reduce} type of closure. Unlike {@code for-each} type of closure
@@ -50,4 +50,4 @@ public interface IgniteReducer2<E1, E2, R> extends IgniteOutClosure<R> {
      *      collecting and call {@link #apply()} method.
      */
     public abstract boolean collect(@Nullable E1 e1, @Nullable E2 e2);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2X.java
index 14a5fd0..2e2daa1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer2X.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.RX2;
 
 /**
  * Convenient reducer subclass that allows for thrown grid exception. This class
@@ -47,4 +48,4 @@ public abstract class IgniteReducer2X<E1, E2, R> implements IgniteReducer2<E1, E
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the reducer.
      */
     public abstract R applyx() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3.java
index e536128..4b3457d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines generic {@code for-all} or {@code reduce} type of closure. Unlike {@code for-each} type of closure
@@ -52,4 +52,4 @@ public interface IgniteReducer3<E1, E2, E3, R> extends IgniteOutClosure<R> {
      *      collecting and call {@link #apply()} method.
      */
     public boolean collect(@Nullable E1 e1, @Nullable E2 e2, @Nullable E3 e3);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3X.java
index c091e5b..15e0781 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducer3X.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.RX3;
 
 /**
  * Convenient reducer subclass that allows for thrown grid exception. This class
@@ -47,4 +48,4 @@ public abstract class IgniteReducer3X<E1, E2, E3, R> implements IgniteReducer3<E
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the reducer.
      */
     public abstract R applyx() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducerX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducerX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducerX.java
index e2033d3..e1ba85c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducerX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/IgniteReducerX.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.RX1;
+import org.apache.ignite.lang.IgniteReducer;
 
 /**
  * Convenient reducer subclass that allows for thrown grid exception. This class
@@ -48,4 +49,4 @@ public abstract class IgniteReducerX<E1, R> implements IgniteReducer<E1, R> {
      * @throws IgniteCheckedException Thrown in case of any error condition inside of the reducer.
      */
     public abstract R applyx() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
index d75fb2d..9b014ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implements basic lifecycle for communication clients.
@@ -109,4 +109,4 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati
     @Override public String toString() {
         return S.toString(GridAbstractCommunicationClient.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java
index a03d2c8..303991d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * This class implements stream parser based on {@link GridNioServerBuffer}.
@@ -89,4 +89,4 @@ public class GridBufferedParser implements GridNioParser {
     @Override public String toString() {
         return GridBufferedParser.class.getSimpleName();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
index 1a26ad5..a933916 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -106,4 +107,4 @@ public interface GridCommunicationClient {
      * @return {@code True} if send is asynchronous.
      */
     public boolean async();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
index 8bee151..13d7ca7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Verifies that first bytes received in accepted (incoming)
@@ -136,4 +137,4 @@ public class GridConnectionBytesVerifyFilter extends GridNioFilterAdapter {
     @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
         proceedSessionWriteTimeout(ses);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDelimitedParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDelimitedParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDelimitedParser.java
index 256597c..7458e7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDelimitedParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDelimitedParser.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * This class implements stream parser based on {@link GridNioDelimitedBuffer}.
@@ -88,4 +87,4 @@ public class GridDelimitedParser implements GridNioParser {
     @Override public String toString() {
         return this.getClass().getSimpleName();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
index 939ad0a..987090d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Parser for direct messages.
@@ -90,4 +93,4 @@ public class GridDirectParser implements GridNioParser {
         // No encoding needed for direct messages.
         throw new UnsupportedEncodingException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
index d69beb1..9925d2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Executor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.internal.util.worker.GridWorkerPool;
 
 /**
  * Enables multithreaded notification of session opened, message received and session closed events.
@@ -138,4 +139,4 @@ public class GridNioAsyncNotifyFilter extends GridNioFilterAdapter {
                 "originalEx=" + ex + ", ex=" + e + ']');
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioBackPressureControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioBackPressureControl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioBackPressureControl.java
index 7f9f9c3..b15e4a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioBackPressureControl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioBackPressureControl.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.thread.*;
+import org.apache.ignite.thread.IgniteThread;
 
 /**
  * Utility class that allows to ignore back-pressure control for threads that are processing messages.
@@ -53,4 +53,4 @@ public class GridNioBackPressureControl {
         else
             threadProcMsg.set(processing);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java
index b3ed8e7..a2f543d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Filter that transforms byte buffers to user-defined objects and vice-versa
@@ -136,4 +137,4 @@ public class GridNioCodecFilter extends GridNioFilterAdapter {
     @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
         proceedSessionWriteTimeout(ses);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioDelimitedBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioDelimitedBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioDelimitedBuffer.java
index 44ab4a5..fdbd402 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioDelimitedBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioDelimitedBuffer.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Buffer with message delimiter support.
@@ -103,4 +102,4 @@ public class GridNioDelimitedBuffer {
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
index a1d6337..be77d39 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future that delegates to some other future.
@@ -68,4 +68,4 @@ public class GridNioEmbeddedFuture<R> extends GridNioFutureImpl<R> {
     @Override public String toString() {
         return S.toString(GridNioEmbeddedFuture.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioException.java
index 4295225..7de1d45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Nio specific exception.
@@ -55,4 +55,4 @@ public class GridNioException extends IgniteCheckedException {
     public GridNioException(Throwable cause) {
         super(cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilter.java
index 419d68c..5f88b1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * This interface defines the general element in transformation chain between the nio server and
@@ -241,4 +241,4 @@ public interface GridNioFilter {
      * @throws IgniteCheckedException If filter is not in chain or GridNioException occurred in the underlying filter.
      */
     public GridNioFuture<?> onResumeReads(GridNioSession ses) throws IgniteCheckedException;
-}
+}
\ No newline at end of file


[75/82] [abbrv] ignite git commit: Platforms: reworked PlatformCacheEntryFilter interface.

Posted by sb...@apache.org.
Platforms: reworked PlatformCacheEntryFilter interface.


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

Branch: refs/heads/ignite-1093-2
Commit: 980a934eb26adeaae1a358d5f9e1c6faccfcaf4a
Parents: 6d0aff4
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 1 11:31:08 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 1 11:31:08 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/cache/PlatformCacheEntryFilter.java     | 2 +-
 .../processors/platform/cache/PlatformCacheEntryFilterImpl.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/980a934e/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
index 94de2bc..4063c60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
@@ -22,7 +22,7 @@ import org.apache.ignite.lang.IgniteBiPredicate;
 /**
  * Platform cache entry filter interface.
  */
-public interface PlatformCacheEntryFilter<K, V> extends IgniteBiPredicate<K, V> {
+public interface PlatformCacheEntryFilter extends IgniteBiPredicate {
     /**
      * Callback invoked when filter is no longer needed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/980a934e/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
index e2d44ad..5f8ec8f 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
@@ -29,8 +29,7 @@ import org.apache.ignite.resources.IgniteInstanceResource;
 /**
  * Interop filter. Delegates apply to native platform.
  */
-public class PlatformCacheEntryFilterImpl<K, V> extends PlatformAbstractPredicate
-    implements PlatformCacheEntryFilter<K, V> {
+public class PlatformCacheEntryFilterImpl extends PlatformAbstractPredicate implements PlatformCacheEntryFilter {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -55,7 +54,7 @@ public class PlatformCacheEntryFilterImpl<K, V> extends PlatformAbstractPredicat
     }
 
     /** {@inheritDoc} */
-    @Override public boolean apply(K k, V v) {
+    @Override public boolean apply(Object k, Object v) {
         try (PlatformMemory mem = ctx.memory().allocate()) {
             PlatformOutputStream out = mem.output();
 


[22/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
index e9ba6f4..54c0525 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.secondary.*;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
 
 /**
  * Descriptor of an input stream opened to the secondary file system.
@@ -56,4 +56,4 @@ public class IgfsSecondaryInputStreamDescriptor {
     IgfsSecondaryFileSystemPositionedReadable reader() {
         return secReader;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
index f3921e8..dd6372f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.OutputStream;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Descriptor of an output stream opened to the secondary file system.
@@ -71,4 +70,4 @@ public class IgfsSecondaryOutputStreamDescriptor {
     OutputStream out() {
         return out;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
index caa6866..314baac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
@@ -17,23 +17,34 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.igfs.common.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.ipc.loopback.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-
-import static org.apache.ignite.spi.IgnitePortProtocol.*;
+import java.io.BufferedOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointType;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.igfs.common.IgfsControlResponse;
+import org.apache.ignite.internal.igfs.common.IgfsDataInputStream;
+import org.apache.ignite.internal.igfs.common.IgfsDataOutputStream;
+import org.apache.ignite.internal.igfs.common.IgfsIpcCommand;
+import org.apache.ignite.internal.igfs.common.IgfsMarshaller;
+import org.apache.ignite.internal.igfs.common.IgfsMessage;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.ipc.loopback.IpcServerTcpEndpoint;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint;
+import org.apache.ignite.internal.util.typedef.CIX1;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static org.apache.ignite.spi.IgnitePortProtocol.TCP;
 
 /**
  * IGFS server. Handles requests passed from IGFS clients.
@@ -466,4 +477,4 @@ public class IgfsServer {
             srvEndpoint.close();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java
index 42d92f5..6b6e1b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.igfs.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.DataInput;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.igfs.common.IgfsMessage;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * IGFS server message handler. Server component that is plugged in to the server implementation
@@ -54,4 +53,4 @@ public interface IgfsServerHandler {
      * @throws IgniteCheckedException If error occurred.
      */
     public void stop() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
index a53aa3b..d692013 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
@@ -17,21 +17,24 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.configuration.FileSystemConfiguration.*;
-import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.internal.util.ipc.IpcEndpointBindException;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.thread.IgniteThread;
+
+import static org.apache.ignite.igfs.IgfsIpcEndpointType.TCP;
 
 /**
  * IGFS server manager.
@@ -207,4 +210,4 @@ public class IgfsServerManager extends IgfsManager {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java
index 5592abe..6c1b375 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
 /**
  * IGFS response for status request.
@@ -73,4 +76,4 @@ public class IgfsStatus implements Externalizable {
         spaceUsed = in.readLong();
         spaceTotal = in.readLong();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
index 60b56ac..cfd8c68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Basic sync message.
@@ -144,4 +144,4 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage {
     @Override public byte fieldsCount() {
         return 2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java
index 1d15037..58500dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
+import org.apache.ignite.igfs.mapreduce.IgfsTaskArgs;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * IGFS task arguments implementation.
@@ -132,4 +136,4 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>,  Externalizable {
         maxRangeLen = in.readLong();
         usrArg = (T)in.readObject();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
index f64fc3e..9b9a1eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.X;
 
 /**
  * IGFS ad-hoc thread.
@@ -85,4 +85,4 @@ public abstract class IgfsThread extends Thread {
     protected void cleanup() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
index 7449f31..50ebd56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
@@ -17,24 +17,26 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.lang.reflect.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.lang.reflect.Constructor;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.igfs.IgfsException;
+import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_RETRIES_COUNT;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Common IGFS utility methods.
@@ -156,4 +158,4 @@ public class IgfsUtils {
         throw new IgniteCheckedException("Failed to perform operation since max number of attempts " +
             "exceeded. [maxAttempts=" + MAX_CACHE_TX_RETRIES + ']');
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobEventListener.java
index 40ca480..923db68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobEventListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.job;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * Job event listener.
@@ -37,4 +37,4 @@ interface GridJobEventListener extends EventListener {
      * @param worker Finished job worker.
      */
     public void onJobFinished(GridJobWorker worker);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobHoldListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobHoldListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobHoldListener.java
index 3e1dfee..14c43f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobHoldListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobHoldListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.job;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * Job hold listener to notify job processor on {@code hold}
@@ -35,4 +35,4 @@ interface GridJobHoldListener extends EventListener {
      * @return {@code True} if worker has been unheld.
      */
     public boolean onUnheld(GridJobWorker worker);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 350068a..4d6d0bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -17,37 +17,85 @@
 
 package org.apache.ignite.internal.processors.job;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.collision.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.jobmetrics.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDeploymentException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJobSibling;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.GridJobCancelRequest;
+import org.apache.ignite.internal.GridJobContextImpl;
+import org.apache.ignite.internal.GridJobExecuteRequest;
+import org.apache.ignite.internal.GridJobExecuteResponse;
+import org.apache.ignite.internal.GridJobSessionImpl;
+import org.apache.ignite.internal.GridJobSiblingsRequest;
+import org.apache.ignite.internal.GridJobSiblingsResponse;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.GridTaskSessionRequest;
+import org.apache.ignite.internal.SkipDaemon;
+import org.apache.ignite.internal.managers.collision.GridCollisionJobContextAdapter;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsSnapshot;
+import org.apache.ignite.internal.util.GridAtomicLong;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedHashMap;
+import org.jsr166.LongAdder8;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JOBS_HISTORY_SIZE;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_TASK_SESSION_ATTR_SET;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_CANCEL;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_SIBLINGS;
+import static org.apache.ignite.internal.GridTopic.TOPIC_TASK;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MANAGEMENT_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q;
 
 /**
  * Responsible for all grid job execution and communication.
@@ -1871,4 +1919,4 @@ public class GridJobProcessor extends GridProcessorAdapter {
             return sizex();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
index 3a309f6..c243435 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
@@ -17,29 +17,56 @@
 
 package org.apache.ignite.internal.processors.job;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeJobMasterLeaveAware;
+import org.apache.ignite.compute.ComputeUserUndeclaredException;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.igfs.IgfsOutOfSpaceException;
+import org.apache.ignite.internal.GridInternalException;
+import org.apache.ignite.internal.GridJobContextImpl;
+import org.apache.ignite.internal.GridJobExecuteResponse;
+import org.apache.ignite.internal.GridJobSessionImpl;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_JOB_CANCELLED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_JOB_QUEUED;
+import static org.apache.ignite.events.EventType.EVT_JOB_REJECTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_STARTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_TIMEDOUT;
+import static org.apache.ignite.internal.GridTopic.TOPIC_JOB;
+import static org.apache.ignite.internal.GridTopic.TOPIC_TASK;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MANAGEMENT_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
 
 /**
  * Job worker.
@@ -898,4 +925,4 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject {
     @Override public String toString() {
         return S.toString(GridJobWorker.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetrics.java
index df9d2e7..2ad8ca7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetrics.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.jobmetrics;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Job metrics.
@@ -445,4 +445,4 @@ public class GridJobMetrics {
     @Override public String toString() {
         return S.toString(GridJobMetrics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
index 03af4ff..06b9383 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
@@ -17,17 +17,16 @@
 
 package org.apache.ignite.internal.processors.jobmetrics;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jsr166.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jsr166.ThreadLocalRandom8;
 
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL;
 
 /**
  * Processes job metrics.
@@ -401,4 +400,4 @@ public class GridJobMetricsProcessor extends GridProcessorAdapter {
             return m;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsSnapshot.java
index f12dd60..7c27ece 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsSnapshot.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.processors.jobmetrics;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Job metrics snapshot.
@@ -224,4 +225,4 @@ public class GridJobMetricsSnapshot {
     @Override public String toString() {
         return S.toString(GridJobMetricsSnapshot.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
index 00669e7..03ebfdf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.nodevalidation;
 
-import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.processors.GridProcessor;
 
 /**
  * Node validation.
  */
 public interface DiscoveryNodeValidationProcessor extends GridProcessor {
     //No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
index 7f4458f..a7e06e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.processors.nodevalidation;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
 
 /**
  * Node validation.
@@ -69,4 +70,4 @@ public class OsDiscoveryNodeValidationProcessor extends GridProcessorAdapter imp
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
index 81bf9f2..024ea7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
@@ -17,21 +17,23 @@
 
 package org.apache.ignite.internal.processors.offheap;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.offheap.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.util.GridEmptyCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.offheap.GridOffHeapEvictListener;
+import org.apache.ignite.internal.util.offheap.GridOffHeapMapFactory;
+import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMap;
+import org.apache.ignite.internal.util.typedef.CX2;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.Marshaller;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Manages offheap memory caches.
@@ -359,4 +361,4 @@ public class GridOffHeapProcessor extends GridProcessorAdapter {
 
         return m == null ? new GridEmptyCloseableIterator<IgniteBiTuple<byte[], byte[]>>() : m.iterator(part);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
index b09d889..a423578 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAwareEventFilter.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Special version of predicate for events with initialize/close callbacks.
@@ -36,4 +36,4 @@ public interface PlatformAwareEventFilter<E extends Event> extends IgnitePredica
      * Closes the filter.
      */
     public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index 064cd91..bff0fc8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -17,24 +17,30 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.portable.*;
-import org.apache.ignite.internal.processors.cache.query.continuous.*;
-import org.apache.ignite.internal.processors.platform.cache.*;
-import org.apache.ignite.internal.processors.platform.cache.query.*;
-import org.apache.ignite.internal.processors.platform.callback.*;
-import org.apache.ignite.internal.processors.platform.compute.*;
-import org.apache.ignite.internal.processors.platform.memory.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.stream.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventAdapter;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.managers.communication.GridLifecycleAwareMessageFilter;
+import org.apache.ignite.internal.portable.PortableRawReaderEx;
+import org.apache.ignite.internal.portable.PortableRawWriterEx;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
+import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
+import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery;
+import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
+import org.apache.ignite.internal.processors.platform.compute.PlatformJob;
+import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManager;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.stream.StreamReceiver;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Platform context. Acts as an entry point for platform operations.
@@ -269,4 +275,4 @@ public interface PlatformContext {
      * @return Cluster node filter.
      */
     public IgnitePredicate<ClusterNode> createClusterNodeFilter(Object filter);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
index 41f41eb..f38d8e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformLocalEventListener.java
@@ -25,4 +25,4 @@ public interface PlatformLocalEventListener {
      * Closes the listener.
      */
     public void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
----------------------------------------------------------------------
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 7cb65d3..68c25ad 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
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
 
 /**
  * No-op processor.
@@ -53,4 +54,4 @@ public class PlatformNoopProcessor extends GridProcessorAdapter implements Platf
     @Override public PlatformTarget extensions() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
index 0cf2df4..8e4507a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.GridProcessor;
 
 /**
  * Platform processor.
@@ -58,4 +59,4 @@ public interface PlatformProcessor extends GridProcessor {
      * @return Platform extensions.
      */
     PlatformTarget extensions();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
index 6a22453..1b41591 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.platform;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interop target abstraction.
@@ -95,4 +95,4 @@ public interface PlatformTarget {
      */
     @SuppressWarnings("UnusedDeclaration")
     public void listenFutureForOperation(final long futId, int typ, int opId) throws Exception;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
index ac7cba4..bd3e281 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilter.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.platform.cache;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.processors.cache.GridLoadCacheCloseablePredicate;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryCloseableScanBiPredicate;
 
 /**
  * Platform cache entry filter interface.
@@ -26,4 +26,4 @@ import org.apache.ignite.internal.processors.cache.query.*;
 public interface PlatformCacheEntryFilter<K, V> extends GridLoadCacheCloseablePredicate<K, V>,
     CacheQueryCloseableScanBiPredicate<K, V> {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
index 0b55aea..b7cd3c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.internal.processors.platform.cache.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.continuous.*;
-import org.apache.ignite.internal.processors.platform.*;
-
-import javax.cache.event.*;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.query.Query;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx;
+import org.apache.ignite.internal.processors.platform.PlatformTarget;
 
 /**
  * Platform continuous query.
@@ -55,4 +54,4 @@ public interface PlatformContinuousQuery extends CacheEntryUpdatedListener, Cach
      */
     @SuppressWarnings("UnusedDeclaration")
     public PlatformTarget getInitialQueryCursor();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index a8e7879..38288c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.processors.platform.callback;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
 
 /**
  * Gateway to all platform-dependent callbacks. Implementers might extend this class and provide additional callbacks.
@@ -866,4 +867,4 @@ public class PlatformCallbackGateway {
     protected void block() {
         lock.writeLock();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
index 7e9587f..a46e8d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
@@ -465,4 +465,4 @@ public class PlatformCallbackUtils {
     private PlatformCallbackUtils() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformJob.java
index 2ac7194..889dc59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformJob.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.platform.compute;
 
-import org.apache.ignite.compute.*;
+import org.apache.ignite.compute.ComputeJob;
 
 /**
  * Platform closure job interface.
@@ -36,4 +36,4 @@ public interface PlatformJob extends ComputeJob {
      * @return Native job.
      */
     public Object job();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStream.java
index 9273e29..55c524e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStream.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.platform.memory;
 
-import org.apache.ignite.internal.portable.streams.*;
+import org.apache.ignite.internal.portable.streams.PortableInputStream;
 
 /**
  * Interop output stream,
@@ -27,4 +27,4 @@ public interface PlatformInputStream extends PortableInputStream {
      * Synchronize input. Must be called before start reading data from a memory changed by another platform.
      */
     public void synchronize();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemory.java
index 9d8f94e..c3f7bc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemory.java
@@ -74,4 +74,4 @@ public interface PlatformMemory extends AutoCloseable {
      * Close memory releasing it.
      */
     @Override void close();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryManager.java
index c2233a8..1634a2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryManager.java
@@ -43,4 +43,4 @@ public interface PlatformMemoryManager {
      * @return Memory.
      */
     public PlatformMemory get(long memPtr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStream.java
index eb2490a..e3ef0b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStream.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.platform.memory;
 
-import org.apache.ignite.internal.portable.streams.*;
+import org.apache.ignite.internal.portable.streams.PortableOutputStream;
 
 /**
  * Interop output stream.
@@ -27,4 +27,4 @@ public interface PlatformOutputStream extends PortableOutputStream {
      * Synchronize output stream with underlying memory
      */
     public void synchronize();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
index 7b1daad..a6d9216 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.platform.services;
 
-import org.apache.ignite.*;
-import org.apache.ignite.services.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.services.Service;
 
 /**
  * Base class for all platform services.
@@ -41,4 +41,4 @@ public interface PlatformService extends Service {
      * @return Native pointer.
      */
     public long pointer();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
index ae69eb8..23f1f3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
@@ -17,16 +17,27 @@
 
 package org.apache.ignite.internal.processors.plugin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.plugin.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridCachePluginContext;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.cache.CacheConflictResolutionManager;
+import org.apache.ignite.internal.processors.cache.CacheOsConflictResolutionManager;
+import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrManager;
+import org.apache.ignite.internal.processors.cache.dr.GridOsCacheDrManager;
+import org.apache.ignite.internal.processors.cache.store.CacheOsStoreManager;
+import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.CachePluginContext;
+import org.apache.ignite.plugin.CachePluginProvider;
 
 /**
  * Cache plugin manager.
@@ -145,4 +156,4 @@ public class CachePluginManager extends GridCacheManagerAdapter {
             provider.validateRemote(cctx.igniteCacheConfiguration(), cctx.cacheConfiguration(), rmtCfg, rmtNode);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index 5e24b4b..560d474 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -17,18 +17,29 @@
 
 package org.apache.ignite.internal.processors.plugin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.GridPluginContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.Extension;
+import org.apache.ignite.plugin.ExtensionRegistry;
+import org.apache.ignite.plugin.PluginContext;
+import org.apache.ignite.plugin.PluginProvider;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -234,4 +245,4 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
             return extensions;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortListener.java
index b6e5ac7..3d9e43e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.port;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * Listener for port change events.
@@ -25,4 +25,4 @@ import java.util.*;
 public interface GridPortListener extends EventListener {
     /** */
     public void onPortChange();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java
index fe1b605..e573649 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java
@@ -17,13 +17,18 @@
 
 package org.apache.ignite.internal.processors.port;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.TreeSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.spi.IgnitePortProtocol;
 
 /**
  * Registers and deregisters all ports used by SPI and Manager.
@@ -192,4 +197,4 @@ public class GridPortProcessor extends GridProcessorAdapter {
         X.println(">>>  recsSize: " + recsSize);
         X.println(">>>  lsnrsSize: " + lsnrsSize);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortRecord.java
index 89d7071..1a2ca42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortRecord.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.port;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.spi.IgnitePortProtocol;
 
 /**
  * This class defines record about port use.
@@ -69,4 +69,4 @@ public class GridPortRecord {
     @Override public String toString() {
         return S.toString(GridPortRecord.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
index 3dc7ddc..b25538b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Deserializes portable objects if needed.

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
index f99466f..9b08d77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldMetadata.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import java.io.*;
+import java.io.Externalizable;
 
 /**
  * Query field descriptor. This descriptor is used to provide metadata
@@ -51,4 +51,4 @@ public interface GridQueryFieldMetadata extends Externalizable {
      * @return Field type name.
      */
     public String fieldTypeName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResult.java
index 8b09f37..25c8caba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResult.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.spi.IgniteSpiCloseableIterator;
 
 /**
  * Field query result. It is composed of
@@ -39,4 +38,4 @@ public interface GridQueryFieldsResult {
      * @return Iterator over queried fields.
      */
     IgniteSpiCloseableIterator<List<?>> iterator();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
index c423fb7..fc01d2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience adapter for {@link GridQueryFieldsResult}.
@@ -54,4 +54,4 @@ public class GridQueryFieldsResultAdapter implements GridQueryFieldsResult {
     @Override public GridCloseableIterator<List<?>> iterator() {
         return it;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexDescriptor.java
index 6cf0fd8..fe58112 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexDescriptor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * Describes an index to be created for a certain type. It contains all necessary
@@ -47,4 +47,4 @@ public interface GridQueryIndexDescriptor {
      * @return Type.
      */
     public GridQueryIndexType type();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexType.java
index 4f9a8f2..f59301c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexType.java
@@ -29,4 +29,4 @@ public enum GridQueryIndexType {
 
     /** Fulltext index. */
     FULLTEXT
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index 8639bc8..cf8d4a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -17,21 +17,25 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.indexing.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.spi.indexing.IndexingQueryFilter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Abstraction for internal indexing implementation.
@@ -253,4 +257,4 @@ public interface GridQueryIndexing {
      * @param reconnectFut Reconnect future.
      */
     public void onDisconnected(IgniteFuture<?> reconnectFut);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index c8b8166..7370996 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -17,36 +17,73 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.indexing.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.internal.processors.query.GridQueryIndexType.*;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QueryGroupIndex;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cache.query.annotations.QueryTextField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.CacheQueryExecutedEvent;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.GridProcessorAdapter;
+import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
+import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsAdapter;
+import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.util.GridSpinBusyLock;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridCloseableIterator;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.internal.util.worker.GridWorkerFuture;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.spi.indexing.IndexingQueryFilter;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
+import static org.apache.ignite.internal.IgniteComponentType.INDEXING;
+import static org.apache.ignite.internal.processors.query.GridQueryIndexType.FULLTEXT;
+import static org.apache.ignite.internal.processors.query.GridQueryIndexType.GEO_SPATIAL;
+import static org.apache.ignite.internal.processors.query.GridQueryIndexType.SORTED;
 
 /**
  * Indexing processor.
@@ -2087,4 +2124,4 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             return S.toString(TypeName.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryTypeDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryTypeDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryTypeDescriptor.java
index 3d9c9dc..b05e1d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryTypeDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryTypeDescriptor.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Value descriptor which allows to extract fields from value object of given type.
@@ -77,4 +76,4 @@ public interface GridQueryTypeDescriptor {
      * @return If string representation of value should be full-text indexed.
      */
     public boolean valueTextIndex();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
index e679ed4..e7e1493 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.query.h2.twostep.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Cancel request.
@@ -111,4 +112,4 @@ public class GridQueryCancelRequest implements Message {
     @Override public byte fieldsCount() {
         return 1;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index 6fd607c..5f47649 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.internal.processors.query.h2.twostep.messages;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Error message.
@@ -137,4 +138,4 @@ public class GridQueryFailResponse implements Message {
     @Override public byte fieldsCount() {
         return 2;
     }
-}
+}
\ No newline at end of file


[50/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
index 9062d24..cb316c5 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.schema;
 
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-
-import javax.cache.configuration.*;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.configuration.CacheConfiguration;
 
 /**
  * CacheConfig stub. Will be generated by Ignite Schema Import Utility.
@@ -35,4 +34,4 @@ public class CacheConfig {
     public static <K, V> CacheConfiguration<K, V> cache(String name, Factory<CacheStore<K, V>> storeFactory) {
         throw new IllegalStateException("Please run Ignite Schema Import Utility as described in README.txt");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
index 9497543..cade7f1 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.schema;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.transactions.*;
-import org.h2.jdbcx.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.transactions.Transaction;
+import org.h2.jdbcx.JdbcConnectionPool;
 
 /**
  * This demo demonstrates the use of cache with {@link CacheJdbcPojoStore}
@@ -142,4 +144,4 @@ public class Demo {
 
         System.out.println(">>> Updated person: " + cache.get(key));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/schema-import/src/main/java/org/apache/ignite/schema/DemoNode.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/DemoNode.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/DemoNode.java
index 7b8f832..0f8c192 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/DemoNode.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/DemoNode.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.schema;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
 
 /**
  * Starts demo node. You can start as many demo nodes as you like for the demo.
@@ -34,4 +35,4 @@ public class DemoNode {
 
         Ignition.start("examples/config/example-ignite.xml");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/schema-import/src/main/java/org/apache/ignite/schema/Person.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/Person.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/Person.java
index 36f287f..799c876 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Person.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Person.java
@@ -42,4 +42,3 @@ public class Person {
         throw new IllegalStateException("Please run Ignite Schema Import Utility as described in README.txt");
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/schema-import/src/main/java/org/apache/ignite/schema/PersonKey.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/PersonKey.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/PersonKey.java
index 16386d3..dd241ad 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/PersonKey.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/PersonKey.java
@@ -35,4 +35,3 @@ public class PersonKey {
         throw new IllegalStateException("Please run Ignite Schema Import Utility as described in README.txt");
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/ExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/ExampleNodeStartup.java
index f972b53..ad12297 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ExampleNodeStartup.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
 
 /**
  * Starts up an empty node with example compute configuration.
@@ -32,4 +33,4 @@ public class ExampleNodeStartup {
     public static void main(String[] args) throws IgniteException {
         Ignition.start("examples/config/example-ignite.xml");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
----------------------------------------------------------------------
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 abc2578..69cd43f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.URL;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterGroup;
 
 /**
  *
@@ -129,4 +128,4 @@ public class ExamplesUtils {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
index 63ae110..e8321a5 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple use of {@link IgniteRunnable}.
@@ -71,4 +75,4 @@ public class ComputeAsyncExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
index 2ea878c..783b102 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.resources.IgniteInstanceResource;
 
 /**
  * Demonstrates broadcasting computations within cluster.
@@ -111,4 +113,4 @@ public class ComputeBroadcastExample {
             System.out.println();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeCallableExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeCallableExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeCallableExample.java
index f9a2939..aceca17 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeCallableExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeCallableExample.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteCallable;
 
 /**
  * Demonstrates using of {@link IgniteCallable} job execution on the cluster.
@@ -76,4 +78,4 @@ public class ComputeCallableExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
index 0efb4cc..eaa54a4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteClosure;
 
 /**
  * Demonstrates a simple use of Ignite with reduce closure.
@@ -74,4 +76,4 @@ public class ComputeClosureExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java
index 715001e..8b77bbe 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java
@@ -17,15 +17,27 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskNoResultCache;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
 
 /**
  * Demonstrates usage of continuous mapper. With continuous mapper
@@ -155,4 +167,4 @@ public class ComputeContinuousMapperExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
index ff2fae9..706ec18 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
@@ -17,17 +17,25 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.math.BigInteger;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.JobContextResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This example demonstrates how to use continuation feature of Ignite by
@@ -191,4 +199,4 @@ public final class ComputeFibonacciContinuationExample {
             return fut1.get().add(fut2.get());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeReducerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeReducerExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeReducerExample.java
index b678d45..a4147d7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeReducerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeReducerExample.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteReducer;
 
 /**
  * Demonstrates a simple use of Ignite with reduce closure.
@@ -86,4 +88,4 @@ public class ComputeReducerExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeRunnableExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeRunnableExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeRunnableExample.java
index 4763bba..5a6f9e8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeRunnableExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeRunnableExample.java
@@ -17,9 +17,12 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates a simple use of {@link IgniteRunnable}.
@@ -60,4 +63,4 @@ public class ComputeRunnableExample {
             System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
index a06299f..1c880e8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskMapExample.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.examples.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Demonstrates a simple use of Ignite with
@@ -110,4 +117,4 @@ public class ComputeTaskMapExample {
             return sum;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskSplitExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskSplitExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskSplitExample.java
index 3dd3f63..a1358e0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskSplitExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeTaskSplitExample.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.examples.computegrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.examples.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Demonstrates a simple use of Ignite with {@link ComputeTaskSplitAdapter}.
@@ -99,4 +105,4 @@ public class ComputeTaskSplitExample {
             return sum;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/ClusterGroupExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/ClusterGroupExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/ClusterGroupExample.java
index 1982b17..d2b75df 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/ClusterGroupExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/ClusterGroupExample.java
@@ -17,10 +17,16 @@
 
 package org.apache.ignite.examples.computegrid.cluster;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * Demonstrates new functional APIs.
@@ -90,4 +96,4 @@ public class ClusterGroupExample {
             }
         );
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/package-info.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/package-info.java
index b837f73..cf144d1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/cluster/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Cluster group example.
  */
-package org.apache.ignite.examples.computegrid.cluster;
+package org.apache.ignite.examples.computegrid.cluster;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
----------------------------------------------------------------------
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 9b87c70..ebe9151 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
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.examples.computegrid.failover;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJobFailoverException;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.ComputeTaskSessionFullSupport;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskSessionResource;
 
 /**
  * Demonstrates the usage of checkpoints in Ignite.
@@ -134,4 +141,4 @@ public class ComputeFailoverExample {
             return getClass().getName() + '-' + phrase;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverNodeStartup.java
index bcd7db1..ca6dfe8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverNodeStartup.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.examples.computegrid.failover;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.checkpoint.sharedfs.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 
 /**
  * Starts up an empty node with checkpoint-enabled configuration.
@@ -74,4 +75,4 @@ public class ComputeFailoverNodeStartup {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java
index d065d52..506a2a2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Compute failover example.
  */
-package org.apache.ignite.examples.computegrid.failover;
+package org.apache.ignite.examples.computegrid.failover;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/Credit.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/Credit.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/Credit.java
index 81ebbee..0a0caf1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/Credit.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/Credit.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples.computegrid.montecarlo;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * This class provides a simple model for a credit contract (or a loan). It is basically
@@ -107,4 +107,4 @@ public class Credit implements Serializable {
 
         return buf.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskExample.java
index 5ab69e7..a7624b3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskExample.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.examples.computegrid.montecarlo;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Random;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteReducer;
 
 /**
  * Monte-Carlo example. Demonstrates distributed credit risk calculation.
@@ -150,4 +154,4 @@ public final class CreditRiskExample {
 
         return clos;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskManager.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskManager.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskManager.java
index 051b782..255c15a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskManager.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/CreditRiskManager.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.examples.computegrid.montecarlo;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Random;
 
 /**
  * This class abstracts out the calculation of risk for a credit portfolio.
@@ -140,4 +141,4 @@ public class CreditRiskManager {
 
         return cnt / losses.length;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java
index 5ea49f5..2e4a018 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Monte-Carlo simulation example.
  */
-package org.apache.ignite.examples.computegrid.montecarlo;
+package org.apache.ignite.examples.computegrid.montecarlo;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/computegrid/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/package-info.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/package-info.java
index a0ef33a..c072222 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Basic examples for computational ignite functionality.
  */
-package org.apache.ignite.examples.computegrid;
+package org.apache.ignite.examples.computegrid;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
index a389dcb..f295ea7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
@@ -17,12 +17,18 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteRunnable;
 
 /**
  * This example demonstrates the simplest code that populates the distributed cache
@@ -128,4 +134,4 @@ public final class CacheAffinityExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
index 3d06b2e..78221d4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
@@ -17,11 +17,14 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-
-import javax.cache.processor.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
  * This example demonstrates some of the cache rich API capabilities.
@@ -95,4 +98,4 @@ public class CacheApiExample {
         b2 = cache.replace(7, "7", "777");
         assert b1 & !b2;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
index e9d6e04..a38c133 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * This example demonstrates some of the cache rich API capabilities.
@@ -76,4 +80,4 @@ public class CacheAsyncApiExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index a209d42..0ce6e89 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import javax.cache.event.*;
+import javax.cache.Cache;
+import javax.cache.event.CacheEntryEvent;
+import javax.cache.event.CacheEntryUpdatedListener;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cache.query.ContinuousQuery;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * This examples demonstrates continuous query API.
@@ -98,4 +102,4 @@ public class CacheContinuousQueryExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
index 4994388..2357c28 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
@@ -17,8 +17,13 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
 
 /**
  * Demonstrates how cache can be populated with data utilizing {@link IgniteDataStreamer} API.
@@ -78,4 +83,4 @@ public class CacheDataStreamerExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
index 32fab75..b2fdc8c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgnitePredicate;
 
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_REMOVED;
 
 /**
  * This examples demonstrates events API. Note that ignite events are disabled by default and
@@ -89,4 +94,4 @@ public class CacheEventsExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
index 8fd5376..82a76b8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
  * This example demonstrates very basic operations on cache, such as 'put' and 'get'.
@@ -102,4 +105,4 @@ public class CachePutGetExample {
         for (Map.Entry<Integer, String> e : vals.entrySet())
             System.out.println("Got entry [key=" + e.getKey() + ", val=" + e.getValue() + ']');
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 6d6126d..1b2e02a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -17,18 +17,25 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import java.util.UUID;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.TextQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cache.query.annotations.QueryTextField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Cache queries example. This example demonstrates SQL, TEXT, and FULL SCAN
@@ -418,4 +425,4 @@ public class CacheQueryExample {
             return "Organization [id=" + id + ", name=" + name + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
index 797543a..93e51c1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.examples.datagrid;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.transactions.*;
-
-import java.io.*;
-
-import static org.apache.ignite.transactions.TransactionConcurrency.*;
-import static org.apache.ignite.transactions.TransactionIsolation.*;
+import java.io.Serializable;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
  * Demonstrates how to use cache transactions.
@@ -139,4 +142,4 @@ public class CacheTransactionExample {
             return "Account [id=" + id + ", balance=$" + balance + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index af2decf..43088a4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -17,21 +17,28 @@
 
 package org.apache.ignite.examples.datagrid.hibernate;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.hibernate.*;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
 import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.*;
-import org.hibernate.service.*;
-import org.hibernate.stat.*;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.stat.SecondLevelCacheStatistics;
 
-import java.net.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * This example demonstrates the use of Ignite In-Memory Data Ignite cluster as a Hibernate
@@ -235,4 +242,4 @@ public class HibernateL2CacheExample {
 
         System.out.println("=====================================");
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/Post.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/Post.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/Post.java
index 4c73f3f..798411a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/Post.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/Post.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.examples.datagrid.hibernate;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 
 /**
  * An entity class representing a post, that a
@@ -123,4 +127,4 @@ class Post {
             ", created=" + created +
             ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/User.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/User.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/User.java
index 500c625..b7d5299 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/User.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/User.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.examples.datagrid.hibernate;
 
-import org.hibernate.annotations.*;
-
+import java.util.HashSet;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.*;
-import java.util.*;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import org.hibernate.annotations.NaturalId;
 
 /**
  * A user entity class. Represents a user of some public service,
@@ -148,4 +151,4 @@ class User {
             ", lastName=" + lastName +
             ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/package-info.java
index 7bddaaf..4bb876b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Hibernate example.
  */
-package org.apache.ignite.examples.datagrid.hibernate;
+package org.apache.ignite.examples.datagrid.hibernate;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/package-info.java
index cfa37a4..e060581 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates data ignite cache usage.
  */
-package org.apache.ignite.examples.datagrid;
+package org.apache.ignite.examples.datagrid;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
index bef2457..12fee26 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
@@ -17,15 +17,21 @@
 
 package org.apache.ignite.examples.datagrid.starschema;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
  * <a href="http://en.wikipedia.org/wiki/Snowflake_schema">Snowflake Schema</a> is a logical
@@ -236,4 +242,4 @@ public class CacheStarSchemaExample {
 
         throw new ConcurrentModificationException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
index 46adc80..ec56865 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples.datagrid.starschema;
 
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
 
 /**
  * Represents a product available for purchase. In our {@code snowflake} schema a {@code product}
@@ -98,4 +98,4 @@ public class DimProduct {
             ", price=" + price +
             ", qty=" + qty + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
index da991e8..566a840 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples.datagrid.starschema;
 
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
 
 /**
  * Represents a physical store location. In our {@code snowflake} schema a {@code store}
@@ -98,4 +98,4 @@ public class DimStore {
             ", zip=" + zip +
             ", addr=" + addr + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
index 7dc46c4..cdb4def 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.examples.datagrid.starschema;
 
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
 
 /**
  * Represents a purchase record. In our {@code snowflake} schema purchase
@@ -100,4 +100,4 @@ public class FactPurchase {
             ", storeId=" + storeId +
             ", purchasePrice=" + purchasePrice + ']';
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/package-info.java
index 2ed1469..4db7d8c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates distributed SQL joins over ignite using Snowflake schema.
  */
-package org.apache.ignite.examples.datagrid.starschema;
+package org.apache.ignite.examples.datagrid.starschema;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/Person.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/Person.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/Person.java
index 6337401..b54010f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/Person.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/Person.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples.datagrid.store;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Person definition.
@@ -152,4 +152,3 @@ public class Person implements Serializable {
             "]";
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
index 0176451..f8cd4dd 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.examples.datagrid.store.auto;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.transactions.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.transactions.Transaction;
 
 /**
  * Demonstrates usage of cache with underlying persistent store configured.
@@ -83,4 +85,4 @@ public class CacheAutoStoreExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
index 4cfd520..f0f9feb 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
@@ -17,11 +17,15 @@
 
 package org.apache.ignite.examples.datagrid.store.auto;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.datagrid.store.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.datagrid.store.Person;
 
 /**
  * Demonstrates how to load data from database.
@@ -78,4 +82,4 @@ public class CacheAutoStoreLoadDataExample {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
index 6c148a6..1eb7cd2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.examples.datagrid.store.auto;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.h2.jdbcx.*;
-
-import javax.cache.configuration.*;
-import java.sql.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.Collections;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.cache.CacheTypeFieldMetadata;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.h2.jdbcx.JdbcConnectionPool;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Predefined configuration for examples with {@link CacheJdbcPojoStore}.
@@ -77,4 +78,4 @@ public class CacheConfig {
 
         return cfg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/DbH2ServerStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/DbH2ServerStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/DbH2ServerStartup.java
index 96e4622..f5e07a8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/DbH2ServerStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/DbH2ServerStartup.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.examples.datagrid.store.auto;
 
-import org.apache.ignite.*;
-import org.h2.jdbcx.*;
-import org.h2.tools.*;
-
-import java.io.*;
-import java.sql.*;
+import java.io.IOException;
+import java.io.StringReader;
+import java.sql.SQLException;
+import org.apache.ignite.IgniteException;
+import org.h2.jdbcx.JdbcConnectionPool;
+import org.h2.tools.RunScript;
+import org.h2.tools.Server;
 
 /**
  * Start H2 database TCP server in order to access sample in-memory database from other processes.
@@ -75,4 +76,4 @@ public class DbH2ServerStartup {
             // No-op.
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/package-info.java
index 803253f..57f0b7e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Contains automatic JDBC store example.
  */
-package org.apache.ignite.examples.datagrid.store.auto;
+package org.apache.ignite.examples.datagrid.store.auto;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
index 1c9e0d6..f85e92b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.examples.datagrid.store.dummy;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.resources.CacheNameResource;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.transactions.Transaction;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Dummy cache store implementation.
@@ -108,4 +110,4 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> {
     @Nullable private Transaction transaction() {
         return ses != null ? ses.transaction() : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
index d79b895..20e6b8f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.examples.datagrid.store.dummy;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import java.util.UUID;
+import javax.cache.configuration.FactoryBuilder;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Demonstrates usage of cache with underlying persistent store configured.
@@ -127,4 +130,4 @@ public class CacheDummyStoreExample {
 
         System.out.println("Read value after commit: " + cache.get(id));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/package-info.java
index 9993f67..42c3899 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Contains dummy cache store implementation.
  */
-package org.apache.ignite.examples.datagrid.store.dummy;
+package org.apache.ignite.examples.datagrid.store.dummy;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index 80a9f22..f8831ab 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.examples.datagrid.store.hibernate;
 
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.hibernate.*;
-
-import javax.cache.integration.*;
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 
 /**
  * Example of {@link CacheStore} implementation that uses Hibernate
@@ -115,4 +119,4 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> {
             throw new CacheLoaderException("Failed to load values from cache store.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 25760f0..fbb761a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.examples.datagrid.store.hibernate;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.hibernate.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import java.util.UUID;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.FactoryBuilder;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListener;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Demonstrates usage of cache with underlying persistent store configured.
@@ -144,4 +148,4 @@ public class CacheHibernateStoreExample {
 
         System.out.println("Read value after commit: " + cache.get(id));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java
index 7210b49..7a6d6de 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Contains Hibernate-based cache store implementation.
  */
-package org.apache.ignite.examples.datagrid.store.hibernate;
+package org.apache.ignite.examples.datagrid.store.hibernate;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index ed14a99..e0ea13a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.examples.datagrid.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.h2.jdbcx.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import javax.sql.*;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.cache.integration.CacheWriterException;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.cache.store.CacheStoreSession;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.resources.CacheStoreSessionResource;
+import org.h2.jdbcx.JdbcConnectionPool;
 
 /**
  * Example of {@link CacheStore} implementation that uses JDBC
@@ -172,4 +177,4 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
             throw new CacheLoaderException("Failed to load values from cache store.", e);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
index 637d6dc..9d3014f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.examples.datagrid.store.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.transactions.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import java.util.UUID;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.FactoryBuilder;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListener;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.ExamplesUtils;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Demonstrates usage of cache with underlying persistent store configured.
@@ -140,4 +144,4 @@ public class CacheJdbcStoreExample {
 
         System.out.println("Read value after commit: " + cache.get(id));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/package-info.java
index ee6facb..46cfe6b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Contains JDBC-based cache store implementation.
  */
-package org.apache.ignite.examples.datagrid.store.jdbc;
+package org.apache.ignite.examples.datagrid.store.jdbc;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/package-info.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/package-info.java
index 2c98e7c..c05873a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/package-info.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/package-info.java
@@ -19,4 +19,4 @@
  * <!-- Package description. -->
  * Demonstrates using of cache store.
  */
-package org.apache.ignite.examples.datagrid.store;
+package org.apache.ignite.examples.datagrid.store;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
index 50149ba..7a0ea33 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/spring/CacheSpringPersonStore.java
@@ -17,19 +17,22 @@
 
 package org.apache.ignite.examples.datagrid.store.spring;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.lang.*;
-import org.springframework.dao.*;
-import org.springframework.jdbc.core.*;
-import org.springframework.jdbc.datasource.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import javax.sql.*;
-import java.sql.*;
-import java.util.concurrent.atomic.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoaderException;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreAdapter;
+import org.apache.ignite.examples.datagrid.store.Person;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowCallbackHandler;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
 
 /**
  * Example of {@link CacheStore} implementation that uses JDBC
@@ -125,4 +128,4 @@ public class CacheSpringPersonStore extends CacheStoreAdapter<Long, Person> {
 
         System.out.println(">>> Loaded " + cnt + " values into cache.");
     }
-}
+}
\ No newline at end of file


[52/82] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
#	modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java


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

Branch: refs/heads/ignite-1093-2
Commit: 34f98a6418e8088b6e469b4978bd46284806996a
Parents: 90e9555 1335580
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Aug 31 17:27:29 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Aug 31 17:27:29 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |  22 +-
 DISCLAIMER.txt                                  |  15 -
 LICENSE                                         |   2 +-
 NOTICE                                          |   2 +-
 assembly/LICENSE_FABRIC                         |   2 +-
 assembly/LICENSE_HADOOP                         |   2 +-
 assembly/NOTICE_FABRIC                          |   2 +-
 assembly/NOTICE_HADOOP                          |   2 +-
 assembly/release-base.xml                       |   5 -
 dev-tools/slurp.sh                              |   2 +-
 dev-tools/src/main/groovy/jiraslurp.groovy      |   2 +-
 modules/apache-license-gen/pom.xml              |  13 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |   2 +-
 .../cloud/TcpDiscoveryCloudIpFinder.java        |   2 +-
 modules/core/src/main/java/META-INF/LICENSE     |   2 +-
 modules/core/src/main/java/META-INF/NOTICE      |   2 +-
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |   2 +-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |   2 +-
 .../configuration/IgniteReflectionFactory.java  |   2 +-
 .../apache/ignite/internal/IgniteKernal.java    | 279 ++++++-------------
 .../ignite/internal/IgniteNodeAttributes.java   |   3 +
 .../discovery/GridDiscoveryManager.java         |  13 +-
 .../platform/PlatformNoopProcessor.java         |  70 ++++-
 .../processors/platform/PlatformProcessor.java  | 113 +++++++-
 .../processors/platform/PlatformTarget.java     |  36 ++-
 .../apache/ignite/marshaller/Marshaller.java    |   2 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |   2 +-
 .../optimized/OptimizedMarshaller.java          |   2 +-
 .../marshaller/portable/PortableMarshaller.java |   5 +-
 .../SpringApplicationContextResource.java       |   2 +-
 .../checkpoint/cache/CacheCheckpointSpi.java    |   2 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |   2 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |   2 +-
 .../jobstealing/JobStealingCollisionSpi.java    |   4 +-
 .../PriorityQueueCollisionSpi.java              |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   2 +-
 .../memory/MemoryEventStorageSpi.java           |   2 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |   2 +-
 .../jobstealing/JobStealingFailoverSpi.java     |   2 +-
 .../spi/failover/never/NeverFailoverSpi.java    |   2 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |   2 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |   2 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |   2 +-
 .../WeightedRandomLoadBalancingSpi.java         |   2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   2 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |  71 ++++-
 modules/docker/download_ignite.sh               |   2 +-
 .../CacheHibernateBlobStoreFactory.java         |   2 +-
 .../log4j2/GridLog4j2InitializedTest.java       |   6 +-
 .../Impl/Memory/PlatformMemoryStream.cs         |   3 +-
 .../platform/PlatformAbstractTarget.java        |  40 +++
 .../rest/protocols/http/jetty/rest.html         |   4 +-
 modules/scalar-2.10/pom.xml                     |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 .../ant/beautifier/GridJavadocAntTask.java      |   2 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |   2 +-
 modules/yardstick/README.txt                    |   2 +-
 parent/pom.xml                                  |  12 +-
 59 files changed, 474 insertions(+), 322 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
----------------------------------------------------------------------


[54/82] [abbrv] ignite git commit: main - imports compilation fixed

Posted by sb...@apache.org.
main - imports compilation fixed


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

Branch: refs/heads/ignite-1093-2
Commit: c28d134ce137ce048b391153154f64fa103a10de
Parents: e8379e9
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Aug 31 17:37:52 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Aug 31 17:37:52 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/managers/discovery/GridDiscoveryManager.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c28d134c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 260c997..fa70267 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -125,6 +125,7 @@ import static org.apache.ignite.events.EventType.EVT_NODE_SEGMENTED;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PEER_CLASSLOADING;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PORTABLE_PROTO_VER;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
 import static org.apache.ignite.internal.IgniteVersionUtils.VER;
 import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.NOOP;


[34/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 966dcc1..a1fc585 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -17,24 +17,46 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.lang.ref.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Array;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.lang.GridTriple;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.LongAdder8;
 
 /**
  * Concurrent implementation of cache map.
@@ -2391,4 +2413,4 @@ public class GridCacheConcurrentMap {
             set = (Set0<K, V>)in.readObject();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 5f17746..3d0f1ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -17,58 +17,98 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.discovery.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.managers.swapspace.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.datastructures.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.jta.*;
-import org.apache.ignite.internal.processors.cache.local.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.query.continuous.*;
-import org.apache.ignite.internal.processors.cache.store.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.closure.*;
-import org.apache.ignite.internal.processors.offheap.*;
-import org.apache.ignite.internal.processors.plugin.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.offheap.unsafe.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.security.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import javax.cache.expiry.EternalExpiryPolicy;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheInterceptor;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
+import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache;
+import org.apache.ignite.internal.processors.cache.dr.GridCacheDrManager;
+import org.apache.ignite.internal.processors.cache.jta.CacheJtaManagerAdapter;
+import org.apache.ignite.internal.processors.cache.local.GridLocalCache;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager;
+import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
+import org.apache.ignite.internal.processors.cache.version.CacheVersionConflictResolver;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionedEntryEx;
+import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
+import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
+import org.apache.ignite.internal.processors.plugin.CachePluginManager;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.GPC;
+import org.apache.ignite.internal.util.typedef.internal.GPR;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.plugin.security.SecurityException;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.plugin.security.SecurityPermission;
+import org.jetbrains.annotations.Nullable;
 
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+import static org.apache.ignite.cache.CacheRebalanceMode.NONE;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
 
 /**
  * Cache context.
@@ -1937,4 +1977,4 @@ public class GridCacheContext<K, V> implements Externalizable {
     @Override public String toString() {
         return "GridCacheContext: " + name();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
index cd868db..6c5a8dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
@@ -17,16 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.GridArgumentCheck;
+import org.apache.ignite.internal.util.GridReflectionCache;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
 
 /**
  * Default key affinity mapper. If key class has annotation {@link AffinityKeyMapped},
@@ -117,4 +124,4 @@ public class GridCacheDefaultAffinityKeyMapper implements AffinityKeyMapper {
     @Override public void reset() {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 677377e..40c5b0f 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
@@ -17,30 +17,48 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.apache.ignite.configuration.DeploymentMode.*;
-import static org.apache.ignite.events.EventType.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.DeploymentMode;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.CA;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedHashMap;
+
+import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
+import static org.apache.ignite.configuration.DeploymentMode.ISOLATED;
+import static org.apache.ignite.configuration.DeploymentMode.PRIVATE;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 
 /**
  * Deployment manager for cache.
@@ -982,4 +1000,4 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
             return S.toString(CachedDeploymentInfo.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index 1b5a717..698d043 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -17,21 +17,23 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionedEntryEx;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Internal API for cache entry ({@code 'Ex'} stands for extended).
@@ -949,4 +951,4 @@ public interface GridCacheEntryEx {
      * Calls {@link GridDhtLocalPartition#onUnlock()} for this entry's partition.
      */
     public void onUnlock();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index 3303cfc..6acd09b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -17,14 +17,16 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.nio.*;
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Entry information that gets passed over wire.
@@ -421,4 +423,4 @@ public class GridCacheEntryInfo implements Message {
     @Override public String toString() {
         return S.toString(GridCacheEntryInfo.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
index e227b43..e8cc01d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.jsr166.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.IgniteLogger;
+import org.jsr166.ConcurrentHashMap8;
 
 /**
  *
@@ -67,4 +67,4 @@ public class GridCacheEntryInfoCollectSwapListener implements GridCacheSwapListe
     public Collection<GridCacheEntryInfo> entries() {
         return swappedEntries.values();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
index f530c04..1dbc564 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Entry set backed by cache itself.
@@ -106,4 +110,4 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<Cache.Entry<K, V>> {
 
         return F.isAll(e, filter) && set.contains(e);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index f56566e..c2f8f3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -17,18 +17,24 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.CacheRebalancingEvent;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_PART_UNLOADED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_STARTED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_STOPPED;
 
 /**
  * Cache event manager.
@@ -348,4 +354,4 @@ public class GridCacheEventManager extends GridCacheManagerAdapter {
         X.println(">>> Cache event manager memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() +
             ", stats=" + "N/A" + ']');
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index fd71ab5..b2fa2dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -17,44 +17,87 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
-import static org.jsr166.ConcurrentLinkedDeque8.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.eviction.EvictionFilter;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridBusyLock;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.lang.IgnitePair;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.CI2;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ConcurrentLinkedDeque8;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.LOCAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
+import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
+import static org.jsr166.ConcurrentLinkedDeque8.Node;
 
 /**
  * Cache eviction manager.
@@ -2053,4 +2096,4 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
             return S.toString(EvictionFuture.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
index 3097114..fa0359c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
@@ -17,18 +17,20 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Cache eviction request.
@@ -237,4 +239,4 @@ public class GridCacheEvictionRequest extends GridCacheMessage implements GridCa
     @Override public String toString() {
         return S.toString(GridCacheEvictionRequest.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
index 94a3e60..4d40c8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.HashSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Cache eviction response.
@@ -215,4 +217,4 @@ public class GridCacheEvictionResponse extends GridCacheMessage {
     @Override public String toString() {
         return S.toString(GridCacheEvictionResponse.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index 0e555c9..2261c7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -17,17 +17,21 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Collection of near local locks acquired by a thread on one topology version.
@@ -276,4 +280,4 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
             unlock();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterFailedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterFailedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterFailedException.java
index 68bbad6..c34f916 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterFailedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterFailedException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Thrown when an operation is performed on removed entry.
@@ -55,4 +55,4 @@ public class GridCacheFilterFailedException extends Exception {
     @Override public String toString() {
         return S.toString(GridCacheFilterFailedException.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java
index e836e99..caa3d3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * This interface should be implemented by all distributed futures.
@@ -60,4 +60,4 @@ public interface GridCacheFuture<R> extends IgniteInternalFuture<R> {
      * Marks this future as non-trackable.
      */
     public void markNotTrackable();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 58c9035..0eac5ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -17,16 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache gateway.
@@ -330,4 +332,4 @@ public class GridCacheGateway<K, V> {
         /** */
         STOPPED
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIndexUpdateException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIndexUpdateException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIndexUpdateException.java
index c017f5d..a8f92f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIndexUpdateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIndexUpdateException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that index update failed during cache entry update. If this exception is thrown, entry
@@ -42,4 +42,4 @@ public class GridCacheIndexUpdateException extends IgniteCheckedException {
     public GridCacheIndexUpdateException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheInternal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheInternal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheInternal.java
index 29c56ec..97eb19a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheInternal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheInternal.java
@@ -24,4 +24,4 @@ package org.apache.ignite.internal.processors.cache;
  */
 public interface GridCacheInternal {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index cfdf06c..a935b26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -17,31 +17,59 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.GridTopic.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
+import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.GridLeanSet;
+import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
+import static org.apache.ignite.internal.GridTopic.TOPIC_CACHE;
 
 /**
  * Cache communication manager.
@@ -1079,4 +1107,4 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
             return res;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
index 0f0f2aa..19da4a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Iterator;
+import javax.cache.Cache;
+import org.apache.ignite.internal.util.GridSerializableIterator;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Cache-backed iterator.
@@ -84,4 +84,4 @@ public class GridCacheIterator<K, V, T> implements GridSerializableIterator<T> {
 
         cctx.grid().cache(cctx.name()).remove(cur.getKey(), cur.getValue());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
index c415506..6d18b7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import javax.cache.Cache;
+import org.apache.ignite.internal.util.GridSerializableSet;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Key set based on provided entries with all remove operations backed
@@ -99,4 +101,4 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> {
 
         return e != null && F.isAll(e, filter);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
index 0413853..c497ac0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import javax.cache.Cache;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Store implementation wrapping {@link CacheLoader} and {@link CacheWriter}.
@@ -140,4 +142,4 @@ class GridCacheLoaderWriterStore<K, V> implements CacheStore<K, V>, LifecycleAwa
     @Override public void sessionEnd(boolean commit) {
         // No-op.
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStoreFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStoreFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStoreFactory.java
index 3e27894..73573bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStoreFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStoreFactory.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cache.store.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import javax.cache.integration.*;
+import javax.cache.configuration.Factory;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import org.apache.ignite.cache.store.CacheStore;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -56,4 +56,4 @@ class GridCacheLoaderWriterStoreFactory<K, V> implements Factory<CacheStore<K, V
 
         return new GridCacheLoaderWriterStore<>(ldr, writer);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
index e253b95..f86e445 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Logger which automatically attaches {@code [cacheName]} to every log statement.
@@ -185,4 +190,4 @@ class GridCacheLogger implements IgniteLogger, Externalizable {
     @Override public String toString() {
         return S.toString(GridCacheLogger.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManager.java
index ae7e9d7..5af97c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManager.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Interface for cache managers.
@@ -60,4 +60,4 @@ public interface GridCacheManager<K, V> {
      * NOTE: this method is for testing and profiling purposes only.
      */
     public void printMemoryStats();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java
index 54b1915..8ad0ea8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheManagerAdapter.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteFuture;
 
 /**
  * Convenience adapter for cache managers.
@@ -169,4 +169,4 @@ public class GridCacheManagerAdapter<K, V> implements GridCacheManager<K, V> {
     @Override public String toString() {
         return S.toString(GridCacheManagerAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 7adec56..e4882e5 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
@@ -17,34 +17,61 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.extras.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.offheap.unsafe.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.processors.dr.GridDrType.*;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.cache.Cache;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorResult;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.eviction.EvictableEntry;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+import org.apache.ignite.internal.processors.cache.extras.GridCacheEntryExtras;
+import org.apache.ignite.internal.processors.cache.extras.GridCacheMvccEntryExtras;
+import org.apache.ignite.internal.processors.cache.extras.GridCacheObsoleteEntryExtras;
+import org.apache.ignite.internal.processors.cache.extras.GridCacheTtlEntryExtras;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.version.GridCachePlainVersionedEntry;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionedEntryEx;
+import org.apache.ignite.internal.processors.dr.GridDrType;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_EXPIRED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_REMOVED;
+import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
 
 /**
  * Adapter for cache entry.
@@ -4047,4 +4074,4 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
             return "IteratorEntry [key=" + key + ']';
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
index 2c7c28d..0f8dae3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntryFactory.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.affinity.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Factory for cache entries.
@@ -41,4 +41,4 @@ public interface GridCacheMapEntryFactory {
         CacheObject val,
         @Nullable GridCacheMapEntry next,
         int hdrId);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index 67ac33d..4e737a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -17,20 +17,27 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
-
-import java.nio.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.managers.deployment.GridDeployment;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Parent of all cache messages.
@@ -642,4 +649,4 @@ public abstract class GridCacheMessage implements Message {
     @Override public String toString() {
         return S.toString(GridCacheMessage.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
index 223b23e..c63b6f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Future which waits for completion of one or more transactions.
@@ -115,4 +118,4 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
             "super", super.toString()
         );
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 83a108f..d1393ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -17,16 +17,26 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Replicated lock based on MVCC paradigm. This class ensures that locks are acquired
@@ -1261,4 +1271,4 @@ public final class GridCacheMvcc {
     @Override public String toString() { // Synchronize to ensure one-thread at a time.
         return S.toString(GridCacheMvcc.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCallback.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCallback.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCallback.java
index ab225ac..fc1faf7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCallback.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCallback.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
 
 /**
  * Lock and Unlock callbacks.
@@ -50,4 +50,4 @@ public interface GridCacheMvccCallback {
      * @param entry Entry
      */
     public void onFreed(GridDistributedCacheEntry entry);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
index 894e465..0e75d3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
@@ -17,20 +17,37 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.DHT_LOCAL;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.LOCAL;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.NEAR_LOCAL;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.OWNER;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.READY;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.REENTRY;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.REMOVED;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.SINGLE_IMPLICIT;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.TX;
+import static org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate.Mask.USED;
 
 /**
  * Lock candidate.
@@ -724,4 +741,4 @@ public class GridCacheMvccCandidate implements Externalizable,
             return sb.toString();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
index a26868f..67c1330 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
@@ -27,4 +27,4 @@ public interface GridCacheMvccFuture<T> extends GridCacheFuture<T> {
      * @return {@code True} if future cares about this entry.
      */
     public boolean onOwnerChanged(GridCacheEntryEx entry, GridCacheMvccCandidate owner);
-}
+}
\ No newline at end of file


[12/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
index 3bf8379..d3adbec 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lifecycle;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Node lifecycle event types. These events are used to notify lifecycle beans
@@ -63,4 +63,4 @@ public enum LifecycleEventType {
     @Nullable public static LifecycleEventType fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java
index 8a5db87..1e44376 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.logger;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * Interface for Ignite file appenders to attach node ID to log file names.
@@ -36,4 +36,4 @@ public interface LoggerNodeIdAware {
      * @return Node ID.
      */
     public UUID getNodeId();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java
index b30c365..71c7ba4 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.logger;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteLogger;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Logger which does not output anything.
@@ -88,4 +88,4 @@ public class NullLogger implements IgniteLogger {
     @Nullable @Override public String fileName() {
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
index e08ae64..4214b5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
@@ -17,19 +17,31 @@
 
 package org.apache.ignite.logger.java;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.logger.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-
-import static java.util.logging.Level.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.UUID;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.logger.LoggerNodeIdAware;
+import org.jetbrains.annotations.Nullable;
+
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.FINEST;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONSOLE_APPENDER;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET;
 
 /**
  * Logger to use with Java logging. Implementation simply delegates to Java Logging.
@@ -382,4 +394,4 @@ public class JavaLogger implements IgniteLogger, LoggerNodeIdAware {
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java
----------------------------------------------------------------------
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 830a51e..5acdc08 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
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.logger.java;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.UUID;
+import java.util.logging.FileHandler;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.StreamHandler;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * File logging handler which skips all the messages until node ID is set.
@@ -187,4 +191,4 @@ public final class JavaLoggerFileHandler extends StreamHandler {
     @Override public String toString() {
         return S.toString(JavaLoggerFileHandler.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java
index 5621559..be51d9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.logger.java;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.logging.Formatter;
-import java.util.logging.*;
+import java.util.logging.LogRecord;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Formatter for JUL logger.
@@ -76,4 +76,4 @@ public class JavaLoggerFormatter extends Formatter {
     @Override public String toString() {
         return S.toString(JavaLoggerFormatter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
index fd08a02..8c79a93 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.marshaller;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.io.GridByteArrayInputStream;
+import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for marshallers. Provides default implementations of methods
@@ -70,4 +71,4 @@ public abstract class AbstractMarshaller implements Marshaller {
             U.close(in, null);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
index c25e74e..a900771 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.marshaller;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code Marshaller} allows to marshal or unmarshal objects in grid. It provides
@@ -113,4 +113,4 @@ public interface Marshaller {
      * @throws IgniteCheckedException If unmarshalling failed.
      */
     public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
----------------------------------------------------------------------
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 dc131e8..252ddd6 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.marshaller;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Marshaller context.
@@ -51,4 +51,4 @@ public interface MarshallerContext {
      * @return {@code true} if the type is a system one, {@code false} otherwise.
      */
     public boolean isSystemType(String typeName);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java
index 5ea14c2..2701ead 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.marshaller;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.executor.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.management.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import javax.management.MBeanServer;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.internal.GridComponent;
+import org.apache.ignite.internal.GridLoggerProxy;
+import org.apache.ignite.internal.executor.GridExecutorService;
+import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Controls what classes should be excluded from marshalling by default.
@@ -150,4 +155,4 @@ public final class MarshallerExclusions {
     public static void clearCache() {
         cache.clear();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
index 8a61c41..566187f 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
@@ -17,12 +17,16 @@
 
 package org.apache.ignite.marshaller.jdk;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.AbstractMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implementation of {@link org.apache.ignite.marshaller.Marshaller} based on JDK serialization mechanism.
@@ -114,4 +118,4 @@ public class JdkMarshaller extends AbstractMarshaller {
     @Override public String toString() {
         return S.toString(JdkMarshaller.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java
index 7d5f70c..c19074e 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.marshaller.jdk;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Serializable object used for {@link Object} replacement.
@@ -27,4 +27,4 @@ class JdkMarshallerDummySerializable implements Serializable {
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java
index fb10b86..95ecb8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.marshaller.jdk;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Wrapper for {@link InputStream}.
@@ -78,4 +79,4 @@ class JdkMarshallerInputStreamWrapper extends InputStream {
     @Override public boolean markSupported() {
         return in.markSupported();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java
index 7a10aaf..03256e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.marshaller.jdk;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This class defines custom JDK object input stream.
@@ -60,4 +62,3 @@ class JdkMarshallerObjectInputStream extends ObjectInputStream {
         return super.resolveObject(o);
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java
index 13f603e..9053289 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.marshaller.jdk;
 
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines own object output stream.
@@ -42,4 +43,3 @@ class JdkMarshallerObjectOutputStream extends ObjectOutputStream {
             o.getClass().equals(Object.class) ? new JdkMarshallerDummySerializable() : super.replaceObject(o);
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java
index 5e17639..df370c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.marshaller.jdk;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * Wrapper for {@link OutputStream}.
@@ -56,4 +57,4 @@ class JdkMarshallerOutputStreamWrapper extends OutputStream {
     @Override public void flush() throws IOException {
         out.flush();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
index 05ef534..a4f4cdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
@@ -17,19 +17,76 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.lang.reflect.Modifier.*;
-import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.MarshallerExclusions;
+import sun.misc.Unsafe;
+
+import static java.lang.reflect.Modifier.isFinal;
+import static java.lang.reflect.Modifier.isPrivate;
+import static java.lang.reflect.Modifier.isStatic;
+import static java.lang.reflect.Modifier.isTransient;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ARRAY_LIST;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CLS;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DATE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE_ARR;
 import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ENUM;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.EXTERNALIZABLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_MAP;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET_MAP_OFF;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_MAP;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_SET;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_LIST;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.OBJ_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.PROPS;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SERIALIZABLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.STR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.UUID;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.computeSerialVersionUid;
 
 /**
  * Class descriptor.
@@ -962,4 +1019,4 @@ class OptimizedClassDescriptor {
             return fields.get(i);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java
index 3840dfd..aca7ce4 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java
@@ -47,4 +47,4 @@ enum OptimizedFieldType {
 
     /** */
     OTHER
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
index accfeb7..d47f787 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.AbstractMarshaller;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import sun.misc.Unsafe;
 
 /**
  * Optimized implementation of {@link org.apache.ignite.marshaller.Marshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.JdkMarshaller},
@@ -292,4 +296,4 @@ public class OptimizedMarshaller extends AbstractMarshaller {
 
         U.clearClassCache(ldr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java
index e4e2627..91d07df 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java
@@ -30,4 +30,4 @@ public interface OptimizedMarshallerIdMapper {
      * @return Type ID.
      */
     public int typeId(String clsName);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index fafdea1..4abbd04 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -17,19 +17,23 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.IOException;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import sun.misc.Unsafe;
 
 /**
  * Miscellaneous utility methods to facilitate {@link OptimizedMarshaller}.
@@ -510,4 +514,4 @@ class OptimizedMarshallerUtils {
     static void setObject(Object obj, long off, Object val) {
         UNSAFE.putObject(obj, off, val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
index 78190ea..ce9ee0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
@@ -17,19 +17,82 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.NotActiveException;
+import java.io.ObjectInputStream;
+import java.io.ObjectInputValidation;
+import java.io.ObjectStreamClass;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.io.GridDataInput;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.MarshallerContext;
+import sun.misc.Unsafe;
+
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ARRAY_LIST;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CLS;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DATE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ENUM;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.EXTERNALIZABLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HANDLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_MAP;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET_MAP_OFF;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK_MARSH;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_MAP;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_SET;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_LIST;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.NULL;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.OBJ_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.PROPS;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SERIALIZABLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT_ARR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.STR;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.UUID;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setBoolean;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setByte;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setChar;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setDouble;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setFloat;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setInt;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setLong;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setObject;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setShort;
 
 /**
  * Optimized object input stream.
@@ -1156,4 +1219,4 @@ class OptimizedObjectInputStream extends ObjectInputStream {
             return objs[fieldInfo.getIndex(name)] != null ? (T)objs[fieldInfo.getIndex(name)] : dflt;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
index 82ae129..d884564 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
@@ -17,19 +17,49 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.NotActiveException;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.GridHandleTable;
+import org.apache.ignite.internal.util.io.GridDataOutput;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.MarshallerContext;
+
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HANDLE;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK_MARSH;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.NULL;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getBoolean;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getByte;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getChar;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getDouble;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getFloat;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getInt;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getLong;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getObject;
+import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getShort;
 
 /**
  * Optimized object output stream.
@@ -865,4 +895,4 @@ class OptimizedObjectOutputStream extends ObjectOutputStream {
             objs[i] = F.t(info.type(), val);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java
index ae28015..e0e4872 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.marshaller.optimized;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.IOException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.io.GridUnsafeDataInput;
+import org.apache.ignite.internal.util.io.GridUnsafeDataOutput;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Storage for object streams.
@@ -221,4 +222,4 @@ class OptimizedObjectStreamRegistry {
             }
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
index 2a17363..c5b1cc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
@@ -17,16 +17,25 @@
 
 package org.apache.ignite.marshaller.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.portable.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.portable.GridPortableMarshaller;
+import org.apache.ignite.internal.portable.PortableContext;
+import org.apache.ignite.marshaller.AbstractMarshaller;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableObject;
+import org.apache.ignite.portable.PortableProtocolVersion;
+import org.apache.ignite.portable.PortableSerializer;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Implementation of {@link org.apache.ignite.marshaller.Marshaller} that lets to serialize and deserialize all objects
@@ -344,4 +353,3 @@ public class PortableMarshaller extends AbstractMarshaller {
         }
     }
 }
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
index 04b640f..deca648 100644
--- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
+++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
@@ -17,14 +17,18 @@
 
 package org.apache.ignite.messaging;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience actor-base adapter for {@link IgniteMessaging#localListen(Object, IgniteBiPredicate)}
@@ -228,4 +232,4 @@ public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID,
     @Override public String toString() {
         return S.toString(MessagingListenActor.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java
index 5cdc72f..0b6c8a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.mxbean;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-
-import javax.cache.management.*;
+import javax.cache.management.CacheMXBean;
+import javax.cache.management.CacheStatisticsMXBean;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMetrics;
 
 /**
  * This interface defines JMX view on {@link IgniteCache}.
@@ -322,4 +322,4 @@ public interface CacheMetricsMXBean extends CacheStatisticsMXBean, CacheMXBean,
     /** {@inheritDoc} */
     @MXBeanDescription("True when a cache is in write-through mode.")
     public boolean isWriteThrough();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
index a3c946d..ea3a57a 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.mxbean;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterMetrics;
 
 /**
  * MBean for local node metrics.
@@ -250,4 +250,4 @@ public interface ClusterLocalNodeMetricsMXBean extends ClusterMetrics {
     /** {@inheritDoc} */
     @MXBeanDescription("Total number of nodes.")
     public int getTotalNodes();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index cb63c4b..4755bf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.mxbean;
 
-import javax.management.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
+import javax.management.JMException;
 
 /**
  * This interface defines JMX view on kernal.
@@ -365,4 +366,4 @@ public interface IgniteMXBean {
      */
     @MXBeanDescription("Prints last suppressed errors.")
     public void printLastErrors();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
index 106c38b..2ee2def 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
@@ -148,4 +148,4 @@ public interface IgnitionMXBean {
         }
     )
     public void restart(boolean cancel);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
----------------------------------------------------------------------
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 dfc759c..3c191bf 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.mxbean;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Provides description for MBean classes and methods.
@@ -31,4 +35,4 @@ public @interface MXBeanDescription {
      * Description for Mbean.
      */
     @SuppressWarnings({"JavaDoc"}) public String value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
----------------------------------------------------------------------
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 1337e07..def4083 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.mxbean;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Provides MBean method parameters description.
@@ -31,4 +35,4 @@ public @interface MXBeanParametersDescriptions {
      * Array of descriptions for parameters.
      */
     @SuppressWarnings({"JavaDoc"}) public String[] value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
----------------------------------------------------------------------
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 3fc7885..fa7c20e 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
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.mxbean;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Provides MBean method parameters names.
@@ -31,4 +35,4 @@ public @interface MXBeanParametersNames {
      * Array of parameter names in MBean.
      */
     @SuppressWarnings({"JavaDoc"}) public String[] value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
index 5e48574..f312a1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
@@ -149,4 +149,4 @@ public interface ThreadPoolMXBean {
      */
     @MXBeanDescription("Class name of thread factory used to create new threads.")
     public String getThreadFactoryClass();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
index 2bb0996..d4331b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.plugin;
 
+import java.io.Serializable;
 import org.apache.ignite.configuration.CacheConfiguration;
 
-import java.io.*;
-
 /**
  * Cache plugin configuration. It is a point to extend existing {@link CacheConfiguration} 
  * and extend existing functionality of cache.
@@ -33,4 +32,4 @@ public interface CachePluginConfiguration<K, V> extends Serializable {
      * @param ctx Plugin context.
      */
     public CachePluginProvider createProvider(CachePluginContext ctx);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
index f034312..b8869ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.plugin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.spi.discovery.DiscoverySpi;
 
 /**
@@ -62,4 +64,4 @@ public interface CachePluginContext<C extends CachePluginConfiguration> {
      * @return Logger.
      */
     public IgniteLogger log(Class<?> cls);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
----------------------------------------------------------------------
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 ea5f795..11550ec 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
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.plugin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache plugin provider is a point for processing of properties 
@@ -81,4 +81,4 @@ public interface CachePluginProvider<C extends CachePluginConfiguration> {
      */
     public void validateRemote(CacheConfiguration locCfg, C locPluginCcfg, CacheConfiguration rmtCfg, ClusterNode rmtNode)
         throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java b/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
index cd6e479..c02902e 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
@@ -22,4 +22,4 @@ package org.apache.ignite.plugin;
  */
 public interface Extension {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
index d7c977f..0ff82ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
@@ -29,4 +29,4 @@ public interface ExtensionRegistry {
      * @param <T> Extension type.
      */
     public <T extends Extension> void registerExtension(Class<T> extensionItf, T extensionImpl);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
index 7a8a99a..bbe6d61 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
@@ -22,4 +22,4 @@ package org.apache.ignite.plugin;
  */
 public interface IgnitePlugin {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
index 1a4e2dc..ef92b54 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
@@ -22,4 +22,4 @@ package org.apache.ignite.plugin;
  */
 public interface PluginConfiguration {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
index b519bd1..f9b6aef 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.plugin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.spi.*;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.spi.IgnitePortProtocol;
 import org.apache.ignite.spi.discovery.DiscoverySpi;
 
-import java.util.*;
-
 /**
  * Plugin context.
  */
@@ -96,4 +96,4 @@ public interface PluginContext {
      * @param cls Class.
      */
     public void deregisterPorts(Class<?> cls);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java
index 7dd2ae7..5d36738 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.plugin;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown if plugin is not found.
@@ -38,4 +38,4 @@ public class PluginNotFoundException extends IgniteException {
     public PluginNotFoundException(String name) {
         super("Ignite plugin not found: " + name);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
----------------------------------------------------------------------
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 f064fde..47acf0f 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
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.plugin;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ServiceLoader;
+import java.util.UUID;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Pluggable Ignite component.
@@ -135,4 +135,4 @@ public interface PluginProvider<C extends PluginConfiguration> {
      * @throws PluginValidationException If cluster-wide plugin validation failed.
      */
     public void validateNewNode(ClusterNode node) throws PluginValidationException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java
index 31f334f..bb71b56 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.plugin;
 
-import org.apache.ignite.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
 
 /**
  * TODO: Add class description.
@@ -65,4 +64,4 @@ public class PluginValidationException extends IgniteException {
     public String remoteMessage() {
         return rmtMsg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java
index e87b82c..3d6504d 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import org.apache.ignite.plugin.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Executor;
+import org.apache.ignite.plugin.Extension;
 
 /**
  * The interface of IO Messaging Pool Extension.
@@ -39,4 +38,4 @@ public interface IoPool extends Extension {
      * @return The executor.
      */
     public Executor executor();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index 7755858..67f3351 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import java.io.*;
-import java.nio.*;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
 
 /**
  * Base class for all communication messages.
@@ -55,4 +55,4 @@ public interface Message extends Serializable {
      * @return Fields count.
      */
     public byte fieldsCount();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java
index ecb79cb..2134912 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Enum representing possible types of collection items.
@@ -98,4 +98,4 @@ public enum MessageCollectionItemType {
     @Nullable public static MessageCollectionItemType fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
index 4e0ea8a..bfae912 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.plugin.Extension;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Factory for communication messages.
@@ -38,4 +38,4 @@ public interface MessageFactory extends Extension {
      * @return Message instance.
      */
     @Nullable public Message create(byte type);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java
index 85f6045..4c9e0ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import org.apache.ignite.plugin.*;
+import org.apache.ignite.plugin.Extension;
 
 /**
  * Provides a custom format for communication messages.
@@ -45,4 +45,4 @@ public interface MessageFormatter extends Extension {
      * @return Message reader.
      */
     public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
----------------------------------------------------------------------
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 11ea97d..d40a384 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
@@ -17,10 +17,13 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import org.apache.ignite.lang.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Communication message reader.
@@ -269,4 +272,4 @@ public interface MessageReader {
      * Increments read state.
      */
     public void incrementState();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
----------------------------------------------------------------------
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 777f2e6..2fef564 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
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.plugin.extensions.communication;
 
-import org.apache.ignite.lang.*;
-
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Communication message writer.
@@ -313,4 +315,4 @@ public interface MessageWriter {
      * Resets this writer.
      */
     public void reset();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
----------------------------------------------------------------------
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 a10a96d..16e282d 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
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.plugin.security;
 
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.UUID;
 
 /**
  * Authentication context.
@@ -107,4 +107,4 @@ public class AuthenticationContext {
     public void address(InetSocketAddress addr) {
         this.addr = addr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
index f3b0e24..392aa3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
@@ -17,12 +17,14 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Security credentials used for node authentication. Security credentials
@@ -188,4 +190,4 @@ public class SecurityCredentials implements Externalizable {
     @Override public String toString() {
         return S.toString(SecurityCredentials.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
index 90b3352..7a12392 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Basic implementation for {@link SecurityCredentialsProvider}. Use it
@@ -41,4 +41,4 @@ public class SecurityCredentialsBasicProvider implements SecurityCredentialsProv
     @Override public SecurityCredentials credentials() throws IgniteCheckedException {
         return cred;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
index 4f65437..19bd5b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Security credentials provider for specifying security credentials.
@@ -41,4 +41,4 @@ public interface SecurityCredentialsProvider {
      * @throws IgniteCheckedException If failed.
      */
     public SecurityCredentials credentials() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
index 84fa5a4..12706ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Common security exception for the grid.
@@ -58,4 +58,4 @@ public class SecurityException extends IgniteException {
     public SecurityException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
index 0e660d2..9f63c1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Supported security permissions within grid. Permissions
@@ -69,4 +69,4 @@ public enum SecurityPermission {
     @Nullable public static SecurityPermission fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
index aa5a139..eecc169 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Security permission set for authorized security subjects. Permission set
@@ -63,4 +63,4 @@ public interface SecurityPermissionSet extends Serializable {
      * @return Collection of system-wide permissions.
      */
     @Nullable public Collection<SecurityPermission> systemPermissions();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
index d14666f..1cf403a 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.plugin.security;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.Serializable;
+import java.net.InetSocketAddress;
+import java.util.UUID;
 
 /**
  * Security subject representing authenticated node with a set of permissions.
@@ -59,4 +59,4 @@ public interface SecuritySubject extends Serializable {
      * @return Authorized permission set for the subject.
      */
     public SecurityPermissionSet permissions();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
index f625a3a..2481539 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.plugin.security;
 
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Supported security subject types. Subject type can be retrieved form {@link SecuritySubject#type()} method.
@@ -46,4 +46,4 @@ public enum SecuritySubjectType {
     @Nullable public static SecuritySubjectType fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java
index df310cd..69ec1ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java
@@ -46,4 +46,4 @@ public enum SegmentationPolicy {
      * implement logic to handle this event.
      */
     NOOP
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java
index e34cf61..3cdfddb 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.plugin.segmentation;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
 
 /**
  * This is interface for segmentation (a.k.a "split-brain" problem) resolvers.
@@ -62,4 +61,4 @@ public interface SegmentationResolver extends Serializable {
      * @throws IgniteCheckedException If an error occurred.
      */
     public abstract boolean isValidSegment() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
index a899c46..377fcdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgnitePortables;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable object builder. Provides ability to build portable objects dynamically without having class definitions.
@@ -135,4 +134,4 @@ public interface PortableBuilder {
      * @throws PortableException In case of error.
      */
     public PortableObject build() throws PortableException;
-}
+}
\ No newline at end of file


[13/82] [abbrv] [partial] ignite git commit: master - imports

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index 002596b..d6c7fab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray;
 
 /**
  * Data transfer object for node configuration data.
@@ -227,4 +228,4 @@ public class VisorGridConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorGridConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index 3bd27b4..e85484d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -17,17 +17,22 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_CONFIG_PATH;
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_URI;
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_USER_NAME;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
 
 /**
  * Data transfer object for IGFS configuration properties.
@@ -389,4 +394,4 @@ public class VisorIgfsConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorIgfsConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
index 3e0f9cc..396c7f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray;
 
 /**
  * Data transfer object for node lifecycle configuration properties.
@@ -58,4 +57,4 @@ public class VisorLifecycleConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorLifecycleConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
index e76adac..c5ff882 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for node metrics configuration properties.
@@ -77,4 +76,4 @@ public class VisorMetricsConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorMetricsConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java
index e257443..109b1d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
 
 /**
  * Grid configuration data collect job.
@@ -44,4 +44,4 @@ public class VisorNodeConfigurationCollectorJob extends VisorJob<Void, VisorGrid
     @Override public String toString() {
         return S.toString(VisorNodeConfigurationCollectorJob.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java
index e4ed188..0f43a6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.visor.*;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Grid configuration data collect task.
@@ -32,4 +32,4 @@ public class VisorNodeConfigurationCollectorTask extends VisorOneNodeTask<Void,
     @Override protected VisorNodeConfigurationCollectorJob job(Void arg) {
         return new VisorNodeConfigurationCollectorJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 4d601d2..1deabe5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -17,23 +17,28 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.cache.*;
-import org.apache.ignite.internal.visor.compute.*;
-import org.apache.ignite.internal.visor.igfs.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
+import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.cache.VisorCache;
+import org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder;
+import org.apache.ignite.internal.visor.igfs.VisorIgfs;
+import org.apache.ignite.internal.visor.igfs.VisorIgfsEndpoint;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isIgfsCache;
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isSystemCache;
+import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.COMPUTE_MONITORING_HOLDER_KEY;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.VISOR_TASK_EVTS;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.checkExplicitTaskMonitoring;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.collectEvents;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.log;
 
 /**
  * Job that collects data from node.
@@ -225,4 +230,4 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
     @Override public String toString() {
         return S.toString(VisorNodeDataCollectorJob.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
index 134447c..0c90aa8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.internal.visor.cache.*;
-import org.apache.ignite.internal.visor.event.*;
-import org.apache.ignite.internal.visor.igfs.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.internal.visor.cache.VisorCache;
+import org.apache.ignite.internal.visor.event.VisorGridEvent;
+import org.apache.ignite.internal.visor.igfs.VisorIgfs;
+import org.apache.ignite.internal.visor.igfs.VisorIgfsEndpoint;
 
 /**
  * Data collector job result.
@@ -189,4 +190,4 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
     public void errorCount(long errorCount) {
         errCnt = errorCount;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index 3b2d45c..395cddb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -17,18 +17,22 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.internal.visor.util.VisorExceptionWrapper;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped;
 
 /**
  * Collects current Grid state mostly topology and metrics.
@@ -134,4 +138,4 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
         if (jobRes.igfssEx() != null)
             taskRes.igfssEx().put(nid, new VisorExceptionWrapper(jobRes.igfssEx()));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java
index 7be546d..975dd28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Data collector task arguments.
@@ -140,4 +140,4 @@ public class VisorNodeDataCollectorTaskArg implements Serializable {
     public void systemCaches(boolean sysCaches) {
         this.sysCaches = sysCaches;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
index 1a4eb02..9ca1232 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
@@ -17,13 +17,18 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.internal.visor.cache.*;
-import org.apache.ignite.internal.visor.event.*;
-import org.apache.ignite.internal.visor.igfs.*;
-import org.apache.ignite.internal.visor.util.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.internal.visor.cache.VisorCache;
+import org.apache.ignite.internal.visor.event.VisorGridEvent;
+import org.apache.ignite.internal.visor.igfs.VisorIgfs;
+import org.apache.ignite.internal.visor.igfs.VisorIgfsEndpoint;
+import org.apache.ignite.internal.visor.util.VisorExceptionWrapper;
 
 /**
  * Data collector task result.
@@ -169,4 +174,4 @@ public class VisorNodeDataCollectorTaskResult implements Serializable {
     public Map<UUID, Long> errorCounts() {
         return errCnts;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
index 3b3d8dd..f219908 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
@@ -17,23 +17,33 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.event.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.events.DeploymentEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.internal.visor.event.VisorGridEvent;
+import org.apache.ignite.internal.visor.util.VisorEventMapper;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVTS_JOB_EXECUTION;
+import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.EVT_MAPPER;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.concat;
 
 /**
  * Task that runs on specified node and returns events data.
@@ -320,4 +330,4 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
             return S.toString(VisorNodeEventsCollectorJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
index 12e186b..42afc73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
@@ -17,15 +17,19 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task to run gc on nodes.
@@ -95,4 +99,4 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
             return S.toString(VisorNodeGcJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
index 64c8376..f59ea01 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping other node.
@@ -77,4 +78,4 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
             return S.toString(VisorNodePingJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java
index 5c54434..bb29371 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Restarts nodes.
@@ -75,4 +75,4 @@ public class VisorNodeRestartTask extends VisorMultiNodeTask<Void, Void, Void> {
     @Override protected VisorNodesRestartJob job(Void arg) {
         return new VisorNodesRestartJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java
index 659dab9..16bf5d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Stops nodes.
@@ -75,4 +75,4 @@ public class VisorNodeStopTask extends VisorMultiNodeTask<Void, Void, Void> {
             return S.toString(VisorNodesStopJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java
index 9fc1cc4..1f673ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java
@@ -17,16 +17,20 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.IgniteExceptionRegistry;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.internal.visor.util.VisorExceptionWrapper;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Task to collect last errors on nodes.
@@ -106,4 +110,4 @@ public class VisorNodeSuppressedErrorsTask extends VisorMultiNodeTask<Map<UUID,
             return S.toString(VisorNodeSuppressedErrorsJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
index 5c4f8fc..622aa6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray;
 
 /**
  * Data transfer object for node P2P configuration properties.
@@ -80,4 +79,4 @@ public class VisorPeerToPeerConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorPeerToPeerConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
index e2ac497..c5ab55a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-import static java.lang.System.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.System.getProperty;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_HOST;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.intValue;
 
 /**
  * Create data transfer object for node REST configuration properties.
@@ -154,4 +156,4 @@ public class VisorRestConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorRestConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
index ebc8252..84365dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray;
 
 /**
  * Data transfer object for node segmentation configuration properties.
@@ -103,4 +102,4 @@ public class VisorSegmentationConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorSegmentationConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 4afb90f..c576426 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -17,17 +17,20 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactObject;
 
 /**
  * Data transfer object for node SPIs configuration properties.
@@ -230,4 +233,4 @@ public class VisorSpisConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorSpisConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
index 773f9dd..419350d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.visor.node;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
 
 /**
  * Data transfer object for transaction configuration.
@@ -113,4 +113,4 @@ public class VisorTransactionConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorTransactionConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
index 5050414..843dfce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Arguments for {@link VisorQueryTask}.
@@ -78,4 +78,4 @@ public class VisorQueryArg implements Serializable {
     public int pageSize() {
         return pageSize;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
index 5ceb300..c1f06ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
@@ -17,18 +17,24 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped;
 
 /**
  * Task for cleanup not needed SCAN or SQL queries result futures from node local.
@@ -117,4 +123,4 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
             return S.toString(VisorQueryCleanupJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
index a587b89..3d5c58d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Wrapper for query cursor.
@@ -92,4 +92,4 @@ public class VisorQueryCursor<T> implements Iterator<T>, AutoCloseable {
     @Override public String toString() {
         return S.toString(VisorQueryCursor.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
index cd97c7c..3191e56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for query field type description.
@@ -103,4 +102,4 @@ public class VisorQueryField implements Serializable {
     @Override public String toString() {
         return S.toString(VisorQueryField.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index bd9fb1e..40c5cc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -17,22 +17,31 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.util.VisorExceptionWrapper;
+import org.apache.ignite.lang.IgniteBiTuple;
+
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.RMV_DELAY;
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_COL_NAMES;
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_QRY_NAME;
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.SQL_QRY_NAME;
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.fetchScanQueryRows;
+import static org.apache.ignite.internal.visor.query.VisorQueryUtils.fetchSqlQueryRows;
 
 /**
  * Job for execute SCAN or SQL query and get first page of results.
@@ -175,4 +184,4 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
     @Override public String toString() {
         return S.toString(VisorQueryJob.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index a3ff089..52a167d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Task for collecting next page previously executed SQL or SCAN query.
@@ -133,4 +134,4 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
             return S.toString(VisorQueryNextPageJob.class, this);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
index 48c26b9..b086f7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Result for cache query tasks.
@@ -76,4 +75,4 @@ public class VisorQueryResult implements Serializable {
     @Override public String toString() {
         return S.toString(VisorQueryResult.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
index 35f08b3..218cb36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Result for cache query tasks.
@@ -85,4 +86,4 @@ public class VisorQueryResultEx extends VisorQueryResult {
     @Override public String toString() {
         return S.toString(VisorQueryResultEx.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 98c876a..d996f6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.internal.visor.util.VisorExceptionWrapper;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Task for execute SCAN or SQL query and get first page of results.
@@ -34,4 +34,4 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, IgniteBiTupl
     @Override protected VisorQueryJob job(VisorQueryArg arg) {
         return new VisorQueryJob(arg, debug);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index be1d15d..e89093f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -17,12 +17,15 @@
 
 package org.apache.ignite.internal.visor.query;
 
-import org.apache.ignite.internal.util.*;
-
-import javax.cache.*;
-import java.math.*;
-import java.net.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import javax.cache.Cache;
+import org.apache.ignite.internal.util.IgniteUtils;
 
 /**
  * Contains utility methods for Visor query tasks and jobs.
@@ -192,4 +195,4 @@ public class VisorQueryUtils {
 
         return rows;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java
index 0cca514..831e520 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.visor.util;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
 
 /**
  * Exception to throw from Visor tasks in case of empty topology.
@@ -34,4 +34,4 @@ public class VisorClusterGroupEmptyException extends ClusterGroupEmptyException
     public VisorClusterGroupEmptyException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
index b9ff1aa..7e3ae96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
@@ -17,13 +17,21 @@
 
 package org.apache.ignite.internal.visor.util;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.visor.event.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.DeploymentEvent;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.events.JobEvent;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.visor.event.VisorGridDeploymentEvent;
+import org.apache.ignite.internal.visor.event.VisorGridDiscoveryEvent;
+import org.apache.ignite.internal.visor.event.VisorGridEvent;
+import org.apache.ignite.internal.visor.event.VisorGridJobEvent;
+import org.apache.ignite.internal.visor.event.VisorGridTaskEvent;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Mapper from grid event to Visor data transfer object.
@@ -86,4 +94,4 @@ public class VisorEventMapper implements IgniteClosure<Event, VisorGridEvent> {
         return map(evt, evt.type(), evt.id(), evt.name(), evt.node().id(), evt.timestamp(), evt.message(),
             evt.shortDisplay());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java
index d2ae0e1..c47c3c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java
@@ -78,4 +78,4 @@ public class VisorExceptionWrapper extends Throwable {
     @Override public String toString() {
         return (detailMsg != null) ? (clsName + ": " + detailMsg) : clsName;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
index 0a76f98..1792e04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
@@ -17,11 +17,12 @@
 
 package org.apache.ignite.internal.visor.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Map;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Helper class to get MIME type.
@@ -1016,4 +1017,4 @@ public class VisorMimeTypes {
 
         return null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 6636a08..579f50c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -17,37 +17,70 @@
 
 package org.apache.ignite.internal.visor.util;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.eviction.fifo.*;
-import org.apache.ignite.cache.eviction.lru.*;
-import org.apache.ignite.cache.eviction.random.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.event.*;
-import org.apache.ignite.internal.visor.file.*;
-import org.apache.ignite.internal.visor.log.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.charset.*;
-import java.nio.file.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.zip.*;
-
-import static java.lang.System.*;
-import static org.apache.ignite.configuration.FileSystemConfiguration.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.net.InetAddress;
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.file.Path;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicyMBean;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicyMBean;
+import org.apache.ignite.cache.eviction.random.RandomEvictionPolicyMBean;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.processors.igfs.IgfsEx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.event.VisorGridEvent;
+import org.apache.ignite.internal.visor.event.VisorGridEventsLost;
+import org.apache.ignite.internal.visor.file.VisorFileBlock;
+import org.apache.ignite.internal.visor.log.VisorLogFile;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.jetbrains.annotations.Nullable;
+
+import static java.lang.System.getProperty;
+import static org.apache.ignite.configuration.FileSystemConfiguration.DFLT_IGFS_LOG_DIR;
+import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOY_FAILED;
+import static org.apache.ignite.events.EventType.EVT_JOB_CANCELLED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED;
+import static org.apache.ignite.events.EventType.EVT_JOB_FAILED_OVER;
+import static org.apache.ignite.events.EventType.EVT_JOB_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_JOB_REJECTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_STARTED;
+import static org.apache.ignite.events.EventType.EVT_JOB_TIMEDOUT;
+import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOY_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
+import static org.apache.ignite.events.EventType.EVT_TASK_STARTED;
+import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT;
 
 /**
  * Contains utility methods for Visor tasks and jobs.
@@ -871,4 +904,4 @@ public class VisorTaskUtils {
 
         return bos.toByteArray();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java
----------------------------------------------------------------------
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 be05a38..50a8700 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
@@ -39,4 +39,4 @@ public interface IgniteAsyncSupport {
      * @return Future for previous asynchronous operation.
      */
     public <R> IgniteFuture<R> future();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java
index e70c07a..1bb7162 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.lang;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotation to indicate that method can be executed asynchronously if async mode is enabled.
@@ -34,4 +38,4 @@ import java.lang.annotation.*;
 @Target(ElementType.METHOD)
 public @interface IgniteAsyncSupported {
 
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java
index 0920805..0afd597 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Defines generic closure with two parameters. Bi-Closure is a simple executable which
@@ -36,4 +36,4 @@ public interface IgniteBiClosure<E1, E2, R> extends Serializable {
      * @return Closure return value.
      */
     public abstract R apply(E1 e1, E2 e2);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java
index 15f44da..0d99c73 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Closure with two in-parameters and void return type.
@@ -33,4 +33,4 @@ public interface IgniteBiInClosure<E1, E2> extends Serializable {
      * @param e2 Second parameter.
      */
     public void apply(E1 e1, E2 e2);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java
index 1e57a9b..4aeb451 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Defines a predicate which accepts two parameters and returns {@code true} or {@code false}.
@@ -34,4 +34,4 @@ public interface IgniteBiPredicate<E1, E2> extends Serializable {
      * @return Return value.
      */
     public boolean apply(E1 e1, E2 e2);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
index d1b75a4..6098007 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
@@ -17,13 +17,21 @@
 
 package org.apache.ignite.lang;
 
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Convenience class representing mutable tuple of two values.
@@ -293,4 +301,4 @@ public class IgniteBiTuple<V1, V2> implements Map<V1, V2>, Map.Entry<V1, V2>,
     @Override public String toString() {
         return S.toString(IgniteBiTuple.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java
index 2e80c23..d94da21 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
-import java.util.concurrent.*;
+import java.io.Serializable;
+import java.util.concurrent.Callable;
 
 /**
  * Grid-aware adapter for {@link Callable} implementations. It adds {@link Serializable} interface
@@ -26,4 +26,4 @@ import java.util.concurrent.*;
  * like in {@link org.apache.ignite.IgniteCompute#call(IgniteCallable)} method.
  */
 public interface IgniteCallable<V> extends Callable<V>, Serializable {
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
index 70570c9..4bc1a4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Defines generic closure with one parameter. Closure is a simple executable which accepts a parameter and
@@ -37,4 +37,4 @@ public interface IgniteClosure<E, R> extends Serializable {
      * @return Closure return value.
      */
     public R apply(E e);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
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 cb12a76..df1ab88 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
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.lang;
 
-import org.apache.ignite.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
 
 /**
  * Future with simplified exception handling, functional programming support
@@ -124,4 +124,4 @@ public interface IgniteFuture<V> {
      * @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);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java
index f0c01a2..2c4b8a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.lang;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future computation cannot be retrieved because it was cancelled.
@@ -55,4 +55,4 @@ public class IgniteFutureCancelledException extends IgniteException {
     public IgniteFutureCancelledException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java
index c2f8945..4e94f96 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.lang;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Future computation completion is timed out.
@@ -55,4 +55,4 @@ public class IgniteFutureTimeoutException extends IgniteException {
     public IgniteFutureTimeoutException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java
index f0faaef..81630f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Closure with one in-parameter and void return type.
@@ -31,4 +31,4 @@ public interface IgniteInClosure<E> extends Serializable {
      * @param e Closure argument.
      */
     public void apply(E e);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java
index 1f92ed4..1c7803b 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.lang;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotations should be used to mark any type that should not be
@@ -38,4 +42,4 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE})
 public @interface IgniteNotPeerDeployable {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java
index eb9eddb..3e514fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Closure that does not take any parameters and returns a value.
@@ -31,4 +31,4 @@ public interface IgniteOutClosure<T> extends Serializable {
      * @return Return value.
      */
     public T apply();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
index 367a69d..92bc121 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Defines a predicate which accepts a parameter and returns {@code true} or {@code false}.
@@ -32,4 +32,4 @@ public interface IgnitePredicate<E> extends Serializable {
      * @return Return value.
      */
     public boolean apply(E e);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
index afdf06d..9826b6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
@@ -17,14 +17,17 @@
 
 package org.apache.ignite.lang;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.regex.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents node version.
@@ -292,4 +295,4 @@ public class IgniteProductVersion implements Comparable<IgniteProductVersion>, E
         else
             throw new IllegalStateException("Failed to parse version: " + verStr);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java
index 7055a9d..27145bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.lang;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Defines generic reducer that collects multiple values and reduces them into one.
@@ -48,4 +47,4 @@ public interface IgniteReducer<E, R> extends Serializable {
      * @return Reduced value.
      */
     public R reduce();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
index 5cae9e6..38d2364 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lang;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Grid-aware adapter for {@link Runnable} implementations. It adds {@link Serializable} interface
@@ -26,4 +26,4 @@ import java.io.*;
  */
 public interface IgniteRunnable extends Runnable, Serializable {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/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 57e2c0d..5c6bb9a 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
@@ -17,13 +17,17 @@
 
 package org.apache.ignite.lang;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.util.lang.GridIterator;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This is a faster performing version of {@link UUID}. On basic tests this version is at least
@@ -212,4 +216,4 @@ public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<Ignite
     @Override public String toString() {
         return shortString() + '-' + gid.toString();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
index 364ddea..45af9d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lifecycle;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * All components provided in Ignite configuration can implement this interface.
@@ -38,4 +38,4 @@ public interface LifecycleAware {
      * @throws IgniteException If failed.
      */
     public void stop() throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
index 4132500..80688ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.lifecycle;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * A bean that reacts to node lifecycle events defined in {@link LifecycleEventType}.
@@ -100,4 +100,4 @@ public interface LifecycleBean {
      * @throws IgniteException Thrown in case of any errors.
      */
     public void onLifecycleEvent(LifecycleEventType evt) throws IgniteException;
-}
+}
\ No newline at end of file