http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java index 3bf8379..d3adbec 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java @@ -17,7 +17,7 @@ package org.apache.ignite.lifecycle; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nullable; /** * Node lifecycle event types. These events are used to notify lifecycle beans @@ -63,4 +63,4 @@ public enum LifecycleEventType { @Nullable public static LifecycleEventType 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/logger/LoggerNodeIdAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java index 8a5db87..1e44376 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/LoggerNodeIdAware.java @@ -17,7 +17,7 @@ package org.apache.ignite.logger; -import java.util.*; +import java.util.UUID; /** * Interface for Ignite file appenders to attach node ID to log file names. @@ -36,4 +36,4 @@ public interface LoggerNodeIdAware { * @return Node ID. */ public UUID getNodeId(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java index b30c365..71c7ba4 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/NullLogger.java @@ -17,8 +17,8 @@ package org.apache.ignite.logger; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteLogger; +import org.jetbrains.annotations.Nullable; /** * Logger which does not output anything. @@ -88,4 +88,4 @@ public class NullLogger implements IgniteLogger { @Nullable @Override public String fileName() { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java index e08ae64..4214b5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java @@ -17,19 +17,31 @@ package org.apache.ignite.logger.java; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.logger.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; - -import static java.util.logging.Level.*; -import static org.apache.ignite.IgniteSystemProperties.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.UUID; +import java.util.logging.ConsoleHandler; +import java.util.logging.FileHandler; +import java.util.logging.Handler; +import java.util.logging.LogManager; +import java.util.logging.Logger; +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.U; +import org.apache.ignite.logger.LoggerNodeIdAware; +import org.jetbrains.annotations.Nullable; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONSOLE_APPENDER; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET; /** * Logger to use with Java logging. Implementation simply delegates to Java Logging. @@ -382,4 +394,4 @@ public class JavaLogger implements IgniteLogger, LoggerNodeIdAware { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java index 830a51e..5acdc08 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java @@ -17,14 +17,18 @@ package org.apache.ignite.logger.java; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.File; +import java.io.IOException; +import java.util.UUID; +import java.util.logging.FileHandler; +import java.util.logging.LogManager; +import java.util.logging.LogRecord; +import java.util.logging.StreamHandler; +import org.apache.ignite.IgniteCheckedException; +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.jetbrains.annotations.Nullable; /** * File logging handler which skips all the messages until node ID is set. @@ -187,4 +191,4 @@ public final class JavaLoggerFileHandler extends StreamHandler { @Override public String toString() { return S.toString(JavaLoggerFileHandler.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/logger/java/JavaLoggerFormatter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java index 5621559..be51d9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFormatter.java @@ -17,13 +17,13 @@ package org.apache.ignite.logger.java; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.logging.Formatter; -import java.util.logging.*; +import java.util.logging.LogRecord; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Formatter for JUL logger. @@ -76,4 +76,4 @@ public class JavaLoggerFormatter extends Formatter { @Override public String toString() { return S.toString(JavaLoggerFormatter.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/marshaller/AbstractMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java index fd08a02..8c79a93 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java @@ -17,11 +17,12 @@ package org.apache.ignite.marshaller; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.io.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.GridByteArrayList; +import org.apache.ignite.internal.util.io.GridByteArrayInputStream; +import org.apache.ignite.internal.util.io.GridByteArrayOutputStream; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Base class for marshallers. Provides default implementations of methods @@ -70,4 +71,4 @@ public abstract class AbstractMarshaller implements Marshaller { U.close(in, 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/marshaller/Marshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java index c25e74e..a900771 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java @@ -17,10 +17,10 @@ package org.apache.ignite.marshaller; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; - -import java.io.*; +import java.io.InputStream; +import java.io.OutputStream; +import org.apache.ignite.IgniteCheckedException; +import org.jetbrains.annotations.Nullable; /** * {@code Marshaller} allows to marshal or unmarshal objects in grid. It provides @@ -113,4 +113,4 @@ public interface Marshaller { * @throws IgniteCheckedException If unmarshalling failed. */ public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) 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/marshaller/MarshallerContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java index dc131e8..252ddd6 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java @@ -17,7 +17,7 @@ package org.apache.ignite.marshaller; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Marshaller context. @@ -51,4 +51,4 @@ public interface MarshallerContext { * @return {@code true} if the type is a system one, {@code false} otherwise. */ public boolean isSystemType(String typeName); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java index 5ea14c2..2701ead 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerExclusions.java @@ -17,16 +17,21 @@ package org.apache.ignite.marshaller; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.executor.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import javax.management.*; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import javax.management.MBeanServer; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.compute.ComputeJobContext; +import org.apache.ignite.compute.ComputeLoadBalancer; +import org.apache.ignite.compute.ComputeTaskContinuousMapper; +import org.apache.ignite.compute.ComputeTaskSession; +import org.apache.ignite.internal.GridComponent; +import org.apache.ignite.internal.GridLoggerProxy; +import org.apache.ignite.internal.executor.GridExecutorService; +import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Controls what classes should be excluded from marshalling by default. @@ -150,4 +155,4 @@ public final class MarshallerExclusions { public static void clearCache() { cache.clear(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java index 8a61c41..566187f 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java @@ -17,12 +17,16 @@ package org.apache.ignite.marshaller.jdk; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import org.jetbrains.annotations.*; - -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.AbstractMarshaller; +import org.jetbrains.annotations.Nullable; /** * Implementation of {@link org.apache.ignite.marshaller.Marshaller} based on JDK serialization mechanism. @@ -114,4 +118,4 @@ public class JdkMarshaller extends AbstractMarshaller { @Override public String toString() { return S.toString(JdkMarshaller.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/marshaller/jdk/JdkMarshallerDummySerializable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java index 7d5f70c..c19074e 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerDummySerializable.java @@ -17,7 +17,7 @@ package org.apache.ignite.marshaller.jdk; -import java.io.*; +import java.io.Serializable; /** * Serializable object used for {@link Object} replacement. @@ -27,4 +27,4 @@ class JdkMarshallerDummySerializable implements Serializable { 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/marshaller/jdk/JdkMarshallerInputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java index fb10b86..95ecb8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerInputStreamWrapper.java @@ -17,7 +17,8 @@ package org.apache.ignite.marshaller.jdk; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; /** * Wrapper for {@link InputStream}. @@ -78,4 +79,4 @@ class JdkMarshallerInputStreamWrapper extends InputStream { @Override public boolean markSupported() { return in.markSupported(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java index 7a10aaf..03256e0 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java @@ -17,9 +17,11 @@ package org.apache.ignite.marshaller.jdk; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectStreamClass; +import org.apache.ignite.internal.util.typedef.internal.U; /** * This class defines custom JDK object input stream. @@ -60,4 +62,3 @@ class JdkMarshallerObjectInputStream extends ObjectInputStream { return super.resolveObject(o); } } - http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java index 13f603e..9053289 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectOutputStream.java @@ -17,10 +17,11 @@ package org.apache.ignite.marshaller.jdk; -import org.apache.ignite.marshaller.*; -import org.jetbrains.annotations.*; - -import java.io.*; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import org.apache.ignite.marshaller.MarshallerExclusions; +import org.jetbrains.annotations.Nullable; /** * This class defines own object output stream. @@ -42,4 +43,3 @@ class JdkMarshallerObjectOutputStream extends ObjectOutputStream { o.getClass().equals(Object.class) ? new JdkMarshallerDummySerializable() : super.replaceObject(o); } } - http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java index 5e17639..df370c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerOutputStreamWrapper.java @@ -17,7 +17,8 @@ package org.apache.ignite.marshaller.jdk; -import java.io.*; +import java.io.IOException; +import java.io.OutputStream; /** * Wrapper for {@link OutputStream}. @@ -56,4 +57,4 @@ class JdkMarshallerOutputStreamWrapper extends OutputStream { @Override public void flush() throws IOException { out.flush(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java index 05ef534..a4f4cdc 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java @@ -17,19 +17,76 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import sun.misc.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static java.lang.reflect.Modifier.*; -import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.NotSerializableException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamField; +import java.io.Serializable; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.marshaller.MarshallerExclusions; +import sun.misc.Unsafe; + +import static java.lang.reflect.Modifier.isFinal; +import static java.lang.reflect.Modifier.isPrivate; +import static java.lang.reflect.Modifier.isStatic; +import static java.lang.reflect.Modifier.isTransient; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ARRAY_LIST; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CLS; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DATE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE_ARR; import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ENUM; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.EXTERNALIZABLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_MAP; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET_MAP_OFF; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_MAP; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_SET; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_LIST; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.OBJ_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.PROPS; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SERIALIZABLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.STR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.UUID; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.computeSerialVersionUid; /** * Class descriptor. @@ -962,4 +1019,4 @@ class OptimizedClassDescriptor { return fields.get(i); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java index 3840dfd..aca7ce4 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedFieldType.java @@ -47,4 +47,4 @@ enum OptimizedFieldType { /** */ OTHER -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java index accfeb7..d47f787 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java @@ -17,16 +17,20 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; -import sun.misc.*; - -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.AbstractMarshaller; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; +import sun.misc.Unsafe; /** * Optimized implementation of {@link org.apache.ignite.marshaller.Marshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.JdkMarshaller}, @@ -292,4 +296,4 @@ public class OptimizedMarshaller extends AbstractMarshaller { U.clearClassCache(ldr); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java index e4e2627..91d07df 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerIdMapper.java @@ -30,4 +30,4 @@ public interface OptimizedMarshallerIdMapper { * @return Type ID. */ public int typeId(String clsName); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java index fafdea1..4abbd04 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java @@ -17,19 +17,23 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.jdk.*; -import sun.misc.*; - -import java.io.*; -import java.lang.reflect.*; -import java.nio.charset.*; -import java.security.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.ObjectStreamClass; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.nio.charset.Charset; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; +import sun.misc.Unsafe; /** * Miscellaneous utility methods to facilitate {@link OptimizedMarshaller}. @@ -510,4 +514,4 @@ class OptimizedMarshallerUtils { static void setObject(Object obj, long off, Object val) { UNSAFE.putObject(obj, off, val); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java index 78190ea..ce9ee0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java @@ -17,19 +17,82 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.io.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import sun.misc.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.NotActiveException; +import java.io.ObjectInputStream; +import java.io.ObjectInputValidation; +import java.io.ObjectStreamClass; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.io.GridDataInput; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.MarshallerContext; +import sun.misc.Unsafe; + +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ARRAY_LIST; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BYTE_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CHAR_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.CLS; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DATE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.DOUBLE_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ENUM; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.EXTERNALIZABLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.FLOAT_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HANDLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_MAP; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HASH_SET_MAP_OFF; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.INT_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK_MARSH; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_MAP; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_SET; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LINKED_LIST; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.LONG_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.NULL; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.OBJ_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.PROPS; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SERIALIZABLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.SHORT_ARR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.STR; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.UUID; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setBoolean; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setByte; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setChar; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setDouble; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setFloat; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setInt; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setLong; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setObject; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.setShort; /** * Optimized object input stream. @@ -1156,4 +1219,4 @@ class OptimizedObjectInputStream extends ObjectInputStream { return objs[fieldInfo.getIndex(name)] != null ? (T)objs[fieldInfo.getIndex(name)] : dflt; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java index 82ae129..d884564 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java @@ -17,19 +17,49 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.io.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.marshaller.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.NotActiveException; +import java.io.ObjectOutput; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.GridHandleTable; +import org.apache.ignite.internal.util.io.GridDataOutput; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.marshaller.MarshallerContext; + +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.HANDLE; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.JDK_MARSH; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.NULL; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getBoolean; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getByte; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getChar; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getDouble; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getFloat; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getInt; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getLong; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getObject; +import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.getShort; /** * Optimized object output stream. @@ -865,4 +895,4 @@ class OptimizedObjectOutputStream extends ObjectOutputStream { objs[i] = F.t(info.type(), val); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java index ae28015..e0e4872 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamRegistry.java @@ -17,13 +17,14 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.io.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.io.GridUnsafeDataInput; +import org.apache.ignite.internal.util.io.GridUnsafeDataOutput; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Storage for object streams. @@ -221,4 +222,4 @@ class OptimizedObjectStreamRegistry { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java index 2a17363..c5b1cc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java @@ -17,16 +17,25 @@ package org.apache.ignite.marshaller.portable; -import org.apache.ignite.*; -import org.apache.ignite.internal.portable.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.portable.*; - -import org.jetbrains.annotations.*; - -import java.io.*; -import java.sql.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.portable.GridPortableMarshaller; +import org.apache.ignite.internal.portable.PortableContext; +import org.apache.ignite.marshaller.AbstractMarshaller; +import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.portable.PortableException; +import org.apache.ignite.portable.PortableIdMapper; +import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.portable.PortableProtocolVersion; +import org.apache.ignite.portable.PortableSerializer; +import org.apache.ignite.portable.PortableTypeConfiguration; +import org.jetbrains.annotations.Nullable; /** * Implementation of {@link org.apache.ignite.marshaller.Marshaller} that lets to serialize and deserialize all objects @@ -344,4 +353,3 @@ public class PortableMarshaller extends AbstractMarshaller { } } } - http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java index 04b640f..deca648 100644 --- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java +++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java @@ -17,14 +17,18 @@ package org.apache.ignite.messaging; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.resources.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.UUID; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.IgniteMessaging; +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.IgniteBiPredicate; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.resources.LoggerResource; +import org.jetbrains.annotations.Nullable; /** * Convenience actor-base adapter for {@link IgniteMessaging#localListen(Object, IgniteBiPredicate)} @@ -228,4 +232,4 @@ public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID, @Override public String toString() { return S.toString(MessagingListenActor.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/mxbean/CacheMetricsMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java index 5cdc72f..0b6c8a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java @@ -17,10 +17,10 @@ package org.apache.ignite.mxbean; -import org.apache.ignite.*; -import org.apache.ignite.cache.*; - -import javax.cache.management.*; +import javax.cache.management.CacheMXBean; +import javax.cache.management.CacheStatisticsMXBean; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheMetrics; /** * This interface defines JMX view on {@link IgniteCache}. @@ -322,4 +322,4 @@ public interface CacheMetricsMXBean extends CacheStatisticsMXBean, CacheMXBean, /** {@inheritDoc} */ @MXBeanDescription("True when a cache is in write-through mode.") public boolean isWriteThrough(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java index a3c946d..ea3a57a 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java @@ -17,7 +17,7 @@ package org.apache.ignite.mxbean; -import org.apache.ignite.cluster.*; +import org.apache.ignite.cluster.ClusterMetrics; /** * MBean for local node metrics. @@ -250,4 +250,4 @@ public interface ClusterLocalNodeMetricsMXBean extends ClusterMetrics { /** {@inheritDoc} */ @MXBeanDescription("Total number of nodes.") public int getTotalNodes(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index cb63c4b..4755bf2 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -17,8 +17,9 @@ package org.apache.ignite.mxbean; -import javax.management.*; -import java.util.*; +import java.util.Collection; +import java.util.UUID; +import javax.management.JMException; /** * This interface defines JMX view on kernal. @@ -365,4 +366,4 @@ public interface IgniteMXBean { */ @MXBeanDescription("Prints last suppressed errors.") public void printLastErrors(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java index 106c38b..2ee2def 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java @@ -148,4 +148,4 @@ public interface IgnitionMXBean { } ) public void restart(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/mxbean/MXBeanDescription.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java index dfc759c..3c191bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java @@ -17,7 +17,11 @@ package org.apache.ignite.mxbean; -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; /** * Provides description for MBean classes and methods. @@ -31,4 +35,4 @@ public @interface MXBeanDescription { * Description for Mbean. */ @SuppressWarnings({"JavaDoc"}) public String 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/mxbean/MXBeanParametersDescriptions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java index 1337e07..def4083 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java @@ -17,7 +17,11 @@ package org.apache.ignite.mxbean; -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; /** * Provides MBean method parameters description. @@ -31,4 +35,4 @@ public @interface MXBeanParametersDescriptions { * Array of descriptions for parameters. */ @SuppressWarnings({"JavaDoc"}) public String[] 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/mxbean/MXBeanParametersNames.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java index 3fc7885..fa7c20e 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java @@ -17,7 +17,11 @@ package org.apache.ignite.mxbean; -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; /** * Provides MBean method parameters names. @@ -31,4 +35,4 @@ public @interface MXBeanParametersNames { * Array of parameter names in MBean. */ @SuppressWarnings({"JavaDoc"}) public String[] 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/mxbean/ThreadPoolMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java index 5e48574..f312a1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java @@ -149,4 +149,4 @@ public interface ThreadPoolMXBean { */ @MXBeanDescription("Class name of thread factory used to create new threads.") public String getThreadFactoryClass(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java index 2bb0996..d4331b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java @@ -17,10 +17,9 @@ package org.apache.ignite.plugin; +import java.io.Serializable; import org.apache.ignite.configuration.CacheConfiguration; -import java.io.*; - /** * Cache plugin configuration. It is a point to extend existing {@link CacheConfiguration} * and extend existing functionality of cache. @@ -33,4 +32,4 @@ public interface CachePluginConfiguration<K, V> extends Serializable { * @param ctx Plugin context. */ public CachePluginProvider createProvider(CachePluginContext ctx); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java index f034312..b8869ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginContext.java @@ -17,9 +17,11 @@ package org.apache.ignite.plugin; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.spi.discovery.DiscoverySpi; /** @@ -62,4 +64,4 @@ public interface CachePluginContext<C extends CachePluginConfiguration> { * @return Logger. */ public IgniteLogger log(Class<?> cls); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java index ea5f795..11550ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java @@ -17,10 +17,10 @@ package org.apache.ignite.plugin; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.jetbrains.annotations.Nullable; /** * Cache plugin provider is a point for processing of properties @@ -81,4 +81,4 @@ public interface CachePluginProvider<C extends CachePluginConfiguration> { */ public void validateRemote(CacheConfiguration locCfg, C locPluginCcfg, CacheConfiguration rmtCfg, ClusterNode rmtNode) 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/plugin/Extension.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java b/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java index cd6e479..c02902e 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java @@ -22,4 +22,4 @@ package org.apache.ignite.plugin; */ public interface Extension { // 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/plugin/ExtensionRegistry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java index d7c977f..0ff82ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java @@ -29,4 +29,4 @@ public interface ExtensionRegistry { * @param <T> Extension type. */ public <T extends Extension> void registerExtension(Class<T> extensionItf, T extensionImpl); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java index 7a8a99a..bbe6d61 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java @@ -22,4 +22,4 @@ package org.apache.ignite.plugin; */ public interface IgnitePlugin { // 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/plugin/PluginConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java index 1a4e2dc..ef92b54 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java @@ -22,4 +22,4 @@ package org.apache.ignite.plugin; */ public interface PluginConfiguration { // 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/plugin/PluginContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java index b519bd1..f9b6aef 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java @@ -17,15 +17,15 @@ package org.apache.ignite.plugin; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.spi.*; +import java.util.Collection; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.spi.IgnitePortProtocol; import org.apache.ignite.spi.discovery.DiscoverySpi; -import java.util.*; - /** * Plugin context. */ @@ -96,4 +96,4 @@ public interface PluginContext { * @param cls Class. */ public void deregisterPorts(Class<?> cls); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java index 7dd2ae7..5d36738 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginNotFoundException.java @@ -17,7 +17,7 @@ package org.apache.ignite.plugin; -import org.apache.ignite.*; +import org.apache.ignite.IgniteException; /** * Exception thrown if plugin is not found. @@ -38,4 +38,4 @@ public class PluginNotFoundException extends IgniteException { public PluginNotFoundException(String name) { super("Ignite plugin not found: " + 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/plugin/PluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java index f064fde..47acf0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java @@ -17,13 +17,13 @@ package org.apache.ignite.plugin; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.ServiceLoader; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.jetbrains.annotations.Nullable; /** * Pluggable Ignite component. @@ -135,4 +135,4 @@ public interface PluginProvider<C extends PluginConfiguration> { * @throws PluginValidationException If cluster-wide plugin validation failed. */ public void validateNewNode(ClusterNode node) throws PluginValidationException; -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java index 31f334f..bb71b56 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginValidationException.java @@ -17,9 +17,8 @@ package org.apache.ignite.plugin; -import org.apache.ignite.*; - -import java.util.*; +import java.util.UUID; +import org.apache.ignite.IgniteException; /** * TODO: Add class description. @@ -65,4 +64,4 @@ public class PluginValidationException extends IgniteException { public String remoteMessage() { return rmtMsg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java index e87b82c..3d6504d 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java @@ -17,9 +17,8 @@ package org.apache.ignite.plugin.extensions.communication; -import org.apache.ignite.plugin.*; - -import java.util.concurrent.*; +import java.util.concurrent.Executor; +import org.apache.ignite.plugin.Extension; /** * The interface of IO Messaging Pool Extension. @@ -39,4 +38,4 @@ public interface IoPool extends Extension { * @return The executor. */ public Executor executor(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java index 7755858..67f3351 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java @@ -17,8 +17,8 @@ package org.apache.ignite.plugin.extensions.communication; -import java.io.*; -import java.nio.*; +import java.io.Serializable; +import java.nio.ByteBuffer; /** * Base class for all communication messages. @@ -55,4 +55,4 @@ public interface Message extends Serializable { * @return Fields count. */ public byte fieldsCount(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java index ecb79cb..2134912 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageCollectionItemType.java @@ -17,7 +17,7 @@ package org.apache.ignite.plugin.extensions.communication; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nullable; /** * Enum representing possible types of collection items. @@ -98,4 +98,4 @@ public enum MessageCollectionItemType { @Nullable public static MessageCollectionItemType 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/plugin/extensions/communication/MessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java index 4e0ea8a..bfae912 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java @@ -17,8 +17,8 @@ package org.apache.ignite.plugin.extensions.communication; -import org.apache.ignite.plugin.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.plugin.Extension; +import org.jetbrains.annotations.Nullable; /** * Factory for communication messages. @@ -38,4 +38,4 @@ public interface MessageFactory extends Extension { * @return Message instance. */ @Nullable public Message create(byte type); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java index 85f6045..4c9e0ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java @@ -17,7 +17,7 @@ package org.apache.ignite.plugin.extensions.communication; -import org.apache.ignite.plugin.*; +import org.apache.ignite.plugin.Extension; /** * Provides a custom format for communication messages. @@ -45,4 +45,4 @@ public interface MessageFormatter extends Extension { * @return Message reader. */ public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java index 11ea97d..d40a384 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java @@ -17,10 +17,13 @@ package org.apache.ignite.plugin.extensions.communication; -import org.apache.ignite.lang.*; - -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.BitSet; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.lang.IgniteUuid; /** * Communication message reader. @@ -269,4 +272,4 @@ public interface MessageReader { * Increments read state. */ public void incrementState(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java index 777f2e6..2fef564 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java @@ -17,10 +17,12 @@ package org.apache.ignite.plugin.extensions.communication; -import org.apache.ignite.lang.*; - -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.BitSet; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.lang.IgniteUuid; /** * Communication message writer. @@ -313,4 +315,4 @@ public interface MessageWriter { * Resets this writer. */ public void reset(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java index a10a96d..16e282d 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java @@ -17,8 +17,8 @@ package org.apache.ignite.plugin.security; -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.UUID; /** * Authentication context. @@ -107,4 +107,4 @@ public class AuthenticationContext { public void address(InetSocketAddress addr) { this.addr = addr; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java index f3b0e24..392aa3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java @@ -17,12 +17,14 @@ package org.apache.ignite.plugin.security; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * Security credentials used for node authentication. Security credentials @@ -188,4 +190,4 @@ public class SecurityCredentials implements Externalizable { @Override public String toString() { return S.toString(SecurityCredentials.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/plugin/security/SecurityCredentialsBasicProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java index 90b3352..7a12392 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java @@ -17,7 +17,7 @@ package org.apache.ignite.plugin.security; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Basic implementation for {@link SecurityCredentialsProvider}. Use it @@ -41,4 +41,4 @@ public class SecurityCredentialsBasicProvider implements SecurityCredentialsProv @Override public SecurityCredentials credentials() throws IgniteCheckedException { return cred; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java index 4f65437..19bd5b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java @@ -17,7 +17,7 @@ package org.apache.ignite.plugin.security; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Security credentials provider for specifying security credentials. @@ -41,4 +41,4 @@ public interface SecurityCredentialsProvider { * @throws IgniteCheckedException If failed. */ public SecurityCredentials credentials() 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/plugin/security/SecurityException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java index 84fa5a4..12706ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java @@ -17,8 +17,8 @@ package org.apache.ignite.plugin.security; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteException; +import org.jetbrains.annotations.Nullable; /** * Common security exception for the grid. @@ -58,4 +58,4 @@ public class SecurityException extends IgniteException { public SecurityException(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/plugin/security/SecurityPermission.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java index 0e660d2..9f63c1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java @@ -17,7 +17,7 @@ package org.apache.ignite.plugin.security; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nullable; /** * Supported security permissions within grid. Permissions @@ -69,4 +69,4 @@ public enum SecurityPermission { @Nullable public static SecurityPermission 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/plugin/security/SecurityPermissionSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java index aa5a139..eecc169 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java @@ -17,10 +17,10 @@ package org.apache.ignite.plugin.security; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Collection; +import java.util.Map; +import org.jetbrains.annotations.Nullable; /** * Security permission set for authorized security subjects. Permission set @@ -63,4 +63,4 @@ public interface SecurityPermissionSet extends Serializable { * @return Collection of system-wide permissions. */ @Nullable public Collection<SecurityPermission> systemPermissions(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java index d14666f..1cf403a 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java @@ -17,9 +17,9 @@ package org.apache.ignite.plugin.security; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.Serializable; +import java.net.InetSocketAddress; +import java.util.UUID; /** * Security subject representing authenticated node with a set of permissions. @@ -59,4 +59,4 @@ public interface SecuritySubject extends Serializable { * @return Authorized permission set for the subject. */ public SecurityPermissionSet permissions(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java index f625a3a..2481539 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java @@ -17,8 +17,8 @@ package org.apache.ignite.plugin.security; -import org.apache.ignite.cluster.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.cluster.ClusterNode; +import org.jetbrains.annotations.Nullable; /** * Supported security subject types. Subject type can be retrieved form {@link SecuritySubject#type()} method. @@ -46,4 +46,4 @@ public enum SecuritySubjectType { @Nullable public static SecuritySubjectType 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/plugin/segmentation/SegmentationPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java index df310cd..69ec1ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationPolicy.java @@ -46,4 +46,4 @@ public enum SegmentationPolicy { * implement logic to handle this event. */ NOOP -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java index e34cf61..3cdfddb 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/SegmentationResolver.java @@ -17,10 +17,9 @@ package org.apache.ignite.plugin.segmentation; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; - -import java.io.*; +import java.io.Serializable; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.IgniteConfiguration; /** * This is interface for segmentation (a.k.a "split-brain" problem) resolvers. @@ -62,4 +61,4 @@ public interface SegmentationResolver extends Serializable { * @throws IgniteCheckedException If an error occurred. */ public abstract boolean isValidSegment() 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/portable/PortableBuilder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java index a899c46..377fcdc 100644 --- a/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableBuilder.java @@ -17,9 +17,8 @@ package org.apache.ignite.portable; -import org.apache.ignite.*; - -import org.jetbrains.annotations.*; +import org.apache.ignite.IgnitePortables; +import org.jetbrains.annotations.Nullable; /** * Portable object builder. Provides ability to build portable objects dynamically without having class definitions. @@ -135,4 +134,4 @@ public interface PortableBuilder { * @throws PortableException In case of error. */ public PortableObject build() throws PortableException; -} +} \ No newline at end of file
