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:26 UTC

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

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