http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 ff39293..4efb03f 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,9 +17,9 @@
 
 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.apache.ignite.internal.util.lang.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 265e2e2..b6ff701 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 2c2e4ce..a9b7ffc 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,9 +17,9 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.io.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.io.*;
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 cff8da0..46c56cd 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
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 445ead8..804a2e5 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,11 +17,12 @@
 
 package org.apache.ignite.internal.util;
 
-import 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.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
+
 import java.lang.ref.*;
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 c0e99fd..cb0109d 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,11 +17,12 @@
 
 package org.apache.ignite.internal.util;
 
-import 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.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
+
 import java.lang.ref.*;
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 b8f54d2..33ecacc 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,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import 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.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 9a7cdd6..d686ca6 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
@@ -22,8 +22,8 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
-import java.lang.management.ManagementFactory;
-import java.nio.charset.Charset;
+import java.lang.management.*;
+import java.nio.charset.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 2be44d6..e8df22e 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
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.lang.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 965c98c..f8c1c95 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 bfb32c1..bd41f9a 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,9 +17,9 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jdk8.backport.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 11bd153..05a089c 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,7 +17,6 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.*;
 import sun.misc.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 30a0ec7..b90c4a9 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
@@ -18,9 +18,9 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 e081c05..2f98200 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,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
 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.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 812d902..9744ef1 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 e840b7c..ddaaf5c 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
@@ -18,9 +18,9 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 4d2ef1c..e964d60 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
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.internal.util.typedef.internal.*;
+
 import java.io.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 aa61abd..2a16ac3 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 28824d0..80577f8 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 9e51a6a..b2b2dac 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
