http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java index 1cce940..53a49c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; -import java.util.concurrent.*; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.client.util.GridClientConsistentHash; +import org.apache.ignite.internal.client.util.GridClientUtils; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Affinity function for partitioned cache. This function supports the following @@ -362,4 +365,4 @@ public class GridClientPartitionAffinity implements GridClientDataAffinity, Grid ", hashId=" + hashId + ']'; } } -} +} \ No 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/client/GridClientPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java index d28477e..ef03af6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java @@ -35,4 +35,4 @@ public interface GridClientPredicate<E1> { * @return Return value. */ public boolean apply(E1 e); -} +} \ No 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/client/GridClientProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java index f64d14c..4882165 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java @@ -23,4 +23,4 @@ package org.apache.ignite.internal.client; public enum GridClientProtocol { /** Communication via tcp binary protocol. */ TCP -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java index 3d32302..86b9a2f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java @@ -38,4 +38,4 @@ public interface GridClientTopologyListener { * @param node Left node. */ public void onNodeRemoved(GridClientNode node); -} +} \ No 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/client/GridServerUnreachableException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java index d787421..576317c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java @@ -42,4 +42,4 @@ public class GridServerUnreachableException extends GridClientException { public GridServerUnreachableException(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/client/balancer/GridClientBalancerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java index d653359..3eb7e1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.client.balancer; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; - -import java.util.*; +import java.util.Collection; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.lang.IgnitePredicate; /** * Base class for balancers. Contains common direct connection handling logic. @@ -73,4 +72,4 @@ public abstract class GridClientBalancerAdapter implements GridClientLoadBalance protected static Collection<GridClientNode> selectDirectNodes(Collection<? extends GridClientNode> nodes) { return F.viewReadOnly(nodes, F.<GridClientNode>identity(), CONNECTABLE); } -} +} \ No 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/client/balancer/GridClientLoadBalancer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java index dd5f36b..68c8af2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.client.balancer; -import org.apache.ignite.internal.client.*; - -import java.util.*; +import java.util.Collection; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; /** * Interface that defines a selection logic of a server node for a particular operation. @@ -41,4 +41,4 @@ public interface GridClientLoadBalancer { * @throws GridClientException If balancer can't match given nodes with current topology snapshot. */ public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes) throws GridClientException; -} +} \ No 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/client/balancer/GridClientRandomBalancer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java index d5e7c34..d0a0cb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java @@ -17,9 +17,11 @@ package org.apache.ignite.internal.client.balancer; -import org.apache.ignite.internal.client.*; - -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import org.apache.ignite.internal.client.GridClientNode; /** * Simple balancer that relies on random node selection from a given collection. This implementation @@ -72,4 +74,4 @@ public class GridClientRandomBalancer extends GridClientBalancerAdapter { return it.next(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java index f0320a9..158e648 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java @@ -17,11 +17,17 @@ package org.apache.ignite.internal.client.balancer; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; -import java.util.concurrent.locks.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientTopologyListener; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Simple balancer that implements round-robin balancing. @@ -108,4 +114,4 @@ public class GridClientRoundRobinBalancer extends GridClientBalancerAdapter impl lock.unlock(); } } -} +} \ No 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/client/impl/GridClientAbstractProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java index bf8e7df..2739540 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java @@ -17,18 +17,31 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.logging.*; - -import static org.apache.ignite.internal.client.util.GridClientUtils.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedList; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientDataAffinity; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.client.impl.connection.GridClientConnection; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; +import org.apache.ignite.internal.client.impl.connection.GridConnectionIdleClosedException; +import org.apache.ignite.internal.client.util.GridClientUtils; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter; +import static org.apache.ignite.internal.client.util.GridClientUtils.restAvailable; /** * Class contains common connection-error handling logic. @@ -455,4 +468,4 @@ abstract class GridClientAbstractProjection<T extends GridClientAbstractProjecti public GridClientFuture<R> apply(GridClientConnection conn, UUID affinityNodeId) throws GridClientConnectionResetException, GridClientClosedException; } -} +} \ No 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/client/impl/GridClientAndPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java index b6dd01b..f8f3ee5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAndPredicate.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; +import org.apache.ignite.internal.client.GridClientPredicate; /** * AND predicate. Passes if and only if both provided filters accept the node. @@ -49,4 +49,4 @@ class GridClientAndPredicate<T> implements GridClientPredicate<T> { @Override public boolean apply(T elem) { return first.apply(elem) && second.apply(elem); } -} +} \ No 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/client/impl/GridClientComputeImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java index 8012051..0c3b155 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java @@ -17,16 +17,24 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; -import static org.apache.ignite.internal.client.util.GridClientUtils.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.client.impl.connection.GridClientConnection; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON; +import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter; /** * Compute projection implementation. @@ -260,4 +268,4 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu return new GridClientComputeImpl(client, nodes, filter, balancer); } } -} +} \ No 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/client/impl/GridClientDataImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java index 5502ed7..b97f3e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataImpl.java @@ -17,13 +17,29 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import org.apache.ignite.internal.client.GridClientCacheFlag; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientData; +import org.apache.ignite.internal.client.GridClientDataAffinity; +import org.apache.ignite.internal.client.GridClientDataMetrics; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientFutureListener; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.client.impl.connection.GridClientConnection; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; +import org.apache.ignite.internal.client.util.GridClientUtils; +import org.apache.ignite.internal.util.typedef.internal.A; /** * Data projection that serves one cache instance and handles communication errors. @@ -386,4 +402,4 @@ public class GridClientDataImpl extends GridClientAbstractProjection<GridClientD return new GridClientDataImpl(cacheName, client, nodes, filter, balancer, flags, cacheMetrics); } } -} +} \ No 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/client/impl/GridClientDataMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java index 5fb43ca..c3ea415 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientDataMetricsAdapter.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; +import org.apache.ignite.internal.client.GridClientDataMetrics; /** * Adapter for cache metrics. @@ -157,4 +157,4 @@ public class GridClientDataMetricsAdapter implements GridClientDataMetrics { ", writeTime=" + writeTime + ']'; } -} +} \ No 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/client/impl/GridClientFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java index 83172a1..7459957 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureAdapter.java @@ -17,13 +17,17 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.concurrent.*; -import java.util.concurrent.locks.*; -import java.util.logging.*; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.AbstractQueuedSynchronizer; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientFutureListener; +import org.apache.ignite.internal.client.GridClientFutureTimeoutException; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.jetbrains.annotations.Nullable; /** * Future adapter. @@ -325,4 +329,4 @@ public class GridClientFutureAdapter<R> extends AbstractQueuedSynchronizer imple } } } -} +} \ No 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/client/impl/GridClientFutureCallback.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java index f592528..754f6f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientFutureCallback.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; /** * Future callback will be notified, when listened future finishes (both succeed or failed). @@ -32,4 +33,4 @@ public interface GridClientFutureCallback<R, S> { * @return Chained future result, if applicable, otherwise - {@code null}. */ public S onComplete(GridClientFuture<R> fut) throws GridClientException; -} +} \ No 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/client/impl/GridClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java index 43dd479..0d5c7cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java @@ -17,24 +17,52 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import javax.net.ssl.*; -import java.lang.reflect.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.logging.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientCacheMode; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientData; +import org.apache.ignite.internal.client.GridClientDataAffinity; +import org.apache.ignite.internal.client.GridClientDataConfiguration; +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.GridClientNode; +import org.apache.ignite.internal.client.GridClientPartitionAffinity; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.GridClientTopologyListener; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionManager; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionManagerOsImpl; +import org.apache.ignite.internal.client.impl.connection.GridClientTopology; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; /** * Client implementation. @@ -524,4 +552,4 @@ public class GridClientImpl implements GridClient { @Override public String toString() { return "GridClientImpl [id=" + id + ", closed=" + 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/client/impl/GridClientNodeImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java index 9c59b84..ac0866b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeImpl.java @@ -17,13 +17,20 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.net.*; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.ignite.internal.client.GridClientCacheMode; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientNodeMetrics; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Client node implementation. @@ -371,4 +378,4 @@ public class GridClientNodeImpl implements GridClientNode { 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/client/impl/GridClientNodeMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java index feb4f22..af010aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; +import org.apache.ignite.internal.client.GridClientNodeMetrics; /** * Node metrics adapter. @@ -987,4 +987,4 @@ public class GridClientNodeMetricsAdapter implements GridClientNodeMetrics { append("]"). 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/client/impl/GridClientThreadFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java index 7fa6b4c..e1c464e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientThreadFactory.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.client.impl; -import org.jetbrains.annotations.*; - -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; +import org.jetbrains.annotations.NotNull; /** * Delegating thread factory which forces all spawned thread to be daemons. @@ -59,4 +58,4 @@ public class GridClientThreadFactory implements ThreadFactory { return thread; } -} +} \ No 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/client/impl/connection/GridClientConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java index 4e5add7..fedd15a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java @@ -17,14 +17,25 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; - -import javax.net.ssl.*; -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import javax.net.ssl.SSLContext; +import org.apache.ignite.internal.client.GridClientCacheFlag; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientDataMetrics; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.impl.GridClientDataMetricsAdapter; +import org.apache.ignite.internal.client.impl.GridClientFutureAdapter; +import org.apache.ignite.internal.client.impl.GridClientFutureCallback; +import org.apache.ignite.internal.util.typedef.F; +import org.jetbrains.annotations.Nullable; /** * Facade for all possible network communications between client and server. Introduced to hide @@ -503,4 +514,4 @@ public abstract class GridClientConnection { 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/client/impl/connection/GridClientConnectionCloseReason.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java index 94e5840..6c78c57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionCloseReason.java @@ -29,4 +29,4 @@ enum GridClientConnectionCloseReason { /** Client is closed and connection also shouldn't be used for new requests. */ CLIENT_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/client/impl/connection/GridClientConnectionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java index fed7059..447b5b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManager.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.internal.client.*; -import org.jetbrains.annotations.*; - -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.Collection; +import org.apache.ignite.internal.client.GridClientAuthenticationException; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.jetbrains.annotations.Nullable; /** * Common interface for client connection managers. @@ -68,4 +71,4 @@ public interface GridClientConnectionManager { * (and receiving responses for all pending requests), otherwise it will return immediately. */ public void stop(boolean waitCompletion); -} +} \ No 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/client/impl/connection/GridClientConnectionManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java index e8d29b4..f1a9af1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -17,31 +17,58 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.protocols.tcp.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.nio.ssl.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.logger.java.*; -import org.apache.ignite.plugin.security.*; -import org.jetbrains.annotations.*; - -import javax.net.ssl.*; -import java.io.*; -import java.net.*; -import java.nio.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.logging.*; - -import static java.util.logging.Level.*; -import static org.apache.ignite.internal.IgniteNodeAttributes.*; -import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.net.ssl.SSLContext; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientHandshakeException; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.apache.ignite.internal.client.impl.GridClientFutureAdapter; +import org.apache.ignite.internal.client.impl.GridClientThreadFactory; +import org.apache.ignite.internal.client.util.GridClientStripedLock; +import org.apache.ignite.internal.client.util.GridClientUtils; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket; +import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestParser; +import org.apache.ignite.internal.util.nio.GridNioCodecFilter; +import org.apache.ignite.internal.util.nio.GridNioFilter; +import org.apache.ignite.internal.util.nio.GridNioServer; +import org.apache.ignite.internal.util.nio.GridNioServerListener; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.logger.java.JavaLogger; +import org.apache.ignite.plugin.security.SecurityCredentials; +import org.jetbrains.annotations.Nullable; + +import static java.util.logging.Level.INFO; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; +import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CLIENT_CLOSED; +import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED; /** * Cached connections manager. @@ -641,4 +668,4 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo ses.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/client/impl/connection/GridClientConnectionManagerOsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java index 6ffd50d..9ed4bdf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerOsImpl.java @@ -17,11 +17,12 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.internal.client.*; - -import javax.net.ssl.*; -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.UUID; +import javax.net.ssl.SSLContext; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; /** * Open source version of connection manager. @@ -45,4 +46,4 @@ public class GridClientConnectionManagerOsImpl extends GridClientConnectionManag @Override protected void init0() throws GridClientException { // 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/client/impl/connection/GridClientConnectionResetException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java index ed51547..6dac0f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionResetException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.internal.client.*; +import org.apache.ignite.internal.client.GridClientException; /** * This exception is thrown when ongoing packet should be sent, but network connection is broken. @@ -45,4 +45,4 @@ public class GridClientConnectionResetException extends GridClientException { GridClientConnectionResetException(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/client/impl/connection/GridClientNioTcpConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java index d247e05..eee2858 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java @@ -17,34 +17,81 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.client.marshaller.jdk.*; -import org.apache.ignite.internal.client.marshaller.optimized.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.nio.ssl.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import javax.net.ssl.*; -import java.io.*; -import java.net.*; -import java.nio.channels.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.logging.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.internal.client.GridClientCacheFlag.*; -import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*; -import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*; -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.nio.channels.SocketChannel; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.atomic.AtomicLong; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.net.ssl.SSLContext; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.client.GridClientAuthenticationException; +import org.apache.ignite.internal.client.GridClientCacheFlag; +import org.apache.ignite.internal.client.GridClientCacheMode; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientDataMetrics; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.impl.GridClientFutureAdapter; +import org.apache.ignite.internal.client.impl.GridClientFutureCallback; +import org.apache.ignite.internal.client.impl.GridClientNodeImpl; +import org.apache.ignite.internal.client.impl.GridClientNodeMetricsAdapter; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller; +import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller; +import org.apache.ignite.internal.processors.rest.client.message.GridClientAuthenticationRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean; +import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeMetricsBean; +import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket; +import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse; +import org.apache.ignite.internal.util.nio.GridNioFuture; +import org.apache.ignite.internal.util.nio.GridNioFutureImpl; +import org.apache.ignite.internal.util.nio.GridNioServer; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey; +import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter; +import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES; +import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CONN_IDLE; +import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.GET_ALL; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.METRICS; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PREPEND; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.PUT_ALL; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.REPLACE; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV; +import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.RMV_ALL; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER; /** * This class performs request to grid over tcp protocol. Serialization is performed with marshaller @@ -1065,4 +1112,4 @@ public class GridClientNioTcpConnection extends GridClientConnection { return "TcpClientFuture [state=" + authRetry + ", forward=" + forward + ", message=" + pendingMsg + "]"; } } -} +} \ No 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/client/impl/connection/GridClientTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java index a15cb65..effd5b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java @@ -17,19 +17,36 @@ package org.apache.ignite.internal.client.impl.connection; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.locks.*; -import java.util.logging.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.logging.Logger; +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.GridClientNode; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridClientTopologyListener; +import org.apache.ignite.internal.client.impl.GridClientNodeImpl; +import org.apache.ignite.internal.client.impl.GridClientThreadFactory; +import org.apache.ignite.internal.client.util.GridClientUtils; +import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; /** * Client topology cache. @@ -447,4 +464,4 @@ public class GridClientTopology { return node; } } -} +} \ No 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/client/impl/connection/GridConnectionIdleClosedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java index d7fa87a..68e41b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridConnectionIdleClosedException.java @@ -33,4 +33,4 @@ public class GridConnectionIdleClosedException extends GridClientConnectionReset GridConnectionIdleClosedException(String msg) { super(msg); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java index c981805..ac91ba7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.client.marshaller; -import java.io.*; -import java.nio.*; +import java.io.IOException; +import java.nio.ByteBuffer; /** * Marshaller for binary protocol messages. @@ -42,4 +42,4 @@ public interface GridClientMarshaller { * @throws IOException If unmarshalling failed. */ public <T> T unmarshal(byte[] bytes) 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/client/marshaller/jdk/GridClientJdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java index a3c3621..87bc7aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java @@ -17,11 +17,15 @@ package org.apache.ignite.internal.client.marshaller.jdk; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.util.io.*; - -import java.io.*; -import java.nio.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectInputStream; +import java.io.ObjectOutput; +import java.io.ObjectOutputStream; +import java.nio.ByteBuffer; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.util.io.GridByteArrayOutputStream; /** * Simple marshaller that utilize JDK serialization features. @@ -65,4 +69,4 @@ public class GridClientJdkMarshaller implements GridClientMarshaller { throw new IOException("Failed to unmarshal target object: " + e.getMessage(), e); } } -} +} \ No 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/client/marshaller/optimized/GridClientOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java index 0d99d75..4bc1dac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java @@ -17,17 +17,17 @@ package org.apache.ignite.internal.client.marshaller.optimized; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.marshaller.optimized.*; -import org.apache.ignite.plugin.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.MarshallerContextAdapter; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.plugin.PluginProvider; +import org.jetbrains.annotations.Nullable; /** * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} to @@ -136,4 +136,4 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller { throw new UnsupportedOperationException(); } } -} +} \ No 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/client/router/GridRouterFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java index b895903..03fe35e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridRouterFactory.java @@ -17,12 +17,15 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.router.impl.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl; +import org.jetbrains.annotations.Nullable; /** * This factory is responsible for router lifecycle management. @@ -123,4 +126,4 @@ public final class GridRouterFactory { router.stop(); } } -} +} \ No 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/client/router/GridTcpRouter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java index 74909c7..6d775f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouter.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.router; -import java.util.*; +import java.util.UUID; /** * TCP router interface. @@ -71,4 +71,4 @@ public interface GridTcpRouter { * @return Router configuration. */ public GridTcpRouterConfiguration configuration(); -} +} \ No 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/client/router/GridTcpRouterConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java index 711333c..191f4ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java @@ -17,15 +17,17 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.security.*; -import org.jetbrains.annotations.*; - -import java.net.*; -import java.util.*; +import java.net.Socket; +import java.util.Collection; +import java.util.Collections; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.security.SecurityCredentialsProvider; +import org.jetbrains.annotations.Nullable; /** * This class defines runtime configuration for TCP router. @@ -303,4 +305,4 @@ public class GridTcpRouterConfiguration { @Override public String toString() { return S.toString(GridTcpRouterConfiguration.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/client/router/GridTcpRouterMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java index 479fd8c..8a45f8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterMBean.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.mxbean.*; - -import java.util.*; +import java.util.Collection; +import org.apache.ignite.mxbean.MXBeanDescription; /** * MBean interface for TCP router. @@ -85,4 +84,4 @@ public interface GridTcpRouterMBean { */ @MXBeanDescription("Number of responses returned by this router.") public long getSendCount(); -} +} \ No 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/client/router/impl/GridRouterClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java index 0521f9f..f97877a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java @@ -17,17 +17,33 @@ package org.apache.ignite.internal.client.router.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.client.router.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.client.util.GridClientUtils.*; +import java.util.Collection; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientData; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridClientTopologyListener; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.apache.ignite.internal.client.impl.GridClientFutureAdapter; +import org.apache.ignite.internal.client.impl.GridClientImpl; +import org.apache.ignite.internal.client.impl.GridClientNodeImpl; +import org.apache.ignite.internal.client.impl.connection.GridClientConnection; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionManager; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; +import org.apache.ignite.internal.client.impl.connection.GridClientTopology; +import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + +import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter; +import static org.apache.ignite.internal.client.util.GridClientUtils.restAvailable; /** * A {@link GridClient} router implementation. @@ -197,4 +213,4 @@ public class GridRouterClientImpl implements GridClient { @Override public void close() { clientImpl.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/client/router/impl/GridRouterCommandLineStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java index 41d4d28..ac1ca62 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java @@ -17,20 +17,22 @@ package org.apache.ignite.internal.client.router.impl; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.router.*; -import org.apache.ignite.internal.util.spring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.lifecycle.*; - -import java.net.*; -import java.util.*; -import java.util.logging.*; - -import static org.apache.ignite.internal.IgniteComponentType.*; -import static org.apache.ignite.internal.IgniteVersionUtils.*; +import java.net.URL; +import java.util.Collection; +import java.util.Map; +import java.util.logging.Handler; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration; +import org.apache.ignite.internal.util.spring.IgniteSpringHelper; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lifecycle.LifecycleAware; + +import static org.apache.ignite.internal.IgniteComponentType.SPRING; +import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR; +import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; /** * Loader class for router. @@ -166,4 +168,4 @@ public class GridRouterCommandLineStartup { } }); } -} +} \ No 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/client/router/impl/GridTcpRouterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java index 7b1cd8b..06a4929 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java @@ -17,25 +17,37 @@ package org.apache.ignite.internal.client.router.impl; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.router.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.nio.ssl.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lifecycle.*; -import org.apache.ignite.logger.java.*; -import org.jetbrains.annotations.*; - -import javax.management.*; -import javax.net.ssl.*; -import java.lang.management.*; -import java.lang.reflect.*; -import java.net.*; -import java.nio.*; -import java.util.*; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.nio.ByteOrder; +import java.util.Collection; +import java.util.UUID; +import javax.management.JMException; +import javax.management.ObjectName; +import javax.net.ssl.SSLContext; +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.client.GridClientException; +import org.apache.ignite.internal.client.router.GridTcpRouter; +import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration; +import org.apache.ignite.internal.client.router.GridTcpRouterMBean; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.util.nio.GridNioCodecFilter; +import org.apache.ignite.internal.util.nio.GridNioFilter; +import org.apache.ignite.internal.util.nio.GridNioParser; +import org.apache.ignite.internal.util.nio.GridNioServer; +import org.apache.ignite.internal.util.nio.GridNioServerListener; +import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lifecycle.LifecycleAware; +import org.apache.ignite.logger.java.JavaLogger; +import org.jetbrains.annotations.Nullable; /** * Wrapper class for router process. @@ -345,4 +357,4 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif return id.equals(that.id); } -} +} \ No 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/client/router/impl/GridTcpRouterNioListenerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java index 1775b21..02b63ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java @@ -17,19 +17,32 @@ package org.apache.ignite.internal.client.router.impl; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.client.marshaller.jdk.*; -import org.apache.ignite.internal.client.marshaller.optimized.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientFutureListener; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller; +import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket; +import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse; +import org.apache.ignite.internal.util.nio.GridNioServerListener; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER_ID; /** * Nio listener for the router. Extracts necessary meta information from messages @@ -200,4 +213,4 @@ public abstract class GridTcpRouterNioListenerAdapter implements GridNioServerLi 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/client/router/impl/GridTcpRouterNioListenerOsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java index 61e6bd6..b906cb8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerOsImpl.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.router.impl; -import org.apache.ignite.*; +import org.apache.ignite.IgniteLogger; /** * Router NIO listener. @@ -35,4 +35,4 @@ class GridTcpRouterNioListenerOsImpl extends GridTcpRouterNioListenerAdapter { @Override protected void init() { // 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/client/router/impl/GridTcpRouterNioParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java index 5111ffc..83a6869 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java @@ -17,17 +17,21 @@ package org.apache.ignite.internal.client.router.impl; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.protocols.tcp.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.nio.*; - -import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket; +import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse; +import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestParser; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG; /** * @@ -112,4 +116,4 @@ class GridTcpRouterNioParser extends GridTcpRestParser { public long getSendCount() { return sndCnt; } -} +} \ No 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/client/ssl/GridSslBasicContextFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java index ed52218..b651ae3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java @@ -17,14 +17,23 @@ package org.apache.ignite.internal.client.ssl; -import org.apache.ignite.internal.util.typedef.internal.*; - -import javax.cache.configuration.*; -import javax.net.ssl.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import java.util.*; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import javax.cache.configuration.Factory; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLException; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; +import org.apache.ignite.internal.util.typedef.internal.A; /** * Basic ssl context factory that provides ssl context configuration with specified key @@ -438,4 +447,4 @@ public class GridSslBasicContextFactory implements GridSslContextFactory { return CERTS; } } -} +} \ No 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/client/ssl/GridSslContextFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java index 34a13cf..4ee4503 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal.client.ssl; -import javax.cache.configuration.*; -import javax.net.ssl.*; +import javax.cache.configuration.Factory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLException; /** * This interface provides creation of SSL context both for server and client use. @@ -36,4 +37,4 @@ public interface GridSslContextFactory { * @throws SSLException If SSL context could not be created. */ public SSLContext createSslContext() throws SSLException; -} +} \ No 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/client/util/GridClientConsistentHash.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java index 6e2b73b..8134906 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java @@ -17,12 +17,23 @@ package org.apache.ignite.internal.client.util; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.locks.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Random; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Controls key to node affinity using consistent hash algorithm. This class is thread-safe @@ -437,4 +448,4 @@ public class GridClientConsistentHash<N> { return sb.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/client/util/GridClientStripedLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java index 30a4baa..426449f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientStripedLock.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.client.util; -import java.util.concurrent.locks.*; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; /** * This is an utility class for 'splitting' locking of some @@ -132,4 +133,4 @@ public class GridClientStripedLock { public void unlock(Object o) { getLock(o).unlock(); } -} +} \ No 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/client/util/GridClientUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java index 237959e..d79ff1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientUtils.java @@ -17,13 +17,19 @@ package org.apache.ignite.internal.client.util; -import org.apache.ignite.internal.client.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.logging.*; +import java.io.Closeable; +import java.io.IOException; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.jetbrains.annotations.Nullable; /** * Java client utils. @@ -168,4 +174,4 @@ public abstract class GridClientUtils { return i < 0 ? 0 : i; } -} +} \ No newline at end of file
