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

[42/64] [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/compute/gridify/GridifySetToValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
index 0fa069b..96f17b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.compute.gridify;
 
-import java.io.*;
-import java.lang.annotation.*;
+import java.io.Serializable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * {@code GridifySetToValue} annotation is the way to grid-enable existing code with specific semantics.
@@ -194,4 +198,4 @@ public @interface GridifySetToValue {
      * Refer to {@link org.apache.ignite.Ignition} for information about named grids.
      */
     String gridName() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
index 7103462..cf62936 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskAdapter.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.compute.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeTaskAdapter;
 
 /**
  * Convenience adapter for tasks that work with {@link Gridify} annotation
@@ -36,4 +35,4 @@ public abstract class GridifyTaskAdapter<R> extends ComputeTaskAdapter<GridifyAr
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
index 47622b9..3937127 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifyTaskSplitAdapter.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.compute.gridify;
 
-import org.apache.ignite.compute.*;
-
-import java.util.*;
+import java.util.List;
+import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 
 /**
  * Convenience adapter for tasks that work with {@link Gridify} annotation
@@ -36,4 +35,4 @@ public abstract class GridifyTaskSplitAdapter<R> extends ComputeTaskSplitAdapter
     private static final long serialVersionUID = 0L;
 
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
index 27f785f..a9de23d 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyArgumentAdapter.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Convenience adapter for {@link org.apache.ignite.compute.gridify.GridifyArgument} interface. This adapter
@@ -193,4 +194,4 @@ public class GridifyArgumentAdapter implements GridifyArgument {
     @Override public String toString() {
         return S.toString(GridifyArgumentAdapter.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
index a645246..0a3ce3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
@@ -17,18 +17,38 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.ComputeTaskContinuousMapper;
+import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyJobAdapter;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoadBalancerResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.resources.TaskContinuousMapperResource;
+import org.apache.ignite.resources.TaskSessionResource;
+
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Default gridify task which simply executes a method on remote node.
@@ -229,4 +249,4 @@ public class GridifyDefaultRangeTask extends ComputeTaskAdapter<GridifyRangeArgu
 
         return inputPerNode;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
index d78de74..d04f133 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeLoadBalancer;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.compute.gridify.GridifyArgument;
+import org.apache.ignite.internal.util.gridify.GridifyJobAdapter;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoadBalancerResource;
 
 /**
  * Default gridify task which simply executes a method on remote node.
@@ -109,4 +114,4 @@ public class GridifyDefaultTask extends ComputeTaskAdapter<GridifyArgument, Obje
 
         return res.getData();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
index 5d46fcf..ea03982 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToSetAbstractAspect.java
@@ -17,16 +17,21 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.compute.gridify.GridifyInput;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifySetToSet;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.gridify.GridifyUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Convenience adapter with common methods for different aspect implementations
@@ -165,4 +170,4 @@ public class GridifySetToSetAbstractAspect {
 
         return GridifyUtils.collectionToParameter(cls, res);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
index 4241fce..9207fc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifySetToValueAbstractAspect.java
@@ -17,16 +17,23 @@
 
 package org.apache.ignite.compute.gridify.aop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.compute.gridify.*;
-import org.apache.ignite.internal.compute.*;
-import org.apache.ignite.internal.util.gridify.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.gridify.GridifyUtils.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.compute.gridify.GridifyInput;
+import org.apache.ignite.compute.gridify.GridifyNodeFilter;
+import org.apache.ignite.compute.gridify.GridifySetToValue;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.util.gridify.GridifyArgumentBuilder;
+import org.apache.ignite.internal.util.gridify.GridifyRangeArgument;
+import org.apache.ignite.internal.util.gridify.GridifyUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.util.gridify.GridifyUtils.UNKNOWN_SIZE;
 
 /**
  * Convenience adapter with common methods for different aspect implementations
@@ -194,4 +201,4 @@ public class GridifySetToValueAbstractAspect {
 
         return res.iterator().next();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java b/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
index 7170dac..3ecc494 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/AddressResolver.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-
-import java.net.*;
-import java.util.*;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  * Provides resolution between external and internal addresses. In some cases
@@ -40,4 +39,4 @@ public interface AddressResolver {
      * @throws IgniteCheckedException Thrown if any exception occurs.
      */
     public Collection<InetSocketAddress> getExternalAddresses(InetSocketAddress addr) throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
index 6a7051e..6649b5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/AtomicConfiguration.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Configuration for atomic data structures.
@@ -102,4 +102,4 @@ public class AtomicConfiguration {
     @Override public String toString() {
         return S.toString(AtomicConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index af2bbe8..792bb28 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -17,23 +17,38 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import javax.cache.Cache;
+import javax.cache.configuration.CompleteConfiguration;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.ExpiryPolicy;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.CacheInterceptor;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cache.affinity.AffinityKeyMapper;
+import org.apache.ignite.cache.eviction.EvictionFilter;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines grid cache configuration. This configuration is passed to
@@ -1843,4 +1858,4 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
             return obj.getClass().equals(this.getClass());
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
index 5a1ae0a..5ea5074 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
@@ -17,16 +17,17 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
+import java.io.Serializable;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  * Configuration for Ignite collections.
@@ -160,4 +161,4 @@ public class CollectionConfiguration implements Serializable {
     @Override public String toString() {
         return S.toString(CollectionConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
index 98753e2..88d015c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
@@ -17,15 +17,13 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.ssl.*;
-
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import javax.net.ssl.*;
-import java.net.*;
+import java.net.Socket;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.ssl.SslContextFactory;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * REST access configuration.
@@ -547,4 +545,4 @@ public class ConnectorConfiguration {
     public void setMessageInterceptor(ConnectorMessageInterceptor interceptor) {
         msgInterceptor = interceptor;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
index e11f6fa..d832374 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.configuration;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface for user-defined object interceptors.
@@ -42,4 +42,4 @@ public interface ConnectorMessageInterceptor {
      * @return Object which should be send to remote client instead of original.
      */
     @Nullable public Object onSend(Object obj);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java b/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
index 9d49a2e..7bed39c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/DeploymentMode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.configuration;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid deployment mode. Deployment mode is specified at grid startup via
@@ -178,4 +178,4 @@ public enum DeploymentMode {
     @Nullable public static DeploymentMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
index d589cf7..888f927 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.secondary.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} configuration. More than one file system can be configured within grid.
@@ -791,4 +792,4 @@ public class FileSystemConfiguration {
     @Override public String toString() {
         return S.toString(FileSystemConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
index 3a7f877..51aa291 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlanner;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Ignite Hadoop Accelerator configuration.
@@ -173,4 +173,4 @@ public class HadoopConfiguration {
     @Override public String toString() {
         return S.toString(HadoopConfiguration.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 1fa1de4..3d38ed9 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -17,55 +17,63 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.events.*;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.util.Map;
+import java.util.UUID;
+import javax.cache.configuration.Factory;
+import javax.cache.event.CacheEntryListener;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheLoader;
+import javax.cache.processor.EntryProcessor;
+import javax.management.MBeanServer;
+import javax.net.ssl.SSLContext;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.CacheStoreSessionListener;
+import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.services.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.spi.checkpoint.noop.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.spi.collision.noop.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.deployment.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.apache.ignite.spi.eventstorage.memory.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.spi.indexing.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.ssl.*;
-
-import javax.cache.configuration.*;
-import javax.cache.event.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import javax.cache.processor.*;
-import javax.management.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.lang.management.*;
-import java.util.*;
-
-import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.*;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lifecycle.LifecycleBean;
+import org.apache.ignite.lifecycle.LifecycleEventType;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.plugin.PluginConfiguration;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
+import org.apache.ignite.plugin.segmentation.SegmentationResolver;
+import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi;
+import org.apache.ignite.spi.collision.CollisionSpi;
+import org.apache.ignite.spi.collision.noop.NoopCollisionSpi;
+import org.apache.ignite.spi.communication.CommunicationSpi;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.deployment.DeploymentSpi;
+import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.eventstorage.EventStorageSpi;
+import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi;
+import org.apache.ignite.spi.failover.FailoverSpi;
+import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
+import org.apache.ignite.spi.indexing.IndexingSpi;
+import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi;
+import org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi;
+import org.apache.ignite.spi.swapspace.SwapSpaceSpi;
+import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
+import org.apache.ignite.ssl.SslContextFactory;
+
+import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.STOP;
 
 /**
  * This class defines grid runtime configuration. This configuration is passed to
@@ -2397,4 +2405,4 @@ public class IgniteConfiguration {
     @Override public String toString() {
         return S.toString(IgniteConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
index af73737..e7fd6b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.internal.util.typedef.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import javax.cache.CacheException;
+import javax.cache.configuration.Factory;
+import org.apache.ignite.internal.util.typedef.F;
 
 /**
  * Factory implementation that use reflection to create instance of given class.
@@ -284,4 +284,4 @@ public class IgniteReflectionFactory<T> implements Factory<T> {
 
         return false;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
index 580010a..bbaa030 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import javax.cache.configuration.MutableConfiguration;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.eviction.EvictionPolicy;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
-import javax.cache.configuration.*;
-
-import static org.apache.ignite.configuration.CacheConfiguration.*;
+import static org.apache.ignite.configuration.CacheConfiguration.DFLT_NEAR_START_SIZE;
 
 /**
  * Client cache configuration.
@@ -98,4 +97,4 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
     @Override public String toString() {
         return S.toString(NearCacheConfiguration.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
index 14d5e1d..20eb124 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
@@ -22,4 +22,4 @@ package org.apache.ignite.configuration;
  */
 public class PlatformConfiguration {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
index 995d7a5..ef9284d 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.cluster.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterNode;
 
 /**
  * Topology validator.
@@ -32,4 +31,4 @@ public interface TopologyValidator extends Serializable {
      * @return is topology valid or not.
      */
     boolean validate(Collection<ClusterNode> nodes);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index 5fed59f..7d3cebb 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.transactions.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
 
 /**
  * Transactions configuration.
@@ -225,4 +226,4 @@ public class TransactionConfiguration implements Serializable {
     public void setTxManagerLookupClassName(String tmLookupClsName) {
         this.tmLookupClsName = tmLookupClsName;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
index eb02e8e..29aeb3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
@@ -17,15 +17,17 @@
 
 package org.apache.ignite.events;
 
+import java.util.UUID;
 import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * In-memory database (cache) event.
@@ -337,4 +339,4 @@ public class CacheEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
index 0cc47f1..ed33ccc 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache query execution event.
@@ -235,4 +235,4 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
index e1a1f4d..40c5dae 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache query read event.
@@ -297,4 +297,4 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
index febc6ab..5ff424b 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
@@ -18,9 +18,11 @@
 package org.apache.ignite.events;
 
 import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgnitePredicate;
 
 /**
@@ -181,4 +183,4 @@ public class CacheRebalancingEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
index fe1496d..142388b 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Grid checkpoint event.
@@ -119,4 +120,4 @@ public class CheckpointEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java b/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
index c7e9ce6..584c49f 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Grid deployment event.
@@ -115,4 +116,4 @@ public class DeploymentEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java b/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
index dfe0f43..49c4f6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Grid discovery event.
@@ -162,4 +162,4 @@ public class DiscoveryEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/Event.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/Event.java b/modules/core/src/main/java/org/apache/ignite/events/Event.java
index 3951677..9ba24ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/Event.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/Event.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid events are used for notification about what happens within the grid. Note that by
@@ -151,4 +150,4 @@ public interface Event extends Comparable<Event>, Serializable {
      * @return Shortened version of {@code toString()} result.
      */
     public String shortDisplay();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java b/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
index 3b8fa86..6f8e82a 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base adapter for the events. All events (including user-defined ones) should
@@ -165,4 +167,4 @@ public class EventAdapter implements Event {
     @Override public String toString() {
         return S.toString(EventAdapter.class, this, "name", name());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java b/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
index 8efe8a7..0b45c05 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventLocalOrder.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.events;
 
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Generator for local atomically incremented IDs for grid events.
@@ -41,4 +41,4 @@ final class EventLocalOrder {
     public static long nextOrder() {
         return gen.getAndIncrement();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/EventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index b8c11f9..103dbd4 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -17,13 +17,12 @@
 
 package org.apache.ignite.events;
 
+import java.util.List;
 import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgnitePredicate;
 
-import java.util.*;
-
 /**
  * Contains event type constants. The decision to use class and not enumeration
  * dictated by allowing users to create their own events and/or event types which
@@ -1082,4 +1081,4 @@ public interface EventType {
      * All Ignite events (<b>excluding</b> metric update event).
      */
     public static final int[] EVTS_ALL_MINUS_METRIC_UPDATE = U.gridEvents(EVT_NODE_METRICS_UPDATED);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
index 1c7b1fe..698c6e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
@@ -17,15 +17,16 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import java.util.Map;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED;
+import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED;
 
 /**
  * IGFS event.
@@ -194,4 +195,4 @@ public class IgfsEvent extends EventAdapter {
     @Override public String toString() {
         return S.toString(IgfsEvent.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java b/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
index 9938266..13a53a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Grid job event.
@@ -233,4 +233,4 @@ public class JobEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java b/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
index 00e022e..8e7d9e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid swap space event.
@@ -101,4 +102,4 @@ public class SwapSpaceEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java b/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
index 8307e3a..b5eca63 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.events;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid task event.
@@ -165,4 +165,4 @@ public class TaskEvent extends EventAdapter {
             "type", name(),
             "tstamp", timestamp());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
index afd0314..0b7b812 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.UUID;
 
 /**
  * {@code IGFS} file's data block location in the grid. It is used to determine
@@ -60,4 +61,4 @@ public interface IgfsBlockLocation {
      * @return Collection of host names.
      */
     public Collection<String> hosts();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
index 63ff70e..a02fd62 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception indicating that file system structure was modified concurrently. This error
@@ -54,4 +54,4 @@ public class IgfsConcurrentModificationException extends IgfsException {
     public IgfsConcurrentModificationException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
index c2a6fd8..1732277 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsCorruptedFileException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when target file's block is not found in data cache.
@@ -53,4 +53,4 @@ public class IgfsCorruptedFileException extends IgfsException {
     public IgfsCorruptedFileException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
index 2df6faa..745559a 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsDirectoryNotEmptyException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that directory can not be deleted because it is not empty.
@@ -53,4 +53,4 @@ public class IgfsDirectoryNotEmptyException extends IgfsException {
     public IgfsDirectoryNotEmptyException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
index 630be38..9cae1ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception thrown by file system components.
@@ -54,4 +54,4 @@ public class IgfsException extends IgniteException {
     public IgfsException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
index 550679a..1108038 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} file or directory descriptor. For example, to get information about
@@ -117,4 +116,4 @@ public interface IgfsFile {
      * @return Properties of the file.
      */
     public Map<String, String> properties();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
index 1c49232..317c645 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
@@ -17,9 +17,10 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
+import org.apache.ignite.internal.processors.igfs.IgfsBlockKey;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * {@code IGFS} class providing ability to group file's data blocks together on one node.
@@ -98,4 +99,4 @@ public class IgfsGroupDataBlocksKeyMapper extends GridCacheDefaultAffinityKeyMap
     @Override public String toString() {
         return S.toString(IgfsGroupDataBlocksKeyMapper.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
index 6572298..250b749 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.igfs;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * {@code IGFS} input stream to read data from the file system.
@@ -77,4 +78,4 @@ public abstract class IgfsInputStream extends InputStream {
      * @throws IOException In case of IO exception.
      */
     public abstract int read(long pos, byte[] buf, int off, int len) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
index 4b4a72e..48d43ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidHdfsVersionException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when Ignite detects that remote HDFS version differs from version of HDFS libraries
@@ -54,4 +54,4 @@ public class IgfsInvalidHdfsVersionException extends IgfsException {
     public IgfsInvalidHdfsVersionException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
index 8049afe..e3a23ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception indicating that operation target is invalid
@@ -54,4 +54,4 @@ public class IgfsInvalidPathException extends IgfsException {
     public IgfsInvalidPathException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
index 7315007..23993a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
@@ -17,10 +17,12 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
-import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
+import static org.apache.ignite.igfs.IgfsIpcEndpointType.SHMEM;
+import static org.apache.ignite.igfs.IgfsIpcEndpointType.TCP;
 
 /**
  * IGFS IPC endpoint configuration.
@@ -238,4 +240,4 @@ public class IgfsIpcEndpointConfiguration {
     @Override public String toString() {
         return S.toString(IgfsIpcEndpointConfiguration.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
index a7ecaa2..cc322b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java
@@ -26,4 +26,4 @@ public enum IgfsIpcEndpointType {
 
     /** TCP endpoint. */
     TCP
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
index 50b5435..3283eaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
@@ -156,4 +156,4 @@ public interface IgfsMetrics {
      * @return Total bytes write time.
      */
     public long bytesWriteTime();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
index 2c9fcdd..7662c25 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} mode defining interactions with underlying secondary Hadoop file system.
@@ -77,4 +77,4 @@ public enum IgfsMode {
     @Nullable public static IgfsMode fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
index 029afff..e78a228 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception that is thrown when it detected out-of-space condition.
@@ -55,4 +55,4 @@ public class IgfsOutOfSpaceException extends IgfsException {
     public IgfsOutOfSpaceException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
index eaaddb8..98e051b 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.igfs;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * {@code IGFS} output stream to write data into the file system.
@@ -32,4 +34,4 @@ public abstract class IgfsOutputStream extends OutputStream {
      * @throws IOException If write failed, read from input failed or there is no enough data in data input.
      */
     public abstract void transferFrom(DataInput in, int len) throws IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
index f0959bb..a99c1ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.ignite.internal.util.io.GridFilenameUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} path to file in the file system. For example, to get information about
@@ -259,4 +264,4 @@ public final class IgfsPath implements Comparable<IgfsPath>, Externalizable {
     @Override public String toString() {
         return path;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
index 939f6ba..c4ca587 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathAlreadyExistsException.java
@@ -17,8 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.processors.igfs.*;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception thrown when target path supposed to be created already exists.
@@ -54,4 +53,4 @@ public class IgfsPathAlreadyExistsException extends IgfsException {
     public IgfsPathAlreadyExistsException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
index 4892ee8..053098c 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsDirectoryException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that path is directory, while it is expected to be a file.
@@ -53,4 +53,4 @@ public class IgfsPathIsDirectoryException extends IgfsException {
     public IgfsPathIsDirectoryException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
index d4b5ff9..740fc26 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathIsNotDirectoryException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that path is not directory.
@@ -53,4 +53,4 @@ public class IgfsPathIsNotDirectoryException extends IgfsException {
     public IgfsPathIsNotDirectoryException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
index 4172be7..6670601 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathNotFoundException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code IGFS} exception indicating that target resource is not found.
@@ -53,4 +53,4 @@ public class IgfsPathNotFoundException extends IgfsException {
     public IgfsPathNotFoundException(@Nullable String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
index 5837f0a..e84e128 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPathSummary.java
@@ -17,9 +17,11 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Path summary: total files count, total directories count, total length.
@@ -135,4 +137,4 @@ public class IgfsPathSummary implements Externalizable {
     @Override public String toString() {
         return S.toString(IgfsPathSummary.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
index 5a65bdb..8db4e23 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.igfs;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides ability to execute IGFS code in a context of a specific user.
@@ -116,4 +115,4 @@ public abstract class IgfsUserContext {
     @Nullable public static String currentUser() {
         return userStackThreadLocal.get();
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
index 1465340..a8a8bf9 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Entity representing part of IGFS file identified by file path, start position, and length.
@@ -77,4 +77,4 @@ public class IgfsFileRange {
     @Override public String toString() {
         return S.toString(IgfsFileRange.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
index d7fd866..c6dbec1 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java
@@ -17,11 +17,11 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.util.*;
-
-import java.io.*;
+import java.io.IOException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
+import org.apache.ignite.internal.util.GridFixedSizeInputStream;
 
 /**
  * Convenient {@link IgfsJob} adapter. It limits data returned from {@link IgfsInputStream} to bytes within
@@ -49,4 +49,4 @@ public abstract class IgfsInputStreamJobAdapter extends IgfsJobAdapter {
      * @throws IOException If IO exception encountered while working with stream.
      */
     public abstract Object execute(IgniteFileSystem igfs, IgfsRangeInputStream in) throws IgniteException, IOException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
index 0fdc0f2..eeaa988 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.igfs.mapreduce;
 
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-
-import java.io.*;
+import java.io.IOException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.igfs.IgfsInputStream;
 
 /**
  * Defines executable unit for {@link IgfsTask}. Before this job is executed, it is assigned one of the
@@ -66,4 +66,4 @@ public interface IgfsJob {
      * instance to gracefully finish execution and exit.
      */
     public void cancel();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
index 35873fe..353b263 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJobAdapter.java
@@ -25,4 +25,4 @@ public abstract class IgfsJobAdapter implements IgfsJob {
     @Override public void cancel() {
         // No-op.
     }
-}
+}
\ No newline at end of file