http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java index bbb23e7..18ab1b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterAdapter.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Class that defines the piece for application-to-network and vice-versa data conversions @@ -180,4 +180,4 @@ public abstract class GridNioFilterAdapter implements GridNioFilter { throw new GridNioException("Failed to proceed with filter call since previous filter is not set " + "(do you use filter outside the filter chain?): " + getClass().getName()); } -} +} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java index 32b2832..8a43e29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.typedef.internal.LT; /** * Filter chain implementation for nio server filters. @@ -289,4 +290,4 @@ public class GridNioFilterChain<T> extends GridNioFilterAdapter { return proceedResumeReads(ses); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java index aac238a..34c3670 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFinishedFuture.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteInClosure; /** * Future that represents already completed result. @@ -72,4 +72,4 @@ public class GridNioFinishedFuture<R> extends GridFinishedFuture<R> implements G @Override public String toString() { return S.toString(GridNioFinishedFuture.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/internal/util/nio/GridNioFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java index 5a884f0..d81760d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.lang.IgniteInClosure; /** * NIO future. @@ -53,4 +53,4 @@ public interface GridNioFuture<R> extends IgniteInternalFuture<R> { * @return Ack closure. */ public IgniteInClosure<IgniteException> ackClosure(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java index e71bf92..0fc6841 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteInClosure; /** * Default future implementation. @@ -64,4 +64,4 @@ public class GridNioFutureImpl<R> extends GridFutureAdapter<R> implements GridNi @Override public String toString() { return S.toString(GridNioFutureImpl.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java index 0a503fd..fdc60eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageReader.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.UUID; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageFactory; +import org.jetbrains.annotations.Nullable; /** * Message reader. @@ -39,4 +39,4 @@ public interface GridNioMessageReader { * @return Optional message factory. */ @Nullable public MessageFactory messageFactory(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java index c9ed1a0..e02c7ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageTracker.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; - -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteRunnable; /** * Message tracker. @@ -135,4 +135,4 @@ public class GridNioMessageTracker implements IgniteRunnable { @Override public String toString() { return S.toString(GridNioMessageTracker.class, this, "hash", System.identityHashCode(this)); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java index fa1ac36..d53ab98 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMessageWriter.java @@ -17,12 +17,12 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.UUID; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.jetbrains.annotations.Nullable; /** * Message writer. @@ -46,4 +46,4 @@ public interface GridNioMessageWriter { */ public int writeFully(@Nullable UUID nodeId, Message msg, OutputStream out, ByteBuffer buf) throws IOException; -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java index 93414c0..7f458fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java @@ -30,4 +30,4 @@ public interface GridNioMetricsListener { * @param bytesCnt Number of received bytes. */ public void onBytesReceived(int bytesCnt); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java index 6585ec6..bc63dc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioParser.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import org.apache.ignite.IgniteCheckedException; +import org.jetbrains.annotations.Nullable; /** * This interface declares a basic contract on message parsing and encoding to the underlying network layer. @@ -59,4 +58,4 @@ public interface GridNioParser { * @throws IgniteCheckedException If any user-specific error occurred while encoding data. */ public ByteBuffer encode(GridNioSession ses, Object msg) throws IOException, 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/internal/util/nio/GridNioRecoveryDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java index a7ed02a..42656c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java @@ -17,14 +17,16 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.ArrayDeque; +import java.util.Deque; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteInClosure; +import org.jetbrains.annotations.Nullable; /** * Recovery information for single node. @@ -375,4 +377,4 @@ public class GridNioRecoveryDescriptor { @Override public String toString() { return S.toString(GridNioRecoveryDescriptor.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 2d60f98..82fb1bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -17,31 +17,61 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.nio.ssl.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.util.worker.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.apache.ignite.thread.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; -import sun.nio.ch.*; - -import java.io.*; -import java.net.*; -import java.nio.*; -import java.nio.channels.*; -import java.nio.channels.spi.*; -import java.util.*; -import java.util.Map.*; - -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.channels.ClosedByInterruptException; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ClosedSelectorException; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; +import java.nio.channels.WritableByteChannel; +import java.nio.channels.spi.SelectorProvider; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Queue; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.GridConcurrentHashSet; +import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +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.LT; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.worker.GridWorker; +import org.apache.ignite.lang.IgniteBiInClosure; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageFormatter; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.apache.ignite.thread.IgniteThread; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentLinkedDeque8; +import sun.nio.ch.DirectBuffer; + +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.ACK_CLOSURE; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MSG_WRITER; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.NIO_OPERATION; /** * TCP NIO server. Due to asynchronous nature of connections processing @@ -2440,4 +2470,4 @@ public class GridNioServer<T> { return this; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java index 269a8ce..46ffe46 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerBuffer.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; - -import java.nio.*; +import java.nio.ByteBuffer; +import org.apache.ignite.IgniteCheckedException; +import org.jetbrains.annotations.Nullable; /** * NIO server buffer. @@ -114,4 +113,4 @@ public class GridNioServerBuffer { else 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/internal/util/nio/GridNioServerListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java index f268831..29e482a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.nio; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nullable; /** * Listener passed in to the {@link GridNioServer} that will be notified on client events. @@ -61,4 +61,4 @@ public interface GridNioServerListener<T> { * @param ses Session that is idle. */ public void onSessionIdleTimeout(GridNioSession ses); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java index 4440579..2cc16f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListenerAdapter.java @@ -30,4 +30,4 @@ public abstract class GridNioServerListenerAdapter<T> implements GridNioServerLi @Override public void onSessionIdleTimeout(GridNioSession ses) { // No-op. } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java index bcf8d10..e4a7225 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util.nio; -import org.jetbrains.annotations.*; - -import java.net.*; +import java.net.InetSocketAddress; +import org.jetbrains.annotations.Nullable; /** * This interface represents established or closed connection between nio server and remote client. @@ -165,4 +164,4 @@ public interface GridNioSession { * @return Recovery descriptor if recovery is supported, {@code null otherwise.} */ @Nullable public GridNioRecoveryDescriptor recoveryDescriptor(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java index 4ab02fe..0bcfe64 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java @@ -17,14 +17,14 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; +import java.net.InetSocketAddress; +import java.util.concurrent.atomic.AtomicLong; +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.jetbrains.annotations.Nullable; -import java.net.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MAX_KEYS_CNT; /** * @@ -309,4 +309,4 @@ public class GridNioSessionImpl implements GridNioSession { @Override public String toString() { return S.toString(GridNioSessionImpl.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java index 23c1e22..b5387d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.nio; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicInteger; /** * Meta keys for {@link GridNioSession}. @@ -72,4 +72,4 @@ public enum GridNioSessionMetaKey { return res; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java index 458786b..6b1f6a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java @@ -17,18 +17,18 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.net.*; -import java.nio.*; -import java.nio.channels.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.SelectionKey; +import java.util.Collection; +import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentLinkedDeque8; /** * Session implementation bound to selector API and socket API. @@ -302,4 +302,4 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl { @Override public String toString() { return S.toString(GridSelectorNioSessionImpl.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/internal/util/nio/GridShmemCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java index 67d4664..93e789d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java @@ -17,17 +17,23 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.ipc.shmem.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryClientEndpoint; +import org.apache.ignite.internal.util.lang.IgniteInClosure2X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageFormatter; +import org.jetbrains.annotations.Nullable; /** * @@ -148,4 +154,4 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien @Override public String toString() { return S.toString(GridShmemCommunicationClient.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/internal/util/nio/GridTcpNioCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java index 7933001..4022bc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpNioCommunicationClient.java @@ -17,18 +17,22 @@ package org.apache.ignite.internal.util.nio; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.*; - -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.lang.IgniteInClosure2X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.ACK_CLOSURE; /** * Grid client for NIO server. @@ -152,4 +156,4 @@ public class GridTcpNioCommunicationClient extends GridAbstractCommunicationClie @Override public String toString() { return S.toString(GridTcpNioCommunicationClient.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/internal/util/nio/ssl/BlockingSslHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java index 1393e50..bb566cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java @@ -17,18 +17,27 @@ package org.apache.ignite.internal.util.nio.ssl; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import javax.net.ssl.*; -import javax.net.ssl.SSLEngineResult.*; -import java.io.*; -import java.nio.*; -import java.nio.channels.*; - -import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*; -import static javax.net.ssl.SSLEngineResult.Status.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.channels.SocketChannel; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLEngineResult; +import javax.net.ssl.SSLEngineResult.HandshakeStatus; +import javax.net.ssl.SSLEngineResult.Status; +import javax.net.ssl.SSLException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.nio.GridNioException; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_TASK; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_UNWRAP; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING; +import static javax.net.ssl.SSLEngineResult.Status.BUFFER_UNDERFLOW; +import static javax.net.ssl.SSLEngineResult.Status.CLOSED; +import static javax.net.ssl.SSLEngineResult.Status.OK; /** * @@ -516,4 +525,4 @@ public class BlockingSslHandler { return cp; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java index c3cb084..63cdd83 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslFilter.java @@ -17,15 +17,25 @@ package org.apache.ignite.internal.util.nio.ssl; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import javax.net.ssl.*; -import java.io.*; -import java.nio.*; - -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.nio.GridNioException; +import org.apache.ignite.internal.util.nio.GridNioFilterAdapter; +import org.apache.ignite.internal.util.nio.GridNioFinishedFuture; +import org.apache.ignite.internal.util.nio.GridNioFuture; +import org.apache.ignite.internal.util.nio.GridNioFutureImpl; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.SSL_HANDLER; /** * Implementation of SSL filter using {@link SSLEngine} @@ -394,4 +404,4 @@ public class GridNioSslFilter extends GridNioFilterAdapter { return (ByteBuffer)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/internal/util/nio/ssl/GridNioSslHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java index 8c1ac5a..3272b8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/GridNioSslHandler.java @@ -17,20 +17,34 @@ package org.apache.ignite.internal.util.nio.ssl; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import javax.net.ssl.*; -import java.nio.*; -import java.util.*; -import java.util.concurrent.locks.*; - -import static javax.net.ssl.SSLEngineResult.*; -import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*; -import static javax.net.ssl.SSLEngineResult.Status.*; -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; -import static org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter.*; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.LinkedList; +import java.util.Queue; +import java.util.concurrent.locks.ReentrantLock; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLEngineResult; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSession; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.nio.GridNioEmbeddedFuture; +import org.apache.ignite.internal.util.nio.GridNioException; +import org.apache.ignite.internal.util.nio.GridNioFuture; +import org.apache.ignite.internal.util.nio.GridNioFutureImpl; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static javax.net.ssl.SSLEngineResult.HandshakeStatus; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_TASK; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_UNWRAP; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING; +import static javax.net.ssl.SSLEngineResult.Status; +import static javax.net.ssl.SSLEngineResult.Status.BUFFER_UNDERFLOW; +import static javax.net.ssl.SSLEngineResult.Status.CLOSED; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.SSL_ENGINE; +import static org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter.HANDSHAKE_FUT_META_KEY; /** * Class that encapsulate the per-session SSL state, encoding and decoding logic. @@ -679,4 +693,4 @@ class GridNioSslHandler extends ReentrantLock { return buf; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java index c91ca21..1ef53c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java @@ -17,15 +17,25 @@ package org.apache.ignite.internal.util.nodestart; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +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.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; /** * Util methods for {@code IgniteCluster.startNodes(..)} methods. @@ -388,4 +398,4 @@ public class IgniteNodeStartUtils { return addrs; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java index b3f9bb1..99b731a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteRemoteStartSpecification.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.util.nodestart; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; - -import java.io.*; +import java.io.File; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.typedef.F; +import org.jetbrains.annotations.Nullable; /** * Host data. @@ -276,4 +275,4 @@ public class IgniteRemoteStartSpecification { if (cfg != null) cfg = cfg.replace('\\', separator).replace('/', separator); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java index 14a35b7..296a952 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.nodestart; -import java.util.concurrent.*; +import java.util.concurrent.Callable; /** * SSH processor, interface was introduced to avoid mandatory runtime dependency on SSH library. @@ -31,4 +31,4 @@ public interface IgniteSshHelper { * @return {@link Callable} starting node using SSH. */ public StartNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java index a1a2046..4fdd0cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util.nodestart; -import org.apache.ignite.cluster.*; - -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import org.apache.ignite.cluster.ClusterStartNodeResult; /** * SSH-based node starter, returns tuple which contains hostname, success flag and error message @@ -27,4 +26,4 @@ import java.util.concurrent.*; */ public interface StartNodeCallable extends Callable<ClusterStartNodeResult> { // No-op. -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java index 408cb38..59df8d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvent.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.offheap; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nullable; /** * Off-heap event types. @@ -44,4 +44,4 @@ public enum GridOffHeapEvent { @Nullable public static GridOffHeapEvent 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/internal/util/offheap/GridOffHeapEventListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java index 856a0de..158475b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEventListener.java @@ -23,4 +23,4 @@ package org.apache.ignite.internal.util.offheap; public interface GridOffHeapEventListener { /** Event notification. */ public void onEvent(GridOffHeapEvent evt); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java index f1e1741..4597be8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapEvictListener.java @@ -30,4 +30,4 @@ public interface GridOffHeapEvictListener { * @param valBytes Value bytes. */ public void onEvict(int part, int hash, byte[] keyBytes, byte[] valBytes); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java index d10aa22..1fcddd7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMap.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.util.offheap; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; +import org.apache.ignite.internal.util.typedef.CX2; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; /** * Off-heap map. @@ -204,4 +205,4 @@ public interface GridOffHeapMap<K> { * another listener already exists. */ public boolean eventListener(GridOffHeapEventListener 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/internal/util/offheap/GridOffHeapMapFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java index d46ff2b..1a3d219 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapFactory.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal.util.offheap; -import org.apache.ignite.internal.util.offheap.unsafe.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMap; +import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafePartitionedMap; +import org.jetbrains.annotations.Nullable; /** * Factory for off-heap maps. @@ -222,4 +223,4 @@ public class GridOffHeapMapFactory { long initCap, long totalMem, short lruStripes, @Nullable GridOffHeapEvictListener lsnr) { return new GridUnsafePartitionedMap(parts, concurrency, load, initCap, totalMem, lruStripes, 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/internal/util/offheap/GridOffHeapOutOfMemoryException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java index 8598fed..4ceaa7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapOutOfMemoryException.java @@ -47,4 +47,4 @@ public class GridOffHeapOutOfMemoryException extends RuntimeException { @Override public String toString() { return getClass() + ": " + getMessage(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java index a945262..3afdfa9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java @@ -17,12 +17,12 @@ package org.apache.ignite.internal.util.offheap; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.Set; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; +import org.apache.ignite.internal.util.typedef.CX2; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; /** * Off-heap map. @@ -235,4 +235,4 @@ public interface GridOffHeapPartitionedMap { * another listener already exists. */ public boolean eventListener(GridOffHeapEventListener 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/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java index dde2330..273ea89 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointer.java @@ -35,4 +35,4 @@ public interface GridOffHeapSmartPointer { * Decrement reference count. */ public void decrementRefCount(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java index 1885947..b8b24bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSmartPointerFactory.java @@ -26,4 +26,4 @@ public interface GridOffHeapSmartPointerFactory<T extends GridOffHeapSmartPointe * @return Smart pointer instance (may or may not return the same instance multiple times). */ public T createPointer(long ptr); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java index 038c05b..04ea56c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java @@ -35,15 +35,29 @@ package org.apache.ignite.internal.util.offheap.unsafe; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; +import java.io.Closeable; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.SortedSet; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * A concurrent AVL tree with fast cloning, based on the algorithm of Bronson, @@ -4454,4 +4468,3 @@ public class GridOffHeapSnapTreeMap<K extends GridOffHeapSmartPointer,V extends } - http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java index 8b183e4..8b32ceb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeCompoundMemory.java @@ -32,4 +32,4 @@ public interface GridUnsafeCompoundMemory { * @param compound Compound memory. */ public void merge(GridUnsafeCompoundMemory compound); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java index 8e7f1d5..c461cf1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeGuard.java @@ -17,10 +17,12 @@ package org.apache.ignite.internal.util.offheap.unsafe; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Guards concurrent operations on offheap memory to make sure that no thread will access already deallocated pointer. @@ -371,4 +373,4 @@ public class GridUnsafeGuard { return S.toString(Finalizer.class, this); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java index 0be313e..aaff4f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLru.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.util.offheap.unsafe; -import org.apache.ignite.internal.util.offheap.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Striped LRU queue. @@ -624,4 +625,4 @@ class GridUnsafeLru { return S.toString(LruStripe.class, this); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java index a9d35e77..d957b3a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeLruPoller.java @@ -27,4 +27,4 @@ interface GridUnsafeLruPoller { * @param size Size of the space to free. */ public void lruPoll(int size); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java index e36d85b..40fb3e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java @@ -17,19 +17,27 @@ package org.apache.ignite.internal.util.offheap.unsafe; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.offheap.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.locks.*; - -import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.*; +import java.util.LinkedList; +import java.util.NoSuchElementException; +import java.util.Queue; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.GridCloseableIteratorAdapter; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; +import org.apache.ignite.internal.util.offheap.GridOffHeapEventListener; +import org.apache.ignite.internal.util.offheap.GridOffHeapEvictListener; +import org.apache.ignite.internal.util.offheap.GridOffHeapMap; +import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException; +import org.apache.ignite.internal.util.typedef.CX2; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; +import org.jsr166.LongAdder8; + +import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.REHASH; /** * Off-heap map based on {@code Unsafe} implementation. @@ -1750,4 +1758,4 @@ public class GridUnsafeMap<K> implements GridOffHeapMap<K> { return len == keyBytes.length && mem.compare(ptr + HEADER, keyBytes); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java index 0f51e56..cf0cb5c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java @@ -17,18 +17,19 @@ package org.apache.ignite.internal.util.offheap.unsafe; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.offheap.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import sun.misc.*; - -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.*; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.offheap.GridOffHeapEventListener; +import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteBiTuple; +import sun.misc.Unsafe; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_OFFHEAP_SAFE_RELEASE; +import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.ALLOCATE; +import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.RELEASE; /** * Unsafe memory. @@ -714,4 +715,4 @@ public class GridUnsafeMemory { @Override public String toString() { return S.toString(GridUnsafeMemory.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java index 4ffc33f..070da51 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java @@ -17,16 +17,20 @@ package org.apache.ignite.internal.util.offheap.unsafe; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.offheap.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; +import java.util.NoSuchElementException; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.GridCloseableIteratorAdapter; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; +import org.apache.ignite.internal.util.offheap.GridOffHeapEventListener; +import org.apache.ignite.internal.util.offheap.GridOffHeapEvictListener; +import org.apache.ignite.internal.util.offheap.GridOffHeapMap; +import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMap; +import org.apache.ignite.internal.util.typedef.CX2; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; +import org.jsr166.LongAdder8; /** * Off-heap map based on {@code Unsafe} implementation. @@ -413,4 +417,4 @@ public class GridUnsafePartitionedMap implements GridOffHeapPartitionedMap { curIt.close(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java index 2af2125..2e9b58f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.util.portscanner; -import org.apache.ignite.*; - -import java.io.*; -import java.net.*; -import java.nio.channels.*; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.UnknownHostException; +import java.nio.channels.FileLock; +import org.apache.ignite.IgniteSystemProperties; /** * Ignite port scanner. @@ -173,4 +176,4 @@ public class GridJmxPortFinder { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java index cadb45e..685668a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java @@ -35,8 +35,8 @@ package org.apache.ignite.internal.util.snaptree; -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.AbstractQueuedSynchronizer; /** Manages copy-on-write behavior for a concurrent tree structure. It is * assumed that the managed structure allows concurrent mutation, but that no @@ -387,4 +387,4 @@ abstract public class CopyOnWriteManager<E> implements Cloneable { succ.awaitActivated(); return succ.initialSize; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java index 751ac4a..c85320d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java @@ -128,4 +128,4 @@ abstract public class Epoch { Epoch.this.onClosed(dataSum); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java index 8bc4b39..7ceec45 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java @@ -35,7 +35,8 @@ package org.apache.ignite.internal.util.snaptree; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; /** Provides an implementation of the behavior of an {@link Epoch}. */ @SuppressWarnings("ALL") @@ -429,4 +430,4 @@ abstract class EpochNode extends AtomicLong implements Epoch.Ticket { return 1; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java index 77e7c58..b5c6545 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/SnapTreeMap.java @@ -35,9 +35,23 @@ package org.apache.ignite.internal.util.snaptree; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.concurrent.ConcurrentNavigableMap; // TODO: optimized buildFromSorted // TODO: submap.clone() @@ -2894,4 +2908,4 @@ public class SnapTreeMap<K,V> extends AbstractMap<K,V> implements ConcurrentNavi holderRef = new COWMgr<K,V>(holder, size); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java index 345bb7c..6faa4c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java @@ -17,14 +17,15 @@ package org.apache.ignite.internal.util.spring; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.resource.*; -import org.apache.ignite.lang.*; - -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.InputStream; +import java.net.URL; +import java.util.Collection; +import java.util.Map; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.processors.resource.GridSpringResourceContext; +import org.apache.ignite.lang.IgniteBiTuple; /** * Spring helper which can parse Spring configuration files, interface was introduced to avoid mandatory @@ -154,4 +155,4 @@ public interface IgniteSpringHelper { * was explicitly specified. */ public String userVersion(ClassLoader ldr, IgniteLogger 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/internal/util/test/GridTestPrintStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java index c79dacf..611853f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java @@ -17,8 +17,13 @@ package org.apache.ignite.internal.util.test; -import java.io.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; /** * Print stream that prints each thread group into a separate buffer. Use @@ -290,4 +295,4 @@ public class GridTestPrintStream extends PrintStream { byteOut.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/internal/util/test/GridTestPrintStreamFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java index 4c520c5..e3d2a2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStreamFactory.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.test; -import java.io.*; +import java.io.PrintStream; /** * Factory that allow to acquire/release Print Stream for test logging. @@ -125,4 +125,4 @@ public final class GridTestPrintStreamFactory { if (errCnt == 0) System.setErr(sysErr); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java index 3ff6f3c..b29d7cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java @@ -17,15 +17,28 @@ package org.apache.ignite.internal.util.tostring; -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.lang.reflect.*; -import java.util.*; -import java.util.concurrent.locks.*; +import java.io.Externalizable; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Collection; +import java.util.EventListener; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Queue; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Provides auto-generation framework for {@code toString()} output. @@ -585,4 +598,4 @@ public class GridToStringBuilder { return cd; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java index b585b53..338e496 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringClassDescriptor.java @@ -17,7 +17,10 @@ package org.apache.ignite.internal.util.tostring; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; /** * Simple class descriptor containing simple and fully qualified class names as well as @@ -82,4 +85,4 @@ class GridToStringClassDescriptor { List<GridToStringFieldDescriptor> getFields() { return fields; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java index 2523c2a..c6995d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringExclude.java @@ -17,7 +17,11 @@ package org.apache.ignite.internal.util.tostring; -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; /** * Attach this annotation to a field or a class to indicate that this field or fields of this @@ -29,4 +33,4 @@ import java.lang.annotation.*; @Target({ElementType.FIELD, ElementType.TYPE}) public @interface GridToStringExclude { // No-op. -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java index 15d8fb5..a48a3a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringFieldDescriptor.java @@ -50,4 +50,4 @@ class GridToStringFieldDescriptor { * @return Field name. */ String getName() { return 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/internal/util/tostring/GridToStringInclude.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java index e688ae1..ec502a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringInclude.java @@ -17,7 +17,11 @@ package org.apache.ignite.internal.util.tostring; -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; /** * Attach this annotation to a field or a class to indicate that this field or fields of this @@ -29,4 +33,4 @@ import java.lang.annotation.*; @Target({ElementType.FIELD, ElementType.TYPE}) public @interface GridToStringInclude { // No-op. -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java index 36bdd1b..12032f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringOrder.java @@ -17,7 +17,11 @@ package org.apache.ignite.internal.util.tostring; -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; /** * Attach this annotation to a field to provide its order in @@ -34,4 +38,4 @@ public @interface GridToStringOrder { * Numeric order value. */ @SuppressWarnings({"JavaDoc"}) int 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/internal/util/tostring/GridToStringThreadLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java index 30b52ac..ab91452 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringThreadLocal.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.tostring; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.util.typedef.internal.SB; /** * Helper wrapper containing StringBuilder and additional values. Stored as a thread-lcal variable. @@ -52,4 +52,4 @@ class GridToStringThreadLocal { Object[] getAdditionalValues() { return addVals; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java index 2d52875..091bff1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C1.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.util.typedef; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.util.lang.GridFunc; +import org.apache.ignite.lang.IgniteClosure; /** * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteClosure} by extending it. Since Java doesn't provide type aliases @@ -29,4 +29,4 @@ import org.apache.ignite.lang.*; * @see GridFunc * @see org.apache.ignite.lang.IgniteClosure */ -public interface C1<E1, R> extends IgniteClosure<E1, R> { /* No-op. */ } +public interface C1<E1, R> extends IgniteClosure<E1, R> { /* No-op. */ } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java index 1d674b9..7f7787c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/C2.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.util.typedef; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.util.lang.GridFunc; +import org.apache.ignite.lang.IgniteBiClosure; /** * Defines {@code alias} for {@link org.apache.ignite.lang.IgniteBiClosure} by extending it. Since Java doesn't provide type aliases @@ -30,4 +30,4 @@ import org.apache.ignite.lang.*; * @see GridFunc * @see org.apache.ignite.lang.IgniteBiClosure */ -public interface C2<E1, E2, R> extends IgniteBiClosure<E1, E2, R> { /* No-op. */ } +public interface C2<E1, E2, R> extends IgniteBiClosure<E1, E2, R> { /* No-op. */ } \ No newline at end of file
