http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java index 1840786..92bbb93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridConcurrentHashSet.java @@ -17,8 +17,11 @@ package org.apache.ignite.internal.client.util; -import java.util.*; -import java.util.concurrent.*; +import java.util.AbstractSet; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; /** * Wrapper around concurrent map. @@ -110,4 +113,4 @@ public class GridConcurrentHashSet<E> extends AbstractSet<E> { @Override public String toString() { return map.keySet().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/cluster/ClusterGroupAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java index 6f79267..9039ed8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java @@ -17,22 +17,48 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.executor.*; -import org.apache.ignite.internal.managers.discovery.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.resources.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.InvalidObjectException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteCompute; +import org.apache.ignite.IgniteEvents; +import org.apache.ignite.IgniteMessaging; +import org.apache.ignite.IgniteServices; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.cluster.ClusterMetrics; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.ClusterMetricsSnapshot; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteComputeImpl; +import org.apache.ignite.internal.IgniteEventsImpl; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.IgniteMessagingImpl; +import org.apache.ignite.internal.IgniteNodeAttributes; +import org.apache.ignite.internal.IgniteServicesImpl; +import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.executor.GridExecutorService; +import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; +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.lang.IgnitePredicate; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; /** * @@ -1028,4 +1054,4 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { "', p='" + p.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/cluster/ClusterGroupEmptyCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java index 4601273..636a6ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEmptyCheckedException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.cluster; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nullable; /** * This exception defines illegal call on empty projection. Thrown by projection when operation @@ -52,4 +52,4 @@ public class ClusterGroupEmptyCheckedException extends ClusterTopologyCheckedExc public ClusterGroupEmptyCheckedException(String msg, @Nullable Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java index fcd8611..59da7cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupEx.java @@ -17,11 +17,9 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.cache.*; -import org.apache.ignite.cluster.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.UUID; +import org.apache.ignite.cluster.ClusterGroup; +import org.jetbrains.annotations.Nullable; /** * Internal projection interface. @@ -43,4 +41,4 @@ public interface ClusterGroupEx extends ClusterGroup { * @return Cluster group. */ public ClusterGroup forCacheNodes(@Nullable String cacheName, boolean affNodes, boolean nearNodes, boolean clientNodes); -} +} \ No 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/cluster/ClusterNodeLocalMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java index 4abf1f8..4890231 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java @@ -17,13 +17,19 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jsr166.*; - -import java.io.*; -import java.util.concurrent.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.InvalidObjectException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCluster; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jsr166.ConcurrentHashMap8; /** * Implementation for node-local storage. @@ -98,4 +104,3 @@ public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> impl return S.toString(ClusterNodeLocalMapImpl.class, this); } } - http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java index 39301b3..4e9190b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.cluster.*; +import org.apache.ignite.cluster.ClusterStartNodeResult; /** * Implementation for cluster start node result. @@ -84,4 +84,4 @@ public class ClusterStartNodeResultImpl implements ClusterStartNodeResult { public void setError(String error) { this.error = error; } -} +} \ No 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/cluster/ClusterTopologyCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java index 2d7b0de..9e4bab4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyCheckedException.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.jetbrains.annotations.Nullable; /** * This exception is used to indicate error with grid topology (e.g., crashed node, etc.). @@ -64,4 +64,4 @@ public class ClusterTopologyCheckedException extends IgniteCheckedException { public void retryReadyFuture(IgniteInternalFuture<?> readyFut) { this.readyFut = readyFut; } -} +} \ No 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/cluster/ClusterTopologyServerNotFoundException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java index 1812112..3b300b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterTopologyServerNotFoundException.java @@ -37,4 +37,4 @@ public class ClusterTopologyServerNotFoundException extends ClusterTopologyCheck public ClusterTopologyServerNotFoundException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java index 51cf523..fb9b190 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java @@ -17,16 +17,28 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -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.Externalizable; +import java.io.File; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteCluster; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.cluster.ClusterMetrics; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.cluster.ClusterStartNodeResult; +import org.apache.ignite.internal.AsyncSupportAdapter; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; /** * @@ -309,4 +321,4 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster> protected Object readResolve() throws ObjectStreamException { return cluster.withAsync(); } -} +} \ No 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/cluster/IgniteClusterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java index 4c06031..87b5d9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterEx.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCluster; /** * */ public interface IgniteClusterEx extends IgniteCluster, ClusterGroupEx { // 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/cluster/IgniteClusterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java index 0287ca7..98d8c5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java @@ -17,26 +17,54 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.nodestart.*; -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.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; -import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.*; +import java.io.Externalizable; +import java.io.File; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteCluster; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.cluster.ClusterGroupEmptyException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.cluster.ClusterStartNodeResult; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteComponentType; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.future.GridCompoundFuture; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.nodestart.IgniteRemoteStartSpecification; +import org.apache.ignite.internal.util.nodestart.IgniteSshHelper; +import org.apache.ignite.internal.util.nodestart.StartNodeCallable; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.CI1; +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.CU; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; +import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.parseFile; +import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.specifications; /** * @@ -538,4 +566,4 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus public String toString() { return "IgniteCluster [igniteName=" + ctx.gridName() + ']'; } -} +} \ No 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/cluster/IgniteKillTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java index bd81bc3..ca7487d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteKillTask.java @@ -17,15 +17,19 @@ package org.apache.ignite.internal.cluster; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import java.util.List; +import java.util.Map; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskAdapter; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON; /** * Special kill task that never fails over jobs. @@ -100,4 +104,4 @@ class IgniteKillTask extends ComputeTaskAdapter<Boolean, Void> { 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/compute/ComputeTaskCancelledCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java index f12e671..7a2b437 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskCancelledCheckedException.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.compute; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteCheckedException; +import org.jetbrains.annotations.Nullable; /** * This exception indicates that grid task was cancelled. @@ -55,4 +55,4 @@ public class ComputeTaskCancelledCheckedException extends IgniteCheckedException public ComputeTaskCancelledCheckedException(String msg, @Nullable Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java index 6635640..aad2add 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.compute; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteCheckedException; +import org.jetbrains.annotations.Nullable; /** * This exception indicates that task execution timed out. It is thrown from @@ -58,4 +58,4 @@ public class ComputeTaskTimeoutCheckedException extends IgniteCheckedException { public ComputeTaskTimeoutCheckedException(String msg, @Nullable Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java index 02b6be9..cf56430 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java @@ -17,16 +17,26 @@ package org.apache.ignite.internal.direct; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import sun.misc.*; -import sun.nio.ch.*; - -import java.lang.reflect.*; -import java.nio.*; -import java.util.*; +import java.lang.reflect.Array; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.UUID; +import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageFactory; +import org.apache.ignite.plugin.extensions.communication.MessageFormatter; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import sun.misc.Unsafe; +import sun.nio.ch.DirectBuffer; /** * Portable stream based on {@link ByteBuffer}. @@ -1486,4 +1496,4 @@ public class DirectByteBufferStream { */ public T create(int len); } -} +} \ No 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/direct/DirectMessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java index 91fb43f..7eaab76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java @@ -17,12 +17,18 @@ package org.apache.ignite.internal.direct; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -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; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageFactory; +import org.apache.ignite.plugin.extensions.communication.MessageFormatter; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.jetbrains.annotations.Nullable; /** * Message reader implementation. @@ -292,4 +298,4 @@ public class DirectMessageReader implements MessageReader { @Override public void incrementState() { state++; } -} +} \ No 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/direct/DirectMessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java index 593f34f..ea0f37e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java @@ -17,12 +17,16 @@ package org.apache.ignite.internal.direct; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -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; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.jetbrains.annotations.Nullable; /** * Message writer implementation. @@ -256,4 +260,4 @@ public class DirectMessageWriter implements MessageWriter { @Override public void reset() { state.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/direct/DirectMessageWriterState.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java index f9ab9af..7b4cd9e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.direct; -import java.util.*; +import java.util.Arrays; /** * Writer state. @@ -120,4 +120,4 @@ public class DirectMessageWriterState { stack[0] = INIT_VAL; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java index 779b54d..b3c6a2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.events; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.managers.discovery.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Custom event. @@ -84,4 +85,4 @@ public class DiscoveryCustomEvent extends DiscoveryEvent { @Override public String toString() { return S.toString(DiscoveryCustomEvent.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/executor/GridExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java index e1ce58d..860504f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java @@ -17,19 +17,38 @@ package org.apache.ignite.internal.executor; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.compute.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.GridClosureCallMode.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.cluster.ClusterGroupAdapter; +import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException; +import org.apache.ignite.internal.util.typedef.CX1; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteInClosure; + +import static org.apache.ignite.internal.GridClosureCallMode.BALANCE; /** * An {@link ExecutorService} that executes each submitted task in grid @@ -714,4 +733,4 @@ public class GridExecutorService implements ExecutorService, Externalizable { } } } -} +} \ No 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/igfs/common/IgfsControlResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java index de9bd68..ce7107d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java @@ -17,17 +17,35 @@ package org.apache.ignite.internal.igfs.common; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.igfs.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; - -import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.ArrayList; +import java.util.Collection; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.igfs.IgfsBlockLocation; +import org.apache.ignite.igfs.IgfsCorruptedFileException; +import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException; +import org.apache.ignite.igfs.IgfsException; +import org.apache.ignite.igfs.IgfsFile; +import org.apache.ignite.igfs.IgfsInvalidHdfsVersionException; +import org.apache.ignite.igfs.IgfsParentNotDirectoryException; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.IgfsPathAlreadyExistsException; +import org.apache.ignite.igfs.IgfsPathNotFoundException; +import org.apache.ignite.igfs.IgfsPathSummary; +import org.apache.ignite.internal.processors.igfs.IgfsBlockLocationImpl; +import org.apache.ignite.internal.processors.igfs.IgfsFileImpl; +import org.apache.ignite.internal.processors.igfs.IgfsHandshakeResponse; +import org.apache.ignite.internal.processors.igfs.IgfsInputStreamDescriptor; +import org.apache.ignite.internal.processors.igfs.IgfsStatus; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.CONTROL_RESPONSE; /** * IGFS path command response. @@ -630,4 +648,4 @@ public class IgfsControlResponse extends IgfsMessage { @Override public String toString() { return S.toString(IgfsControlResponse.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/igfs/common/IgfsDataInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java index bfd0c71..9542b35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java @@ -17,7 +17,10 @@ package org.apache.ignite.internal.igfs.common; -import java.io.*; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInput; /** * Data input stream implementing object input but throwing exceptions on object methods. @@ -37,4 +40,4 @@ public class IgfsDataInputStream extends DataInputStream implements ObjectInput @Override public Object readObject() throws ClassNotFoundException, IOException { throw new IOException("This method must not be invoked on IGFS data input stream."); } -} +} \ No 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/igfs/common/IgfsDataOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java index deb6ac3..0431892 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java @@ -17,7 +17,11 @@ package org.apache.ignite.internal.igfs.common; -import java.io.*; +import java.io.DataOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.ObjectOutput; +import java.io.OutputStream; /** * Data output stream implementing ObjectOutput but throwing exceptions on methods working with objects. @@ -40,4 +44,4 @@ public class IgfsDataOutputStream extends DataOutputStream implements ObjectOutp @Override public void writeObject(Object obj) throws IOException { throw new IOException("This method must not be invoked on IGFS data output stream."); } -} +} \ No 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/igfs/common/IgfsHandshakeRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java index ec8ef6e..21da5b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.igfs.common; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.util.typedef.internal.S; -import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.HANDSHAKE; /** * Handshake request. @@ -90,4 +90,4 @@ public class IgfsHandshakeRequest extends IgfsMessage { @Override public String toString() { return S.toString(IgfsHandshakeRequest.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/igfs/common/IgfsIpcCommand.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java index f92d9cc..e39319b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.igfs.common; -import java.util.*; +import java.util.Arrays; +import java.util.List; /** * Grid file system commands to call remotely. @@ -95,4 +96,4 @@ public enum IgfsIpcCommand { public static IgfsIpcCommand valueOf(int ordinal) { return ALL.get(ordinal); } -} +} \ No 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/igfs/common/IgfsLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java index defbbbc..4a0d99b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java @@ -17,16 +17,28 @@ package org.apache.ignite.internal.igfs.common; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.internal.*; -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.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.util.Collection; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jsr166.ConcurrentHashMap8; +import org.jsr166.ConcurrentLinkedDeque8; /** * IGFS client logger writing data to the file. @@ -766,4 +778,4 @@ public final class IgfsLogger { } } } -} +} \ No 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/igfs/common/IgfsMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java index 6a6f22a..1dba21c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java @@ -17,15 +17,21 @@ package org.apache.ignite.internal.igfs.common; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; - -import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Arrays; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.AFFINITY; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_CREATE; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_READ; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.READ_BLOCK; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.SET_TIMES; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.WRITE_BLOCK; /** * Implementation of IGFS client message marshaller. @@ -342,4 +348,4 @@ public class IgfsMarshaller { 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/igfs/common/IgfsMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java index 54c8d5b..c94d394 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java @@ -38,4 +38,4 @@ public abstract class IgfsMessage { public void command(IgfsIpcCommand cmd) { this.cmd = cmd; } -} +} \ No 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/igfs/common/IgfsPathControlRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java index 2f6e6e5..8f5d234 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsPathControlRequest.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.igfs.common; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.igfs.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.Map; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.processors.igfs.IgfsUtils; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * Single path command message. This is a plain bean. @@ -257,4 +256,4 @@ public class IgfsPathControlRequest extends IgfsMessage { public final void userName(String userName) { this.userName = IgfsUtils.fixUserName(userName); } -} +} \ No 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/igfs/common/IgfsStatusRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java index 0f632f6..a1cc3c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.igfs.common; -import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*; +import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.STATUS; /** * IGFS status (total/used/free space) request. @@ -32,4 +32,4 @@ public class IgfsStatusRequest extends IgfsMessage { @Override public void command(IgfsIpcCommand cmd) { // 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/igfs/common/IgfsStreamControlRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java index df848a3..0f43924 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStreamControlRequest.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.igfs.common; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Read block request. @@ -98,4 +98,4 @@ public class IgfsStreamControlRequest extends IgfsMessage { return S.toString(IgfsStreamControlRequest.class, this, "cmd", command(), "dataLen", data == null ? 0 : data.length); } -} +} \ No 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/jdbc/JdbcConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java index 6e73b1f..0116ace 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java @@ -17,15 +17,42 @@ package org.apache.ignite.internal.jdbc; -import org.apache.ignite.internal.client.*; - -import java.sql.*; -import java.util.*; -import java.util.concurrent.*; - -import static java.sql.ResultSet.*; -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.IgniteJdbcDriver.*; +import java.sql.Array; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.SQLClientInfoException; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Savepoint; +import java.sql.Statement; +import java.sql.Struct; +import java.util.Collections; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; +import java.util.concurrent.Executor; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientDisconnectedException; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.GridClientFutureTimeoutException; + +import static java.sql.ResultSet.CONCUR_READ_ONLY; +import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT; +import static java.sql.ResultSet.TYPE_FORWARD_ONLY; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.apache.ignite.IgniteJdbcDriver.PROP_CACHE; +import static org.apache.ignite.IgniteJdbcDriver.PROP_HOST; +import static org.apache.ignite.IgniteJdbcDriver.PROP_NODE_ID; +import static org.apache.ignite.IgniteJdbcDriver.PROP_PORT; /** * JDBC connection implementation. @@ -544,4 +571,4 @@ public class JdbcConnection implements Connection { JdbcStatement createStatement0() throws SQLException { return (JdbcStatement)createStatement(); } -} +} \ No 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/jdbc/JdbcConnectionInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java index 33d82ec..36fa0aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionInfo.java @@ -88,4 +88,4 @@ public class JdbcConnectionInfo { public void cacheName(String cacheName) { this.cacheName = cacheName; } -} +} \ No 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/jdbc/JdbcDatabaseMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java index d13fe04..df26412 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java @@ -17,15 +17,25 @@ package org.apache.ignite.internal.jdbc; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.sql.*; -import java.util.*; - -import static java.sql.Connection.*; -import static java.sql.ResultSet.*; -import static java.sql.RowIdLifetime.*; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.RowIdLifetime; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static java.sql.Connection.TRANSACTION_NONE; +import static java.sql.ResultSet.CONCUR_READ_ONLY; +import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT; +import static java.sql.RowIdLifetime.ROWID_UNSUPPORTED; /** * JDBC database metadata implementation. @@ -1310,4 +1320,4 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData { return str != null && (ptrn == null || str.toUpperCase().matches(ptrn.toUpperCase().replace("%", ".*").replace("_", "."))); } -} +} \ No 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/jdbc/JdbcPreparedStatement.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java index 8403d5a..6dfaa18 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcPreparedStatement.java @@ -17,12 +17,27 @@ package org.apache.ignite.internal.jdbc; -import java.io.*; -import java.math.*; -import java.net.*; -import java.sql.*; +import java.io.InputStream; +import java.io.Reader; +import java.math.BigDecimal; +import java.net.URL; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; import java.sql.Date; -import java.util.*; +import java.sql.NClob; +import java.sql.ParameterMetaData; +import java.sql.PreparedStatement; +import java.sql.Ref; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.RowId; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; /** * JDBC prepared statement implementation. @@ -408,4 +423,4 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat args[paramIdx - 1] = val; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java index ba09e1d..1566006 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSet.java @@ -17,15 +17,35 @@ package org.apache.ignite.internal.jdbc; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.math.*; -import java.net.*; -import java.sql.*; +import java.io.InputStream; +import java.io.Reader; +import java.math.BigDecimal; +import java.net.URL; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; import java.sql.Date; -import java.util.*; +import java.sql.NClob; +import java.sql.Ref; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.RowId; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Statement; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.util.typedef.internal.U; /** * JDBC result set implementation. @@ -1516,4 +1536,4 @@ public class JdbcResultSet implements ResultSet { if (curr == null) throw new SQLException("Result set is not positioned on a row."); } -} +} \ No 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/jdbc/JdbcResultSetMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java index 32da631..afe1d28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcResultSetMetadata.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal.jdbc; -import java.sql.*; -import java.util.*; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.List; /** * JDBC result set metadata implementation. @@ -167,4 +168,4 @@ public class JdbcResultSetMetadata implements ResultSetMetaData { @Override public boolean isWrapperFor(Class<?> iface) throws SQLException { return iface == ResultSetMetaData.class; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java index 6637bf5..caa8495 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcStatement.java @@ -17,13 +17,22 @@ package org.apache.ignite.internal.jdbc; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.sql.*; -import java.util.*; - -import static java.sql.ResultSet.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLWarning; +import java.sql.Statement; +import java.util.Collection; +import java.util.List; +import java.util.UUID; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static java.sql.ResultSet.CONCUR_READ_ONLY; +import static java.sql.ResultSet.FETCH_FORWARD; +import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT; +import static java.sql.ResultSet.TYPE_FORWARD_ONLY; /** * JDBC statement implementation. @@ -445,4 +454,4 @@ public class JdbcStatement implements Statement { if (closed) throw new SQLException("Statement is closed."); } -} +} \ No 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/jdbc/JdbcUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java index 19575b2..46e3cfa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java @@ -17,16 +17,33 @@ package org.apache.ignite.internal.jdbc; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.jdk.*; - -import java.sql.*; -import java.util.*; +import java.sql.SQLException; +import java.sql.Time; +import java.sql.Timestamp; +import java.sql.Types; +import java.util.Arrays; +import java.util.Collections; import java.util.Date; - -import static java.sql.Types.*; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; + +import static java.sql.Types.BIGINT; +import static java.sql.Types.BINARY; +import static java.sql.Types.BOOLEAN; +import static java.sql.Types.DATE; +import static java.sql.Types.DOUBLE; +import static java.sql.Types.FLOAT; +import static java.sql.Types.INTEGER; +import static java.sql.Types.OTHER; +import static java.sql.Types.SMALLINT; +import static java.sql.Types.TIME; +import static java.sql.Types.TIMESTAMP; +import static java.sql.Types.TINYINT; +import static java.sql.Types.VARCHAR; /** * Utility methods for JDBC driver. @@ -229,4 +246,4 @@ class JdbcUtils { float.class.getName().equals(cls) || double.class.getName().equals(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/internal/managers/GridManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java index a71a6b8..ff99919 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.managers; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.GridComponent; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; /** * This interface defines life-cycle for kernal manager. Managers provide layer of indirection @@ -41,4 +41,4 @@ public interface GridManager extends GridComponent { * This method executed after manager started SPI. */ public void onAfterSpiStart(); -} +} \ No 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/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java index 298ff24..1fd5bff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java @@ -17,30 +17,49 @@ package org.apache.ignite.internal.managers; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.apache.ignite.plugin.security.*; -import org.apache.ignite.spi.*; - -import org.jetbrains.annotations.*; - -import javax.cache.expiry.*; -import java.io.*; -import java.util.*; - -import static java.util.Arrays.*; -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; +import java.io.Serializable; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; +import javax.cache.expiry.Duration; +import javax.cache.expiry.ExpiryPolicy; +import javax.cache.expiry.TouchedExpiryPolicy; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.GridComponent; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.timeout.GridSpiTimeoutObject; +import org.apache.ignite.internal.util.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.CU; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageFactory; +import org.apache.ignite.plugin.extensions.communication.MessageFormatter; +import org.apache.ignite.plugin.security.SecuritySubject; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.IgnitePortProtocol; +import org.apache.ignite.spi.IgniteSpi; +import org.apache.ignite.spi.IgniteSpiAdapter; +import org.apache.ignite.spi.IgniteSpiContext; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.IgniteSpiNoop; +import org.apache.ignite.spi.IgniteSpiTimeoutObject; +import org.jetbrains.annotations.Nullable; + +import static java.util.Arrays.asList; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; /** * Convenience adapter for grid managers. @@ -607,4 +626,4 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan @Override public final String toString() { return S.toString(GridManagerAdapter.class, this, "name", 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/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index ce2a36c..ac7c99a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@ -17,31 +17,44 @@ package org.apache.ignite.internal.managers.checkpoint; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.util.*; -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.lang.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.checkpoint.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeTaskSessionScope; +import org.apache.ignite.events.CheckpointEvent; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.GridTaskSessionImpl; +import org.apache.ignite.internal.GridTaskSessionInternal; +import org.apache.ignite.internal.SkipDaemon; +import org.apache.ignite.internal.managers.GridManagerAdapter; +import org.apache.ignite.internal.managers.communication.GridIoManager; +import org.apache.ignite.internal.managers.communication.GridIoPolicy; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet; +import org.apache.ignite.internal.util.GridConcurrentHashSet; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.checkpoint.CheckpointListener; +import org.apache.ignite.spi.checkpoint.CheckpointSpi; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + +import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_LOADED; +import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_REMOVED; +import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_SAVED; +import static org.apache.ignite.internal.GridTopic.TOPIC_CHECKPOINT; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q; /** * This class defines a checkpoint manager. @@ -480,4 +493,4 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { } } } -} +} \ No 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/managers/checkpoint/GridCheckpointRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index fdc3ee6..86d2d6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.managers.checkpoint; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * This class defines checkpoint request. @@ -169,4 +170,4 @@ public class GridCheckpointRequest implements Message { @Override public String toString() { return S.toString(GridCheckpointRequest.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/managers/collision/GridCollisionJobContextAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java index 93f651e..f10490a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionJobContextAdapter.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.managers.collision; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.job.*; -import org.apache.ignite.spi.collision.*; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobContext; +import org.apache.ignite.internal.GridJobSessionImpl; +import org.apache.ignite.internal.processors.job.GridJobWorker; +import org.apache.ignite.spi.collision.CollisionJobContext; /** * Adapter for {@link org.apache.ignite.spi.collision.CollisionJobContext}. @@ -59,4 +60,4 @@ public abstract class GridCollisionJobContextAdapter implements CollisionJobCont @Override public ComputeJob getJob() { return jobWorker.getJob(); } -} +} \ No 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/managers/collision/GridCollisionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java index 9eca079..40901b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java @@ -17,15 +17,18 @@ package org.apache.ignite.internal.managers.collision; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.spi.collision.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.atomic.*; +import java.util.Collection; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.SkipDaemon; +import org.apache.ignite.internal.managers.GridManagerAdapter; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.collision.CollisionContext; +import org.apache.ignite.spi.collision.CollisionExternalListener; +import org.apache.ignite.spi.collision.CollisionJobContext; +import org.apache.ignite.spi.collision.CollisionSpi; +import org.jetbrains.annotations.Nullable; /** * This class defines a collision manager. @@ -128,4 +131,4 @@ public class GridCollisionManager extends GridManagerAdapter<CollisionSpi> { }); } } -} +} \ No 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/managers/communication/GridDisconnectListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java index 5246108..8e44db9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridDisconnectListener.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.managers.communication; -import java.util.*; +import java.util.UUID; /** * Node disconnect listener interface. @@ -31,4 +31,4 @@ public interface GridDisconnectListener { * @param nodeId Node ID for which connection was closed. */ public void onNodeDisconnected(UUID nodeId); -} +} \ No 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/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 6698f4f..aa73296 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -17,42 +17,86 @@ package org.apache.ignite.internal.managers.communication; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.direct.*; -import org.apache.ignite.internal.managers.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.lang.*; -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.lang.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.communication.*; -import org.apache.ignite.spi.communication.tcp.*; -import org.apache.ignite.thread.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.io.*; -import java.util.*; -import java.util.Map.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; -import static org.apache.ignite.internal.util.nio.GridNioBackPressureControl.*; -import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Queue; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.GridTopic; +import org.apache.ignite.internal.IgniteComponentType; +import org.apache.ignite.internal.IgniteDeploymentCheckedException; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.direct.DirectMessageReader; +import org.apache.ignite.internal.direct.DirectMessageWriter; +import org.apache.ignite.internal.managers.GridManagerAdapter; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; +import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet; +import org.apache.ignite.internal.util.GridSpinReadWriteLock; +import org.apache.ignite.internal.util.lang.GridTuple3; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiPredicate; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.lang.IgniteRunnable; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.plugin.extensions.communication.IoPool; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageFactory; +import org.apache.ignite.plugin.extensions.communication.MessageFormatter; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.communication.CommunicationListener; +import org.apache.ignite.spi.communication.CommunicationSpi; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; +import org.apache.ignite.thread.IgniteThreadPoolExecutor; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; +import org.jsr166.ConcurrentLinkedDeque8; + +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; +import static org.apache.ignite.events.EventType.EVT_NODE_JOINED; +import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; +import static org.apache.ignite.internal.GridTopic.TOPIC_COMM_USER; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.AFFINITY_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MANAGEMENT_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MARSH_CACHE_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.P2P_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.isReservedGridIoPolicy; +import static org.apache.ignite.internal.util.nio.GridNioBackPressureControl.threadProcessingMessage; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q_OPTIMIZED_RMV; /** * Grid communication manager. @@ -2386,4 +2430,4 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa return S.toString(DelayedMessage.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/managers/communication/GridIoMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index 844b62b..c83a281 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -17,13 +17,14 @@ package org.apache.ignite.internal.managers.communication; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Wrapper for all grid messages. @@ -319,4 +320,4 @@ public class GridIoMessage implements Message { @Override public String toString() { return S.toString(GridIoMessage.class, this); } -} +} \ No newline at end of file
