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

[15/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/typedef/C3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
index 51c839d..ead3bf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridClosure3;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridClosure3} by extending it. Since Java doesn't provide type aliases
@@ -32,4 +33,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridClosure3
  *
  */
-public interface C3<E1, E2, E3, R> extends GridClosure3<E1, E2, E3, R> { /* No-op. */ }
+public interface C3<E1, E2, E3, R> extends GridClosure3<E1, E2, E3, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
index 720427a..2e455b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsClosure;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsClosure} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ public abstract class CA extends GridAbsClosure {
     /** */
     private static final long serialVersionUID = 0L;
  /* No-op. */
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
index 6668ea6..d4d53f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsClosureX;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsClosureX} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CAX extends GridAbsClosureX {
     /** */
     private static final long serialVersionUID = 0L;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
index a5396c7..32d2b0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteInClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteInClosure} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteInClosure
  */
-public interface CI1<T> extends IgniteInClosure<T> { /* No-op. */ }
+public interface CI1<T> extends IgniteInClosure<T> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
index 11d40a8..723613a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CI2.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiInClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiInClosure} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteBiInClosure
  */
-public interface CI2<E1, E2> extends IgniteBiInClosure<E1, E2> { /* No-op. */ }
+public interface CI2<E1, E2> extends IgniteBiInClosure<E1, E2> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
index 325ab41..82fcc57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteInClosureX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteInClosureX} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CIX1<T> extends IgniteInClosureX<T> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
index beb6318..697b494 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteInClosure2X} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CIX2<E1, E2> extends IgniteInClosure2X<E1, E2> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
index e828a99..e61f8d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CIX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridInClosure3X;
 
 /**
  * Defines {@code alias} for {@link GridInClosure3X} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +27,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridInClosure3X
  */
-public abstract class CIX3<E1, E2, E3> extends GridInClosure3X<E1, E2, E3> { /* No-op. */ }
+public abstract class CIX3<E1, E2, E3> extends GridInClosure3X<E1, E2, E3> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
index 77d0ac0..c161565 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CO.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteOutClosure;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteOutClosure} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteOutClosure
  */
-public interface CO<T> extends IgniteOutClosure<T> { /* No-op. */ }
+public interface CO<T> extends IgniteOutClosure<T> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
index cf17452..82b4ab5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/COX.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteOutClosureX} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class COX<T> extends IgniteOutClosureX<T> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
index 1ee5ea4..0a99473 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteClosureX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteClosureX} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CX1<E1, R> extends IgniteClosureX<E1, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
index c4341a3..2362171 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteClosure2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteClosure2X} by extending it. Since Java doesn't provide type aliases
@@ -32,4 +33,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CX2<E1, E2, R> extends IgniteClosure2X<E1, E2, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
index b6ba3cb..2c6dfce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridClosure3X;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridClosure3X} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridClosure3X
  */
-public abstract class CX3<E1, E2, E3, R> extends GridClosure3X<E1, E2, E3, R> { /* No-op. */ }
+public abstract class CX3<E1, E2, E3, R> extends GridClosure3X<E1, E2, E3, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
index 3a61b42..0c3e170 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/F.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridFunc} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +26,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class F extends GridFunc { /* No-op. */ }
+public class F extends GridFunc { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
index aed778f..fbf8e3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/G.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.*;
+import org.apache.ignite.Ignition;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.Ignition} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +26,4 @@ import org.apache.ignite.*;
  * @see org.apache.ignite.Ignition
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class G extends Ignition { /* No-op. */ }
+public class G extends Ignition { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
index 8e33a40..b9cf5dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgnitePredicate} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgnitePredicate
  */
-public interface P1<E1> extends IgnitePredicate<E1> { /* No-op. */ }
+public interface P1<E1> extends IgnitePredicate<E1> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
index d043e2b..1d1e161 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P2.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiPredicate} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteBiPredicate
  */
