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

[11/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/portable/PortableException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
index 62ae901..0f8d78b 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableException.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating portable object serialization error.
@@ -55,4 +54,4 @@ public class PortableException extends IgniteException {
     public PortableException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
index 9502a86..368e415 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableIdMapper.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.marshaller.portable.*;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Type and field ID mapper for portable objects. Ignite never writes full
@@ -53,4 +53,4 @@ public interface PortableIdMapper {
      * @return Field ID.
      */
     public int fieldId(int typeId, String fieldName);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
index 533d453..0098ec3 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableInvalidClassException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Exception indicating that class needed for deserialization of portable object does not exist.
@@ -55,4 +55,4 @@ public class PortableInvalidClassException extends PortableException {
     public PortableInvalidClassException(String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
index 3ae2bd7..4270885 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableMarshalAware.java
@@ -45,4 +45,4 @@ public interface PortableMarshalAware {
      * @throws PortableException In case of error.
      */
     public void readPortable(PortableReader reader) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
index 7697299..4ea808b 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableMetadata.java
@@ -17,11 +17,9 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.IgnitePortables;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable type meta data. Metadata for portable types can be accessed from any of the
@@ -60,4 +58,4 @@ public interface PortableMetadata {
      * @return Affinity key field name.
      */
     @Nullable public String affinityKeyFieldName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
index c22892d..66b8f76 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableObject.java
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.*;
-import org.apache.ignite.marshaller.portable.*;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.TreeMap;
+import org.apache.ignite.IgnitePortables;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper for portable object in portable binary format. Once an object is defined as portable,
@@ -150,4 +151,4 @@ public interface PortableObject extends Serializable, Cloneable {
      * @return Copy of this portable object.
      */
     public PortableObject clone() throws CloneNotSupportedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
index 5764560..9189b28 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableProtocolVersion.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Portable protocol version.
@@ -38,4 +38,4 @@ public enum PortableProtocolVersion {
     @Nullable public static PortableProtocolVersion fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
index a704570..3bae2e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawReader.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Raw reader for portable objects. Raw reader does not use field name hash codes, therefore,
@@ -230,4 +231,4 @@ public interface PortableRawReader {
      * @throws PortableException In case of error.
      */
     @Nullable public <T extends Enum<?>> T[] readEnumArray() throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
index e6efee5..53f4f92 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableRawWriter.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Raw writer for portable object. Raw writer does not write field name hash codes, therefore,
@@ -215,4 +216,4 @@ public interface PortableRawWriter {
      * @throws PortableException In case of error.
      */
     public <T extends Enum<?>> void writeEnumArray(T[] val) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
index 82dca0c..58f078d 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableReader.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Reader for portable objects used in {@link PortableMarshalAware} implementations.
@@ -280,4 +281,4 @@ public interface PortableReader {
      * @return Raw reader.
      */
     public PortableRawReader rawReader();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
index 54b0937..90ee562 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableSerializer.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.marshaller.portable.*;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Interface that allows to implement custom serialization logic for portable objects.
@@ -46,4 +46,4 @@ public interface PortableSerializer {
      * @throws PortableException In case of error.
      */
     public void readPortable(Object obj, PortableReader reader) throws PortableException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
index b221298..5e6e09d 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableTypeConfiguration.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.portable;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.portable.*;
-
-import java.sql.*;
-import java.util.*;
+import java.sql.Timestamp;
+import java.util.Collection;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
 
 /**
  * Defines configuration properties for a specific portable type. Providing per-type
@@ -194,4 +193,4 @@ public class PortableTypeConfiguration {
     @Override public String toString() {
         return S.toString(PortableTypeConfiguration.class, this, super.toString());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
index 36fa608..0d7160f 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableWriter.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.portable;
 
-import org.jetbrains.annotations.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Writer for portable object used in {@link PortableMarshalAware} implementations.
@@ -262,4 +263,4 @@ public interface PortableWriter {
      * @return Raw writer.
      */
     public PortableRawWriter rawWriter();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
index 50ab5cb..1658440 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of grid cache name.
@@ -56,4 +60,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface CacheNameResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java b/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
index b75b796..ac7ef8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/CacheStoreSessionResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of current {@link org.apache.ignite.cache.store.CacheStoreSession}
@@ -38,4 +42,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface CacheStoreSessionResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
index 4b1ed4e..b83c945 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of current {@link org.apache.ignite.Ignite} instance.
@@ -60,4 +64,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface IgniteInstanceResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
index 681c88c..9e1a5e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/JobContextResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.compute.ComputeJobContext} instance.
@@ -56,4 +60,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface JobContextResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
index dfac834..deaf882 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.compute.ComputeLoadBalancer}.
@@ -58,4 +62,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface LoadBalancerResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
index 3f68f73..dd6daf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.IgniteLogger}. Grid logger is provided to grid
@@ -82,4 +86,4 @@ public @interface LoggerResource {
      * @return Category name for the injected logger.
      */
     public String categoryName() default "";
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
index bf11e91..17b9aa7 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.resources;
 
-import javax.management.*;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.management.MBeanServer;
 
 /**
  * Annotates a field or a setter method for injection of {@link MBeanServer} resource. MBean server
@@ -62,4 +66,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface MBeanServerResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
index 7c22728..b23015c 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/ServiceResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of Ignite service(s) by specified service name.
@@ -84,4 +88,4 @@ public @interface ServiceResource {
      * @return {@code True} if a sticky instance of a service proxy should be injected.
      */
     public boolean proxySticky() default false;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
index 38c0c88..8de591c 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of Spring ApplicationContext resource.
@@ -65,4 +69,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface SpringApplicationContextResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
index 4426637..f4c041e 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.resources;
 
-import java.io.*;
-import java.lang.annotation.*;
+import java.io.Serializable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of resource
@@ -109,4 +113,4 @@ public @interface SpringResource {
      * @return Resource bean name.
      */
     String resourceName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java b/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
index 30cb8fc..65946ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of
@@ -54,4 +58,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface TaskContinuousMapperResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java b/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
index 060288f..3292da1 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.resources;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates a field or a setter method for injection of {@link org.apache.ignite.compute.ComputeTaskSession} resource.
@@ -57,4 +61,4 @@ import java.lang.annotation.*;
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface TaskSessionResource {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/package-info.java b/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
index 9f9aefb..a9cfeec 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/package-info.java
@@ -19,4 +19,4 @@
  * Contains resource injection annotations. Annotations are used to inject resources
  * into user defined code such as grid tasks, grid jobs and SPI implementations.
  */
-package org.apache.ignite.resources;
+package org.apache.ignite.resources;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java b/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
index 4ce3ff9..4dcefc6 100644
--- a/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
@@ -17,10 +17,14 @@
 
 package org.apache.ignite.scheduler;
 
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteScheduler;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.lang.IgniteFutureTimeoutException;
 
 /**
  * Future for cron-based scheduled execution. This future is returned
@@ -151,4 +155,4 @@ public interface SchedulerFuture<R> extends IgniteFuture<R> {
      * @throws IgniteException {@inheritDoc}
      */
     @Override public R get(long timeout, TimeUnit unit);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/Service.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/Service.java b/modules/core/src/main/java/org/apache/ignite/services/Service.java
index 4f927a3..60b977d 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/Service.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/Service.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.services;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * An instance of grid-managed service. Grid-managed services may be deployed from
@@ -117,4 +117,4 @@ public interface Service extends Serializable {
      *      {@link org.apache.ignite.IgniteServices#cancel(String)} method will be called.
      */
     public void execute(ServiceContext ctx) throws Exception;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
index fbc0e09..126ad47 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.services;
 
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * Managed service configuration. In addition to deploying managed services by
@@ -302,4 +301,4 @@ public class ServiceConfiguration implements Serializable {
 
         return S.toString(ServiceConfiguration.class, this, "svcCls", svcCls, "nodeFilterCls", nodeFilterCls);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
index 2868c4a..8f10036 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.services;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Service execution context. Execution context is provided into {@link Service#execute(ServiceContext)}
@@ -65,4 +64,4 @@ public interface ServiceContext extends Serializable {
      * @return Affinity key, possibly {@code null}.
      */
     @Nullable public <K> K affinityKey();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
index 927d778..94c0fd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.services;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.UUID;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Service deployment descriptor. Contains all service deployment configuration, and also
@@ -87,4 +87,4 @@ public interface ServiceDescriptor extends Serializable {
      * @return Map of number of service instances per node ID.
      */
     public Map<UUID, Integer> topologySnapshot();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
index 0c3746c..2473a9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * Result of joining node validation.
@@ -63,4 +63,4 @@ public class IgniteNodeValidationResult {
     public String sendMessage() {
         return sndMsg;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java b/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
index 9cc241a..ad02e06 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgnitePortProtocol.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Protocols supported by port processor.
@@ -45,4 +45,4 @@ public enum IgnitePortProtocol {
     @Nullable public static IgnitePortProtocol fromOrdinal(byte ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
index 0f6ed5c..3ab3b42 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import java.util.Map;
+import org.apache.ignite.lang.IgniteFuture;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface defines life-cycle of SPI implementation. Every SPI implementation should implement
@@ -121,4 +120,4 @@ public interface IgniteSpi {
      * @param clusterRestarted {@code True} if all cluster nodes restarted while client was disconnected.
      */
     public void onClientReconnected(boolean clusterRestarted);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 0d08171..cd46de4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -17,31 +17,47 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.resources.*;
-
-import org.jetbrains.annotations.*;
-
-import javax.management.*;
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.EventType.*;
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.timeout.GridSpiTimeoutObject;
+import org.apache.ignite.internal.util.IgniteExceptionRegistry;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
 
 /**
  * This class provides convenient adapter for SPI implementations.
@@ -864,4 +880,4 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
             ((IgniteKernal)ignite0).context().timeout().removeTimeoutObject(new GridSpiTimeoutObject(obj));
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
index 28c2d66..6a617a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiCloseableIterator.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
 
 /**
  *  Closeable iterator.
@@ -36,4 +35,4 @@ public interface IgniteSpiCloseableIterator<T> extends Iterator<T>, AutoCloseabl
      * @throws IgniteCheckedException In case of error.
      */
     @Override public void close() throws IgniteCheckedException;
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
index c3e62c8..9851e05 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates SPI configuration setters on whether or not it is optional.
@@ -34,4 +38,4 @@ public @interface IgniteSpiConfiguration {
      */
     @SuppressWarnings("JavaDoc")
     public boolean optional();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
index b9219c2..157d9ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * SPIs that have this annotation present will be checked for consistency within grid.
@@ -36,4 +40,4 @@ public @interface IgniteSpiConsistencyChecked {
      */
     @SuppressWarnings("JavaDoc")
     public boolean optional();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index 611702b..899c222 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -17,18 +17,19 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.plugin.security.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.UUID;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFormatter;
+import org.apache.ignite.plugin.security.SecuritySubject;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * SPI context provides common functionality for all SPI implementations.
@@ -327,4 +328,4 @@ public interface IgniteSpiContext {
      * @param c Timeout object.
      */
     public void removeTimeoutObject(IgniteSpiTimeoutObject c);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
index 91d691e..266e430 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiException.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteException;
 
 /**
  * Exception thrown by SPI implementations.
@@ -54,4 +54,4 @@ public class IgniteSpiException extends IgniteException {
     public IgniteSpiException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
index df973b2..5c94a64 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.mxbean.*;
-
-import java.util.*;
+import java.util.UUID;
+import org.apache.ignite.mxbean.MXBeanDescription;
 
 /**
  * This interface defines basic MBean for all SPI implementations. Every SPI implementation
@@ -82,4 +81,4 @@ public interface IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Name of the SPI.")
     public String getName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
index 2575710..b55ec92 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultiException.java
@@ -17,10 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Grid SPI exception which may contain more than one failure.
@@ -100,4 +101,4 @@ public class IgniteSpiMultiException extends IgniteSpiException {
         for (Throwable t : causes)
             t.printStackTrace(s);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
index c0f5ec2..2ff06fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
@@ -17,7 +17,12 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates whether or not multiple instances of this SPI can be
@@ -38,4 +43,4 @@ public @interface IgniteSpiMultipleInstancesSupport {
      * started in the same VM.
      */
     @SuppressWarnings({"JavaDoc"}) public boolean value();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
index 9308585..6b4eeaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNoop.java
@@ -17,7 +17,11 @@
 
 package org.apache.ignite.spi;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotates {@code NO-OP} SPI implementations. {@code NO-OP} implementations are empty implementations
@@ -29,4 +33,4 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 public @interface IgniteSpiNoop {
     // No-op.
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
index 0e34cf2..f5f7c21 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutException.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 
 /**
  * Kind of exception that is used when failure detection timeout is enabled for {@link TcpDiscoverySpi} or
@@ -40,4 +40,4 @@ public class IgniteSpiOperationTimeoutException extends IgniteCheckedException {
     public IgniteSpiOperationTimeoutException(String msg) {
         super(msg);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
index f7d8daa..e17b0dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
@@ -16,10 +16,10 @@
  */
 package org.apache.ignite.spi;
 
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.net.*;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * Object that incorporates logic that determines a timeout value for the next network related operation and checks
@@ -99,4 +99,4 @@ public class IgniteSpiOperationTimeoutHelper {
         return e instanceof IgniteSpiOperationTimeoutException || e instanceof SocketTimeoutException ||
             X.hasCause(e, IgniteSpiOperationTimeoutException.class, SocketException.class);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
index 5682868..25b81e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
@@ -17,10 +17,10 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
  * This class provides convenient adapter for threads used by SPIs.
@@ -105,4 +105,4 @@ public abstract class IgniteSpiThread extends Thread {
     @Override public String toString() {
         return S.toString(IgniteSpiThread.class, this, "name", getName());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
index 2344d3f..c40925d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.*;
-
-import java.util.concurrent.*;
+import java.util.concurrent.ThreadFactory;
+import org.apache.ignite.IgniteLogger;
 
 /**
  * This class provides implementation of {@link ThreadFactory}  factory
@@ -58,4 +57,4 @@ public class IgniteSpiThreadFactory implements ThreadFactory {
             }
         };
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
index b3fc28e..94eff3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiTimeoutObject.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.lang.*;
+import org.apache.ignite.lang.IgniteUuid;
 
 /**
  * Provides possibility to schedule delayed execution,
@@ -41,4 +41,4 @@ public interface IgniteSpiTimeoutObject {
      * Timeout callback.
      */
     public void onTimeout();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
index 73f015f..563c9aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiVersionCheckException.java
@@ -52,4 +52,4 @@ public class IgniteSpiVersionCheckException extends IgniteSpiException {
     public IgniteSpiVersionCheckException(String msg, Throwable cause) {
         super(msg, cause);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
index 691b29c..9bb8f78 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointListener.java
@@ -27,4 +27,4 @@ public interface CheckpointListener {
      * @param key Key of removed checkpoint.
      */
     public void onCheckpointRemoved(String key);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
index 30f2528..02159fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.spi.checkpoint;
 
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Checkpoint SPI provides an ability to save an intermediate job state. It can
@@ -103,4 +104,4 @@ public interface CheckpointSpi extends IgniteSpi {
      * @param lsnr The listener to set or {@code null}.
      */
     public void setCheckpointListener(CheckpointListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
index db6d1b0..fd5b64b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.spi.checkpoint.cache;
 
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-
-import static org.apache.ignite.events.EventType.*;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiContext;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_EXPIRED;
+import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_REMOVED;
 
 /**
  * This class defines cache-based implementation for checkpoint SPI.
@@ -243,4 +250,4 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp
     @Override public String toString() {
         return S.toString(CacheCheckpointSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
index 976d2eb..f81be17 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.checkpoint.cache;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides general administrative and configuration information
@@ -35,4 +35,4 @@ public interface CacheCheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Cache name to be used by this SPI.")
     public String getCacheName();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index f25c46d..1d6c04d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -17,16 +17,24 @@
 
 package org.apache.ignite.spi.checkpoint.jdbc;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-
-import javax.sql.*;
-import java.sql.*;
-import java.text.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Time;
+import java.text.MessageFormat;
+import javax.sql.DataSource;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
 
 /**
  * This class defines JDBC checkpoint SPI implementation. All checkpoints are
@@ -872,4 +880,4 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
     @Override public void setCheckpointListener(CheckpointListener lsnr) {
         this.lsnr = lsnr;
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
index 5deec18..595b80b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.spi.checkpoint.jdbc;
 
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides general administrative and configuration information
@@ -114,4 +114,4 @@ public interface JdbcCheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Expiration date field type for checkpoint table.")
     public String getExpireDateFieldType();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
index 832d872..bf44e8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.spi.checkpoint.noop;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.IgniteSpiNoop;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * No-op implementation of {@link org.apache.ignite.spi.checkpoint.CheckpointSpi}. This is default implementation
@@ -69,4 +74,4 @@ public class NoopCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
     @Override public String toString() {
         return S.toString(NoopCheckpointSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
index 203fb8d..33c03e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointData.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
+import java.io.Serializable;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Wrapper of all checkpoint that are saved to the file system. It
@@ -103,4 +102,4 @@ class SharedFsCheckpointData implements Serializable {
     @Override public String toString() {
         return S.toString(SharedFsCheckpointData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index 21880de..8b70969 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -17,17 +17,33 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
+import org.apache.ignite.spi.checkpoint.CheckpointSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class defines shared file system {@link org.apache.ignite.spi.checkpoint.CheckpointSpi} implementation for
@@ -485,4 +501,4 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
     @Override public String toString() {
         return S.toString(SharedFsCheckpointSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
index 2fc051f..193aa72 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
+import java.util.Collection;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides general administrative and configuration information
@@ -44,4 +43,4 @@ public interface SharedFsCheckpointSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Gets collection of all configured paths where checkpoints can be saved.")
     public Collection<String> getDirectoryPaths();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
index 65d926a..b37a775 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeData.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Helper class that keeps checkpoint expiration date and last file
@@ -104,4 +104,4 @@ class SharedFsTimeData {
     @Override public String toString() {
         return S.toString(SharedFsTimeData.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
index 5f82115..3cf11f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
@@ -17,14 +17,19 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.checkpoint.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.spi.IgniteSpiThread;
+import org.apache.ignite.spi.checkpoint.CheckpointListener;
 
 /**
  * Implementation of {@link org.apache.ignite.spi.IgniteSpiThread} that takes care about outdated files.
@@ -233,4 +238,4 @@ class SharedFsTimeoutTask extends IgniteSpiThread {
     @Override public String toString() {
         return S.toString(SharedFsTimeoutTask.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
index 5d7ae36..b1698fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java
@@ -17,11 +17,16 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
 
 /**
  * Utility class that helps to manage files. It provides read/write
@@ -92,4 +97,4 @@ final class SharedFsUtils {
             U.close(out, log);
         }
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
index 31fb0ae..549d066 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionContext.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * Context for resolving collisions. This context contains collections of
@@ -59,4 +59,4 @@ public interface CollisionContext {
      * @return Collection of jobs that are currently in {@code held} state.
      */
     public Collection<CollisionJobContext> heldJobs();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
index f012a0f..f59c663 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionExternalListener.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision;
 
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * Listener to be set on {@link CollisionSpi} for notification of external
@@ -30,4 +30,4 @@ public interface CollisionExternalListener extends EventListener {
      * event occurs.
      */
     public void onExternalCollision();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
index ca7e85c..22f8ccc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionJobContext.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.spi.collision;
 
-import org.apache.ignite.compute.*;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobContext;
+import org.apache.ignite.compute.ComputeTaskSession;
 
 /**
  * This interface defines set of operations that collision SPI implementation can perform on
@@ -75,4 +77,4 @@ public interface CollisionJobContext {
      *      otherwise.
      */
     public boolean cancel();
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
index bb3b731..d82d9a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.collision;
 
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
+import org.apache.ignite.spi.IgniteSpi;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Collision SPI allows to regulate how grid jobs get executed when they arrive on a
@@ -82,4 +82,4 @@ public interface CollisionSpi extends IgniteSpi {
      * @param lsnr Listener for external collision events.
      */
     public void setExternalCollisionListener(@Nullable CollisionExternalListener lsnr);
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
index 5bdab6f..bc4bce6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
@@ -17,13 +17,20 @@
 
 package org.apache.ignite.spi.collision.fifoqueue;
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.collision.*;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.IgniteSpiConfiguration;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
+import org.apache.ignite.spi.collision.CollisionContext;
+import org.apache.ignite.spi.collision.CollisionExternalListener;
+import org.apache.ignite.spi.collision.CollisionJobContext;
+import org.apache.ignite.spi.collision.CollisionSpi;
 
 /**
  * This class provides implementation for Collision SPI based on FIFO queue. Jobs are ordered
@@ -248,4 +255,4 @@ public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements Collision
     @Override public String toString() {
         return S.toString(FifoQueueCollisionSpi.class, this);
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
index b69a38d..40d47a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.spi.collision.fifoqueue;
 
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
+import org.apache.ignite.mxbean.MXBeanDescription;
+import org.apache.ignite.spi.IgniteSpiManagementMBean;
 
 /**
  * Management bean that provides access to the FIFO queue collision SPI configuration.
@@ -90,4 +90,4 @@ public interface FifoQueueCollisionSpiMBean extends IgniteSpiManagementMBean {
      */
     @MXBeanDescription("Number of held jobs.")
     public int getCurrentHeldJobsNumber();
-}
+}
\ No newline at end of file