@@ -18,9 +18,8 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.spi.*;
 
 /**
  * Wrapper used to covert {@link 
org.apache.ignite.spi.IgniteSpiCloseableIterator} to {@link 
GridCloseableIterator}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 a7f6e3b..c6cb628 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.concurrent.locks.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocal.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocal.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocal.java
index cd6720d..8e94e89 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocal.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocal.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.worker.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocalEx.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocalEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocalEx.java
index 6867e98..a8f01f3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocalEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridThreadLocalEx.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util;
 
-import org.apache.ignite.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.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 418ce02..d1eeb9c 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,7 +17,7 @@
 
 package org.apache.ignite.internal.util;
 
-import sun.misc.Unsafe;
+import sun.misc.*;
 
 import java.lang.reflect.*;
 import java.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 89dd52d..7538f12 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
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.CacheEntry;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
@@ -26,22 +27,22 @@ 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.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.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.portables.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.internal.managers.deployment.*;
 import org.apache.ignite.internal.processors.streamer.*;
-import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.internal.transactions.*;
 import org.apache.ignite.internal.util.io.*;
 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.portables.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.transactions.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
index 05f7ffb..f0c2361 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
@@ -18,12 +18,12 @@
 package org.apache.ignite.internal.util.direct;
 
 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.lang.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.version.*;
 import org.apache.ignite.internal.processors.clock.*;
+import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.nio.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
index 9b3863c..de9ac4a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
@@ -18,13 +18,13 @@
 package org.apache.ignite.internal.util.direct;
 
 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.lang.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.version.*;
 import org.apache.ignite.internal.processors.clock.*;
+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.lang.*;
 import org.jetbrains.annotations.*;
 import sun.misc.*;
 import sun.nio.ch.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 22bf910..f8ffcff 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
@@ -21,10 +21,10 @@ 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.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.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 85b898c..b5e3294 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 e3df9f5..41f0ba4 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
@@ -19,9 +19,9 @@ package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 f2cc7cf..32924f2 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
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
index 6daf3b2..f7eb9d9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFutureEx.java
@@ -19,9 +19,9 @@ package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 6bde5f7..42128c4 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
@@ -19,9 +19,9 @@ package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
index dcd7e56..aecf727 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapterEx.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 7caba83..0599053 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
@@ -18,9 +18,9 @@
 package org.apache.ignite.internal.util.future;
 
 import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Future listener to fill chained future with converted result of the source 
future.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 54a9ae6..c01536c 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
@@ -19,6 +19,7 @@ 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.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 54cf80f..bc1b68e 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
@@ -20,6 +20,7 @@ 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 d0067c7..02b10a5 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
@@ -18,9 +18,9 @@
 package org.apache.ignite.internal.util.ipc;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.ipc.loopback.*;
 import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 /**
  * Ggfs endpoint factory for inter-process communication.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 f201b9b..fc22651 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
@@ -18,9 +18,9 @@
 package org.apache.ignite.internal.util.ipc.loopback;
 
 import org.apache.ignite.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 d421440..27a234f 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.ipc.shmem;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.ipc.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.io.*;
 import java.net.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 8c6f8ec..5bae4e7 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
@@ -19,16 +19,16 @@ package org.apache.ignite.internal.util.ipc.shmem;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.thread.*;
 import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridComputeJobWrapper.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridComputeJobWrapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridComputeJobWrapper.java
index b77da7d..82c0078 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridComputeJobWrapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridComputeJobWrapper.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 a45398a..77df627 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
@@ -24,10 +24,10 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
 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.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 8888d74..3711547 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
@@ -18,10 +18,11 @@
 package org.apache.ignite.internal.util.lang;
 
 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.tostring.*;
 import org.jetbrains.annotations.*;
+
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 9d793fc..b85acd8 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
@@ -18,11 +18,12 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.cluster.*;
-import 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.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
+
 import java.util.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 83a6492..8e274b7 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 3c7c73d..5ab4fb4 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,9 +17,9 @@
 
 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.apache.ignite.internal.util.tostring.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 9666359..310e0fb 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,9 +17,9 @@
 
 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.apache.ignite.internal.util.tostring.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 4fd84ce..578f5a8 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,9 +17,9 @@
 
 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.apache.ignite.internal.util.tostring.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 2f6ec56..1f8b330 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,9 +17,9 @@
 
 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.apache.ignite.internal.util.tostring.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 5d0a16e..6945ac3 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 51cd8b3..ed01add 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient closure subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 a633df7..a7a276d 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient closure subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 edcd305..2fcc930 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient in-closure subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 27c521a..8abb94a 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient in-closure subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 91df053..84aea09 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient out-closure subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 35dfe3f..decc7fc 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
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
+
 import java.io.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 618c2f9..a7ed105 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient predicate subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 e2fed62..4e54fb2 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient predicate subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 b84a3d5..e2033d3 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.lang;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Convenient reducer subclass that allows for thrown grid exception. This 
class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 283f266..23d1f79 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.nio;
 
 import org.apache.ignite.*;
-import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.util.direct.*;
+import org.apache.ignite.spi.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 f8f2ecd..b3ed8e7 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
@@ -18,8 +18,8 @@
 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.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.io.*;
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 39dd291..693dfbd 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.nio;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 d38d98f..fa923f7 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.nio;
 
 import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 a1987e5..03df52e 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
@@ -19,9 +19,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.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 f8623bc..52b7fed 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util.nio;
 
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 f0a2222..08a9937 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
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.util.nio;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 666fcea..7bf52e1 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
@@ -21,14 +21,14 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.thread.*;
 import org.apache.ignite.internal.util.direct.*;
 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.thread.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 import sun.nio.ch.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 e1d44a2..cdb422d 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
@@ -18,8 +18,8 @@
 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.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 5cbc506..2d908ae 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
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.util.nio;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.util.direct.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.jetbrains.annotations.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
 
 import java.io.*;
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 70dfb7a..be8a4e8 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.nio.ssl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.nio.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import javax.net.ssl.*;
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 8b4f4d1..ac22d74 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.nio.ssl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.nio.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 import javax.net.ssl.*;
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
index 1c9572d..44306ab 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
@@ -18,9 +18,9 @@
 package org.apache.ignite.internal.util.nodestart;
 
 import org.apache.ignite.*;
-import org.apache.ignite.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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 3f5c1e1..9f4e4b4 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,9 +17,9 @@
 
 package org.apache.ignite.internal.util.offheap;
 
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 e5cdc45..06a83a7 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,9 +17,9 @@
 
 package org.apache.ignite.internal.util.offheap;
 
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 4073876..0be313e 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,9 +17,9 @@
 
 package org.apache.ignite.internal.util.offheap.unsafe;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 77acb43..229f4f2 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
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.util.offheap.unsafe;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
 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.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 c35d93b..343c08b 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
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.util.offheap.unsafe;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
 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.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 7ed1419..2d52875 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteClosure} by 
extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 f0c7441..1d674b9 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiClosure} by 
extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 acff92e..a5396c7 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteInClosure} by 
extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 2d36b01..11d40a8 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiInClosure} 
by extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 0c30788..77d0ac0 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteOutClosure} 
by extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 d28eda8..8e33a40 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgnitePredicate} by 
extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 ffe8ac9..d043e2b 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiPredicate} 
by extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 5542c43..12021b9 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.typedef;
 
 import org.apache.ignite.cache.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;CacheEntry&lt;K, 
V&gt;&gt;</tt> by extending

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 3c44611..23d7548 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.typedef;
 
 import org.apache.ignite.events.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;GridEvent&gt;</tt> by 
extending

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 b3f798d..5a51709 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate2&lt;K, V&gt;</tt> by extending

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 debff27..cdecb8e 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
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.util.typedef;
 
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;GridNode&gt;</tt> by 
extending

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 625321b..214d128 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.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteReducer} by 
extending it. Since Java doesn't provide type aliases

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/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 d948d40..face0ff 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,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.lang.*;
 
 import java.io.*;
 

Reply via email to