-public interface P2<T1, T2> extends IgniteBiPredicate<T1, T2> { /* No-op. */ }
+public interface P2<T1, T2> extends IgniteBiPredicate<T1, T2> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
index b4698f4..6f53163 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/P3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridPredicate3;
 
 /**
  * Defines {@code alias} for {@link GridPredicate3} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridPredicate3
  */
-public interface P3<T1, T2, T3> extends GridPredicate3<T1, T2, T3> { /* No-op. */ }
+public interface P3<T1, T2, T3> extends GridPredicate3<T1, T2, T3> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
index 7322a78..249ec05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PA.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsPredicate} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +27,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridAbsPredicate
  */
-public interface PA extends GridAbsPredicate { /* No-op. */ }
+public interface PA extends GridAbsPredicate { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
index 2cb97b1..8317dfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PAX.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
+import org.apache.ignite.internal.util.lang.GridFunc;
 
 /**
  * Defines {@code alias} for {@link GridAbsPredicateX} by extending it. Since Java doesn't provide type aliases
@@ -26,4 +28,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridAbsPredicate
  */
-public abstract class PAX extends GridAbsPredicateX { /* No-op. */ }
+public abstract class PAX extends GridAbsPredicateX { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
index 2139c70..03fa8bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-
-import javax.cache.*;
+import javax.cache.Cache;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 
 /**
@@ -31,4 +30,4 @@ import javax.cache.*;
  * @see org.apache.ignite.lang.IgnitePredicate
  * @see GridFunc
  */
-public interface PCE<K, V> extends IgnitePredicate<Cache.Entry<K, V>> { /* No-op. */ }
+public interface PCE<K, V> extends IgnitePredicate<Cache.Entry<K, V>> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
index ab86b4a..d01240f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;GridEvent&gt;</tt> by extending
@@ -30,4 +30,4 @@ import org.apache.ignite.lang.*;
  * @see org.apache.ignite.events.Event
  * @see GridFunc
  */
-public interface PE extends IgnitePredicate<Event> { /* No-op. */ }
+public interface PE extends IgnitePredicate<Event> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
index 5a51709..69236d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PKV.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteBiPredicate;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate2&lt;K, V&gt;</tt> by extending
@@ -28,4 +28,4 @@ import org.apache.ignite.lang.*;
  * @see org.apache.ignite.lang.IgniteBiPredicate
  * @see GridFunc
  */
-public interface PKV<K, V> extends IgniteBiPredicate<K, V> { /* No-op. */ }
+public interface PKV<K, V> extends IgniteBiPredicate<K, V> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
index cdecb8e..c706873 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Defines {@code alias} for <tt>GridPredicate&lt;GridNode&gt;</tt> by extending
@@ -30,4 +30,4 @@ import org.apache.ignite.lang.*;
  * @see org.apache.ignite.cluster.ClusterNode
  * @see GridFunc
  */
-public interface PN extends IgnitePredicate<ClusterNode> { /* No-op. */ }
+public interface PN extends IgnitePredicate<ClusterNode> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
index 54be2dc8..2ebae34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgnitePredicateX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgnitePredicateX} by extending it. Since Java doesn't provide type aliases
@@ -30,4 +31,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class PX1<E1> extends IgnitePredicateX<E1> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
index 674abd9..42d7373 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgnitePredicate2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgnitePredicate2X} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class PX2<T1, T2> extends IgnitePredicate2X<T1, T2> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
index a6d959a..e81cbb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridPredicate3X;
 
 /**
  * Defines {@code alias} for {@link GridPredicate3X} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +30,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see GridPredicate3X
  */
-public abstract class PX3<T1, T2, T3> extends GridPredicate3X<T1, T2, T3> { /* No-op. */ }
+public abstract class PX3<T1, T2, T3> extends GridPredicate3X<T1, T2, T3> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
index 214d128..b9e894c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R1.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.lang.IgniteReducer;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteReducer} by extending it. Since Java doesn't provide type aliases
@@ -29,4 +29,4 @@ import org.apache.ignite.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.lang.IgniteReducer
  */
-public interface R1<E1, R> extends IgniteReducer<E1, R> { /* No-op. */ }
+public interface R1<E1, R> extends IgniteReducer<E1, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
index 82fdc45..3a11818 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer2;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer2} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +29,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.internal.util.lang.IgniteReducer2
  */
-public interface R2<E1, E2, R> extends IgniteReducer2<E1, E2, R> { /* No-op. */ }
+public interface R2<E1, E2, R> extends IgniteReducer2<E1, E2, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
index 4b3f11f..bf6cc7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/R3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer3;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer3} by extending it. Since Java doesn't provide type aliases
@@ -28,4 +29,4 @@ import org.apache.ignite.internal.util.lang.*;
  * @see GridFunc
  * @see org.apache.ignite.internal.util.lang.IgniteReducer3
  */
-public interface R3<E1, E2, E3, R> extends IgniteReducer3<E1, E2, E3, R> { /* No-op. */ }
+public interface R3<E1, E2, E3, R> extends IgniteReducer3<E1, E2, E3, R> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
index 186f0c9..2576b2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX1.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducerX;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducerX} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class RX1<E1, R> extends IgniteReducerX<E1, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
index f6b5eb4..38fcaf6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX2.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer2X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer2X} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class RX2<E1, E2, R> extends IgniteReducer2X<E1, E2, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
index 0e9fa55..dc52dfd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/RX3.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.IgniteReducer3X;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.internal.util.lang.IgniteReducer3X} by extending it. Since Java doesn't provide type aliases
@@ -31,4 +32,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class RX3<E1, E2, E3, R> extends IgniteReducer3X<E1, E2, E3, R> {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
index b096c4d..4150e3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T1.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
 
 /**
  * Defines {@code alias} for {@link GridTuple} by extending it. Since Java doesn't provide type aliases
@@ -48,4 +48,4 @@ public class T1<V> extends GridTuple<V> {
     public T1(V val) {
         super(val);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
index face0ff..a58272a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T2.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.lang.IgniteBiTuple;
 
 /**
  * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiTuple} by extending it. Since Java doesn't provide type aliases
@@ -49,4 +49,4 @@ public class T2<V1, V2> extends IgniteBiTuple<V1, V2> {
     public T2(V1 val1, V2 val2) {
         super(val1, val2);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
index a6b8c65..febac32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T3.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple3;
 
 /**
  * Defines {@code alias} for {@link GridTuple3} by extending it. Since Java doesn't provide type aliases
@@ -49,4 +50,4 @@ public class T3<V1, V2, V3> extends GridTuple3<V1, V2, V3> {
     public T3(V1 val1, V2 val2, V3 val3) {
         super(val1, val2, val3);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
index be0408f..21e0f0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T4.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple4;
 
 /**
  * Defines {@code alias} for {@link GridTuple4} by extending it. Since Java doesn't provide type aliases
@@ -50,4 +51,4 @@ public class T4<V1, V2, V3, V4> extends GridTuple4<V1, V2, V3, V4> {
     public T4(V1 val1, V2 val2, V3 val3, V4 val4) {
         super(val1, val2, val3, val4);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
index 7257ad0..a653126 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T5.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple5;
 
 /**
  * Defines {@code alias} for {@link GridTuple5} by extending it. Since Java doesn't provide type aliases
@@ -51,4 +52,4 @@ public class T5<V1, V2, V3, V4, V5> extends GridTuple5<V1, V2, V3, V4, V5> {
     public T5(V1 v1, V2 v2, V3 v3, V4 v4, V5 v5) {
         super(v1, v2, v3, v4, v5);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
index a83c562..d968b8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/T6.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.internal.util.lang.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.lang.GridFunc;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple6;
 
 /**
  * Defines {@code alias} for {@link GridTuple6} by extending it. Since Java doesn't provide type aliases
@@ -52,4 +53,4 @@ public class T6<V1, V2, V3, V4, V5, V6> extends GridTuple6<V1, V2, V3, V4, V5, V
     public T6(V1 v1, V2 v2, V3 v3, V4 v4, V5 v5, V6 v6) {
         super(v1, v2, v3, v4, v5, v6);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
index fc9dad0..65b89bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
@@ -17,19 +17,30 @@
 
 package org.apache.ignite.internal.util.typedef;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.Array;
-import java.lang.reflect.*;
-import java.sql.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.GridLeanMap;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
 
 /**
  * Defines global scope.
@@ -878,4 +889,4 @@ public final class X {
             return dflt;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
index 920681b..6d19e05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/A.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridArgumentCheck;
 
 /**
  * Defines internal {@code typedef} for {@link GridArgumentCheck}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class A extends GridArgumentCheck { /* No-op. */ }
+public class A extends GridArgumentCheck { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
index 3562a06..cc8b4f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/CU.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 
 /**
  * Defines internal {@code typedef} for {@link GridCacheUtils}. Since Java doesn't provide type aliases
@@ -27,4 +27,4 @@ import org.apache.ignite.internal.processors.cache.*;
 @SuppressWarnings({"ExtendsUtilityClass"})
 public final class CU extends GridCacheUtils {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
index 4e5d042..1efda3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridDebug;
 
 /**
  * Convenience alias for {@link GridDebug} class.
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
 @SuppressWarnings("ExtendsUtilityClass")
 public class D extends GridDebug {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
index 3b65dc5..3476517 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPC.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridPlainCallable;
 
 /**
  * Defines internal {@code typedef} for {@link GridPlainCallable}. Since Java doesn't provide type aliases
  * (like Scala, for example) we resort to these types of measures. This is intended for internal
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
-public interface GPC<T> extends GridPlainCallable<T> { /* No-op. */ }
+public interface GPC<T> extends GridPlainCallable<T> { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
index f7d4c3e..4248a5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/GPR.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridPlainRunnable;
 
 /**
  * Defines internal {@code typedef} for {@link GridPlainRunnable}. Since Java doesn't provide type aliases
  * (like Scala, for example) we resort to these types of measures. This is intended for internal
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
-public interface GPR extends GridPlainRunnable { /* No-op. */ }
+public interface GPR extends GridPlainRunnable { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
index 3428993..3a0c5a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/LT.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridLogThrottle;
 
 /**
  * Defines internal {@code typedef} for {@link GridLogThrottle}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class LT extends GridLogThrottle { /* No-op. */ }
+public class LT extends GridLogThrottle { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
index 39d5c69..259d688 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/S.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
 
 /**
  * Defines internal {@code typedef} for {@link GridToStringBuilder}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.tostring.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class S extends GridToStringBuilder { /* No-op. */ }
+public class S extends GridToStringBuilder { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
index 9fd88c0..79176e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/SB.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridStringBuilder;
 
 /**
  * Defines internal {@code typedef} for {@link GridStringBuilder}. Since Java doesn't provide type aliases
@@ -60,4 +60,4 @@ public class SB extends GridStringBuilder {
     public SB(CharSequence seq) {
         super(seq);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
index 05c76b46..d5bc0b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.typedef.internal;
 
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.IgniteUtils;
 
 /**
  * Defines internal {@code typedef} for {@link IgniteUtils}. Since Java doesn't provide type aliases
@@ -25,4 +25,4 @@ import org.apache.ignite.internal.util.*;
  * use only and meant to provide for more terse code when readability of code is not compromised.
  */
 @SuppressWarnings({"ExtendsUtilityClass"})
-public class U extends IgniteUtils { /* No-op. */ }
+public class U extends IgniteUtils { /* No-op. */ }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
index 99fa270..499c097 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Extension to standard {@link Runnable} interface. Adds proper details to be used
@@ -262,4 +264,4 @@ public abstract class GridWorker implements Runnable {
             "interrupted", (runner != null ? runner.isInterrupted() : "unknown"),
             "runner", (runner == null ? "null" : runner.getName()));
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
index e1d156a..75323a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
 
 /**
  * Future for locally executed closure that defines cancellation logic.
@@ -50,4 +50,4 @@ public class GridWorkerFuture<T> extends GridFutureAdapter<T> {
 
         this.w = w;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
index 2abc75e..e4b39ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * This interface defines worker listener.
@@ -32,4 +32,4 @@ public interface GridWorkerListener extends EventListener {
      * @param w Stopped worker.
      */
     public void onStopped(GridWorker w);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
index 954a35b..c6f688b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerListenerAdapter.java
@@ -30,4 +30,4 @@ public class GridWorkerListenerAdapter implements GridWorkerListener {
     @Override public void onStopped(GridWorker w) {
         /* No-op. */
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
index 9a7b936..f015b62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerPool.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.util.worker;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.compute.ComputeExecutionRejectedException;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Pool of runnable workers. This class automatically takes care of
@@ -113,4 +114,4 @@ public class GridWorkerPool {
                 Thread.currentThread().interrupt();
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
index 8a017a4..0c89f99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
@@ -17,14 +17,15 @@
 
 package org.apache.ignite.internal.visor;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logFinish;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logStart;
 
 /**
  * Base class for Visor jobs.
@@ -81,4 +82,4 @@ public abstract class VisorJob<A, R> extends ComputeJobAdapter {
      * @throws IgniteException In case of error.
      */
     protected abstract R run(@Nullable A arg) throws IgniteException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
index 9eda849..57f1346 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
@@ -17,17 +17,24 @@
 
 package org.apache.ignite.internal.visor;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logFinish;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logStart;
 
 /**
  * Base class for Visor tasks intended to query data from a multiple node.
@@ -123,4 +130,4 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
                 logFinish(ignite.log(), getClass(), start);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
index 351ebc5..e4880a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.visor;
 
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.util.typedef.F;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for Visor tasks intended to query data from a single node.
@@ -38,4 +37,4 @@ public abstract class VisorOneNodeTask<A, R> extends VisorMultiNodeTask<A, R, R>
 
         throw res.getException();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
index 1a4e498..255bd75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java
@@ -17,8 +17,10 @@
 
 package org.apache.ignite.internal.visor;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
 
 /**
  * Visor tasks argument.
@@ -103,4 +105,4 @@ public class VisorTaskArgument<A> implements Serializable {
     public boolean debug() {
         return debug;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 9e15d2d..937121d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -17,23 +17,31 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
+import org.apache.ignite.internal.util.lang.IgnitePair;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Data transfer object for {@link IgniteCache}.
@@ -398,4 +406,4 @@ public class VisorCache implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCache.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index 0256c93..7aa6215 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -17,15 +17,14 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
 
 /**
  * Data transfer object for affinity configuration properties.
@@ -114,4 +113,4 @@ public class VisorCacheAffinityConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheAffinityConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
index af68e9f..fba8a0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java
@@ -17,11 +17,13 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Data transfer object for aggregated cache metrics.
@@ -458,4 +460,4 @@ public class VisorCacheAggregatedMetrics implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheAggregatedMetrics.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index 2ba489d..1f1a6fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.resources.JobContextResource;
 
 /**
  * Task that clears specified caches on specified node.
@@ -186,4 +191,4 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple<
             return 0;
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index b983039..073ad22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -17,16 +17,19 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
+import java.io.Serializable;
+import java.util.Collection;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
 
 /**
  * Data transfer object for cache configuration properties.
@@ -347,4 +350,4 @@ public class VisorCacheConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(VisorCacheConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
index c8913c6..c872d98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Job that collect cache metrics from node.
@@ -73,4 +74,4 @@ public class VisorCacheConfigurationCollectorJob
     @Override public String toString() {
         return S.toString(VisorCacheConfigurationCollectorJob.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
index a92dd3c..49e8de4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.visor.cache;
 
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.internal.visor.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Task that collect cache metrics from all nodes.
@@ -36,4 +36,4 @@ public class VisorCacheConfigurationCollectorTask
     @Override protected VisorCacheConfigurationCollectorJob job(Collection<IgniteUuid> arg) {
         return new VisorCacheConfigurationCollectorJob(arg, debug);
     }
-}
+}
\ No newline at end of file

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

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