http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java index 983292c..aee8a1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java @@ -17,25 +17,46 @@ package org.apache.ignite.internal.processors.rest.handlers.top; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.port.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.handlers.*; -import org.apache.ignite.internal.processors.rest.request.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.spi.*; - -import java.net.*; -import java.util.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; +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.Iterator; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterMetrics; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.cache.GridCacheAttributes; +import org.apache.ignite.internal.processors.port.GridPortRecord; +import org.apache.ignite.internal.processors.rest.GridRestCommand; +import org.apache.ignite.internal.processors.rest.GridRestProtocol; +import org.apache.ignite.internal.processors.rest.GridRestResponse; +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.handlers.GridRestCommandHandlerAdapter; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestTopologyRequest; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.IgnitePortProtocol; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CACHE; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_ADDRS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_HOST_NAMES; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_PORT; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_SUBJECT; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_CONFIG; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.NODE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.TOPOLOGY; /** * Command handler for API requests. @@ -324,4 +345,4 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter { @Override public String toString() { return S.toString(GridTopologyCommandHandler.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/processors/rest/handlers/version/GridVersionCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java index bf09d30..0e1e164 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java @@ -17,17 +17,19 @@ package org.apache.ignite.internal.processors.rest.handlers.version; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.handlers.*; -import org.apache.ignite.internal.processors.rest.request.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import java.util.Collection; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.rest.GridRestCommand; +import org.apache.ignite.internal.processors.rest.GridRestResponse; +import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.internal.U; -import java.util.*; - -import static org.apache.ignite.internal.IgniteVersionUtils.*; -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; +import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.NAME; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.VERSION; /** * Handler for {@link GridRestCommand#VERSION} and {@link GridRestCommand#NAME} command. @@ -64,4 +66,4 @@ public class GridVersionCommandHandler extends GridRestCommandHandlerAdapter { return new GridFinishedFuture<>(); } -} +} \ No 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/processors/rest/protocols/GridRestProtocolAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java index bb68633..3eb594f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java @@ -17,21 +17,25 @@ package org.apache.ignite.internal.processors.rest.protocols; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.rest.*; -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 sun.misc.*; - -import java.io.*; -import java.net.*; -import java.nio.charset.*; -import java.security.*; -import java.util.*; +import java.io.IOException; +import java.net.InetAddress; +import java.nio.charset.Charset; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.StringTokenizer; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.rest.GridRestProtocol; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; +import sun.misc.BASE64Encoder; /** * Abstract protocol adapter. @@ -193,4 +197,4 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol { @Override public void onKernalStart() { // 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/processors/rest/protocols/tcp/GridClientPacketType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java index e47e825..2ffa2df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java @@ -32,4 +32,4 @@ public enum GridClientPacketType { /** Ignite message. */ IGNITE -} +} \ No 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/processors/rest/protocols/tcp/GridMemcachedMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java index 12c5d2e..a6f8984 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.UUID; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Memcached protocol request. @@ -485,4 +485,4 @@ public class GridMemcachedMessage implements GridClientMessage { @Override public String toString() { return S.toString(GridMemcachedMessage.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/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java index 3259f53..b403654 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java @@ -17,25 +17,50 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.handlers.cache.*; -import org.apache.ignite.internal.processors.rest.request.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.jdk.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; -import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*; -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.rest.GridRestCommand; +import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler; +import org.apache.ignite.internal.processors.rest.GridRestResponse; +import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheRestMetrics; +import org.apache.ignite.internal.processors.rest.request.DataStructuresRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; +import org.apache.ignite.internal.util.future.GridEmbeddedFuture; +import org.apache.ignite.internal.util.lang.GridTuple3; +import org.apache.ignite.internal.util.nio.GridNioFuture; +import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.typedef.C2; +import org.apache.ignite.internal.util.typedef.CIX1; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_DECREMENT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_INCREMENT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_ADD; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_APPEND; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_METRICS; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PREPEND; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE_ALL; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.NOOP; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.QUIT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.VERSION; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.FAILURE; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.KEY_NOT_FOUND; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_REQ_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.SUCCESS; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.LAST_FUT; /** * Handles memcache requests. @@ -437,4 +462,4 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr return new GridTuple3<>(cmd, quiet, retKey); } -} +} \ No 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/processors/rest/protocols/tcp/GridTcpRestNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java index 9a24b40..bf177cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java @@ -17,24 +17,69 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.handlers.cache.*; -import org.apache.ignite.internal.processors.rest.request.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; -import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*; -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.processors.rest.GridRestCommand; +import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler; +import org.apache.ignite.internal.processors.rest.GridRestResponse; +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.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.GridClientTaskRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest; +import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheRestMetrics; +import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestTaskRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestTopologyRequest; +import org.apache.ignite.internal.util.nio.GridNioFuture; +import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_APPEND; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CAS; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_ALL; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_METRICS; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PREPEND; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT_ALL; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REMOVE_ALL; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.NODE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.NOOP; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.TOPOLOGY; +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; +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; +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; /** * Listener for nio server that handles incoming tcp rest packets. @@ -315,4 +360,4 @@ public class GridTcpRestNioListener extends GridNioServerListenerAdapter<GridCli @Override public void onSessionIdleTimeout(GridNioSession ses) { 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/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java index c7f8c70..5beff75 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -17,23 +17,49 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; -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.util.*; -import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.jdk.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.nio.charset.*; -import java.util.*; - -import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*; -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.util.Date; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +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.GridRouterRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse; +import org.apache.ignite.internal.util.GridByteArrayList; +import org.apache.ignite.internal.util.GridClientByteUtils; +import org.apache.ignite.internal.util.nio.GridNioParser; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.BOOLEAN_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.BYTE_ARR_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.BYTE_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.DATE_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.DOUBLE_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.FLAGS_LENGTH; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.FLOAT_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.HDR_LEN; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_HANDSHAKE_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_HANDSHAKE_RES_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.INT_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.LONG_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_REQ_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.MEMCACHE_RES_FLAG; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.SERIALIZED_FLAG; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER; +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.PARSER_STATE; /** * Parser for extended memcache protocol. Handles parsing and encoding activity. @@ -938,4 +964,4 @@ public class GridTcpRestParser implements GridNioParser { return destId; } } -} +} \ No 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/processors/rest/protocols/tcp/GridTcpRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java index 689e050..8e08481 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java @@ -17,32 +17,41 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -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.client.ssl.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.protocols.*; -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.marshaller.*; -import org.apache.ignite.marshaller.jdk.*; -import org.apache.ignite.spi.*; -import org.jetbrains.annotations.*; - -import javax.cache.configuration.*; -import javax.net.ssl.*; -import java.io.*; -import java.net.*; -import java.nio.*; -import java.util.*; - -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; +import java.io.IOException; +import java.net.InetAddress; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import javax.cache.configuration.Factory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteNodeAttributes; +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.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.processors.rest.protocols.GridRestProtocolAdapter; +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.GridNioSession; +import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; +import org.apache.ignite.spi.IgnitePortProtocol; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER; /** * TCP binary protocol implementation. @@ -281,4 +290,4 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { @Override protected String getPortPropertyName() { return IgniteNodeAttributes.ATTR_REST_TCP_PORT; } -} +} \ No 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/processors/rest/request/DataStructuresRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java index 13f03cd..5ba2bbb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/DataStructuresRequest.java @@ -71,4 +71,4 @@ public class DataStructuresRequest extends GridRestRequest { public void initial(Long init) { this.init = init; } -} +} \ No 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/processors/rest/request/GridRestCacheRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java index 0174201..b932036 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestCacheRequest.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.rest.request; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.Map; +import org.apache.ignite.internal.util.typedef.internal.S; /** * @@ -148,4 +147,4 @@ public class GridRestCacheRequest extends GridRestRequest { @Override public String toString() { return S.toString(GridRestCacheRequest.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/processors/rest/request/GridRestLogRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java index 4537fbd..38a9a81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.rest.request; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Grid command request of log file. @@ -78,4 +78,4 @@ public class GridRestLogRequest extends GridRestRequest { @Override public String toString() { return S.toString(GridRestLogRequest.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/processors/rest/request/GridRestRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java index 2a80bbc..57cb91b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestRequest.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.processors.rest.request; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.UUID; +import org.apache.ignite.internal.processors.rest.GridRestCommand; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Grid command request. @@ -147,4 +146,4 @@ public class GridRestRequest { @Override public String toString() { return S.toString(GridRestRequest.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/processors/rest/request/GridRestTaskRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java index 5b9bfa3..73e59a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTaskRequest.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.rest.request; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.List; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Grid task command request. @@ -114,4 +113,4 @@ public class GridRestTaskRequest extends GridRestRequest { @Override public String toString() { return S.toString(GridRestTaskRequest.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/processors/rest/request/GridRestTopologyRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java index 522bb2c..b028367 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestTopologyRequest.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.rest.request; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.UUID; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Grid command topology request. @@ -97,4 +96,4 @@ public class GridRestTopologyRequest extends GridRestRequest { @Override public String toString() { return S.toString(GridRestTopologyRequest.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/processors/rest/request/RestSqlQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java index 5ba3a50..b6ab339 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/RestSqlQueryRequest.java @@ -122,4 +122,4 @@ public class RestSqlQueryRequest extends GridRestRequest { public String typeName() { return typeName; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java index 4712b89..0686348 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleStatistics.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.processors.schedule; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Scheduled task statistics. @@ -179,4 +180,4 @@ class GridScheduleStatistics { @Override public String toString() { return S.toString(GridScheduleStatistics.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/processors/schedule/IgniteNoopScheduleProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java index 4d90be8..f622fbe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.processors.schedule; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.scheduler.*; - -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.scheduler.SchedulerFuture; /** * No-op implementation of {@link IgniteScheduleProcessorAdapter}, throws exception on usage attempt. @@ -51,4 +50,4 @@ public class IgniteNoopScheduleProcessor extends IgniteScheduleProcessorAdapter return new IgniteException("Current Ignite configuration does not support schedule functionality " + "(consider adding ignite-schedule module to classpath)."); } -} +} \ No 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/processors/schedule/IgniteScheduleProcessorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java index e512d1d..1c28055 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessorAdapter.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.processors.schedule; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.scheduler.*; - -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.scheduler.SchedulerFuture; /** * Schedules cron-based execution of grid tasks and closures. Abstract class was introduced to @@ -50,4 +49,4 @@ public abstract class IgniteScheduleProcessorAdapter extends GridProcessorAdapte * @return Descriptor of the scheduled execution. */ public abstract <R> SchedulerFuture<R> schedule(Callable<R> c, String pattern); -} +} \ No 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/processors/security/GridSecurityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java index 1a32f56..ef53566 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java @@ -17,14 +17,17 @@ package org.apache.ignite.internal.processors.security; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.plugin.security.*; +import java.util.Collection; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.processors.GridProcessor; +import org.apache.ignite.plugin.security.AuthenticationContext; +import org.apache.ignite.plugin.security.SecurityCredentials; import org.apache.ignite.plugin.security.SecurityException; -import org.jetbrains.annotations.*; - -import java.util.*; +import org.apache.ignite.plugin.security.SecurityPermission; +import org.apache.ignite.plugin.security.SecuritySubject; +import org.jetbrains.annotations.Nullable; /** * This interface defines a grid authentication processor. @@ -95,4 +98,4 @@ public interface GridSecurityProcessor extends GridProcessor { * @return GridSecurityProcessor is enable. */ public boolean enabled(); -} +} \ No 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/processors/security/SecurityContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java index 3151f68..ef46713 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.processors.security; -import org.apache.ignite.plugin.security.*; +import org.apache.ignite.plugin.security.SecurityPermission; +import org.apache.ignite.plugin.security.SecuritySubject; /** * Security context. @@ -53,4 +54,4 @@ public interface SecurityContext { * @return {@code True} if system operation is allowed. */ public boolean systemOperationAllowed(SecurityPermission perm); -} +} \ No 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/processors/security/os/GridOsSecurityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java index 4b81041..42f9661 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java @@ -17,16 +17,21 @@ package org.apache.ignite.internal.processors.security.os; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.security.*; -import org.apache.ignite.plugin.security.*; +import java.util.Collection; +import java.util.Collections; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.security.GridSecurityProcessor; +import org.apache.ignite.internal.processors.security.SecurityContext; +import org.apache.ignite.plugin.security.AuthenticationContext; +import org.apache.ignite.plugin.security.SecurityCredentials; import org.apache.ignite.plugin.security.SecurityException; -import org.jetbrains.annotations.*; - -import java.util.*; +import org.apache.ignite.plugin.security.SecurityPermission; +import org.apache.ignite.plugin.security.SecuritySubject; +import org.jetbrains.annotations.Nullable; /** * No-op implementation for {@link GridSecurityProcessor}. @@ -80,4 +85,4 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri @Override public boolean enabled() { return false; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java index fd3ea5c..3a4d651 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/GridSegmentationProcessor.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.segmentation; -import org.apache.ignite.internal.processors.*; +import org.apache.ignite.internal.processors.GridProcessor; /** * Kernal processor responsible for checking network segmentation issues. @@ -48,4 +48,4 @@ public interface GridSegmentationProcessor extends GridProcessor { * @return {@code True} if segment is correct. */ public boolean isValidSegment(); -} +} \ No 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/processors/segmentation/os/GridOsSegmentationProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java index 3d78d58..9d1b3bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/segmentation/os/GridOsSegmentationProcessor.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.segmentation.os; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.segmentation.*; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor; /** * No-op implementation for {@link GridSegmentationProcessor}. @@ -36,4 +36,4 @@ public class GridOsSegmentationProcessor extends GridProcessorAdapter implements @Override public boolean isValidSegment() { return true; } -} +} \ No 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/processors/service/GridServiceAssignments.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java index 91a53a7..c629a48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignments.java @@ -17,15 +17,17 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.services.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Collections; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.processors.cache.GridCacheInternal; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.services.Service; +import org.apache.ignite.services.ServiceConfiguration; /** * Service per-node assignment. @@ -132,4 +134,4 @@ public class GridServiceAssignments implements Serializable, GridCacheInternal { @Override public String toString() { return S.toString(GridServiceAssignments.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/processors/service/GridServiceAssignmentsKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java index 41663ef..5b26f9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceAssignmentsKey.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Service configuration key. @@ -60,4 +60,4 @@ public class GridServiceAssignmentsKey extends GridCacheUtilityKey<GridServiceAs @Override public String toString() { return S.toString(GridServiceAssignmentsKey.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/processors/service/GridServiceDeployment.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java index d0f7d2f..f25c38e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeployment.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.services.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.UUID; +import org.apache.ignite.internal.processors.cache.GridCacheInternal; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.services.ServiceConfiguration; /** * Service deployment. @@ -92,4 +91,4 @@ public class GridServiceDeployment implements GridCacheInternal, Serializable { @Override public String toString() { return S.toString(GridServiceDeployment.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/processors/service/GridServiceDeploymentFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java index 4c487ef..c7d28fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.services.*; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.services.ServiceConfiguration; /** * Service deployment future. @@ -49,4 +49,4 @@ public class GridServiceDeploymentFuture extends GridFutureAdapter<Object> { @Override public String toString() { return S.toString(GridServiceDeploymentFuture.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/processors/service/GridServiceDeploymentKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java index 6870bbe..80415bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentKey.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Service configuration key. @@ -60,4 +60,4 @@ public class GridServiceDeploymentKey extends GridCacheUtilityKey<GridServiceDep @Override public String toString() { return S.toString(GridServiceDeploymentKey.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/processors/service/GridServiceMethodNotFoundException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java index 2ab611c..c3b70ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodNotFoundException.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.*; - -import java.util.*; +import java.util.Arrays; +import org.apache.ignite.IgniteException; /** * Exception thrown if service is not found. @@ -40,4 +39,4 @@ public class GridServiceMethodNotFoundException extends IgniteException { @Override public String toString() { return getClass() + ": " + getMessage(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java index 3772f60..6dc0c32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceMethodReflectKey.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.service; -import java.util.*; +import java.util.Arrays; /** * Method reflection key. @@ -74,4 +74,4 @@ class GridServiceMethodReflectKey { return hash = 31 * mtdName.hashCode() + Arrays.hashCode(argTypes); } -} +} \ No 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/processors/service/GridServiceNotFoundException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java index 21f012f..e23db7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceNotFoundException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Exception thrown if service is not found. @@ -37,4 +37,4 @@ public class GridServiceNotFoundException extends IgniteCheckedException { @Override public String toString() { return getClass() + ": " + getMessage(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 0f43b8a..7e8669a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -17,40 +17,75 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.internal.processors.cache.transactions.*; -import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.future.*; -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.services.*; -import org.apache.ignite.thread.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import javax.cache.*; -import javax.cache.event.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; -import static org.apache.ignite.transactions.TransactionConcurrency.*; -import static org.apache.ignite.transactions.TransactionIsolation.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import javax.cache.Cache; +import javax.cache.event.CacheEntryEvent; +import javax.cache.event.CacheEntryListenerException; +import javax.cache.event.CacheEntryUpdatedListener; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.DeploymentMode; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.CacheEntryImpl; +import org.apache.ignite.internal.processors.cache.CacheIteratorConverter; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.processors.cache.query.CacheQuery; +import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; +import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; +import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; +import org.apache.ignite.internal.util.GridSpinBusyLock; +import org.apache.ignite.internal.util.future.GridCompoundFuture; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +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.LT; +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.IgniteFuture; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.services.Service; +import org.apache.ignite.services.ServiceConfiguration; +import org.apache.ignite.services.ServiceDescriptor; +import org.apache.ignite.thread.IgniteThreadFactory; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + +import static org.apache.ignite.configuration.DeploymentMode.ISOLATED; +import static org.apache.ignite.configuration.DeploymentMode.PRIVATE; +import static org.apache.ignite.events.EventType.EVTS_DISCOVERY; +import static org.apache.ignite.internal.processors.cache.GridCacheUtils.UTILITY_CACHE_NAME; +import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** * Grid service processor. @@ -1400,4 +1435,4 @@ public class GridServiceProcessor extends GridProcessorAdapter { return S.toString(ServiceAssignmentsPredicate.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/processors/service/GridServiceProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java index 556beea..e54ec7b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java @@ -17,24 +17,40 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -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.resources.*; -import org.apache.ignite.services.*; -import org.jsr166.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.atomic.*; - -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.Serializable; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +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.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteCallable; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.services.ServiceDescriptor; +import org.jsr166.ThreadLocalRandom8; + +import static org.apache.ignite.internal.GridClosureCallMode.BALANCE; /** * Wrapper for making {@link org.apache.ignite.services.Service} class proxies. @@ -387,4 +403,4 @@ class GridServiceProxy<T> implements Serializable { return S.toString(ServiceProxyCallable.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/processors/service/ServiceContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java index b468231..b17beeb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java @@ -17,14 +17,16 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.services.*; -import org.jetbrains.annotations.*; - -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; +import java.lang.reflect.Method; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutorService; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.services.Service; +import org.apache.ignite.services.ServiceContext; +import org.jetbrains.annotations.Nullable; /** * Service context implementation. @@ -153,4 +155,4 @@ public class ServiceContextImpl implements ServiceContext { @Override public String toString() { return S.toString(ServiceContextImpl.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/processors/service/ServiceDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java index 2e7ce17..7671a2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDescriptorImpl.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.processors.service; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.services.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.services.Service; +import org.apache.ignite.services.ServiceDescriptor; +import org.jetbrains.annotations.Nullable; /** * Service descriptor. @@ -98,4 +99,4 @@ public class ServiceDescriptorImpl implements ServiceDescriptor { @Override public String toString() { return S.toString(ServiceDescriptorImpl.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/processors/session/GridTaskSessionProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java index 1278d36..2ac39c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java @@ -17,18 +17,20 @@ package org.apache.ignite.internal.processors.session; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.compute.ComputeJobSibling; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.GridTaskSessionImpl; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** */ @@ -175,4 +177,4 @@ public class GridTaskSessionProcessor extends GridProcessorAdapter { X.println(">>> Task session processor memory stats [grid=" + ctx.gridName() + ']'); X.println(">>> sesMapSize: " + sesMap.size()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java index 4e2a974..111198e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridInternal.java @@ -17,7 +17,11 @@ package org.apache.ignite.internal.processors.task; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Indicates that annotated task should always be loaded with local deployment, @@ -32,4 +36,4 @@ import java.lang.annotation.*; @Target({ElementType.TYPE}) public @interface GridInternal { // 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/processors/task/GridTaskEventListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java index cc6b34d..63e4ac0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskEventListener.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.task; -import org.apache.ignite.internal.*; - -import java.util.*; +import java.util.EventListener; +import java.util.UUID; +import org.apache.ignite.internal.GridJobSiblingImpl; /** * Listener for task events. @@ -53,4 +53,4 @@ interface GridTaskEventListener extends EventListener { * @param worker Task worker for finished grid task. */ public void onTaskFinished(GridTaskWorker<?, ?> worker); -} +} \ No 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/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index 7a07505..b8d1d78 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -17,34 +17,75 @@ package org.apache.ignite.internal.processors.task; -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.compute.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.lang.*; -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.security.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; - -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.processors.task.GridTaskThreadContextKey.*; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.RejectedExecutionException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeExecutionRejectedException; +import org.apache.ignite.compute.ComputeJobSibling; +import org.apache.ignite.compute.ComputeTask; +import org.apache.ignite.compute.ComputeTaskFuture; +import org.apache.ignite.compute.ComputeTaskMapAsync; +import org.apache.ignite.compute.ComputeTaskName; +import org.apache.ignite.compute.ComputeTaskSessionFullSupport; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.events.TaskEvent; +import org.apache.ignite.internal.ComputeTaskInternalFuture; +import org.apache.ignite.internal.GridJobExecuteResponse; +import org.apache.ignite.internal.GridJobSiblingImpl; +import org.apache.ignite.internal.GridJobSiblingsRequest; +import org.apache.ignite.internal.GridJobSiblingsResponse; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.GridTaskCancelRequest; +import org.apache.ignite.internal.GridTaskNameHashKey; +import org.apache.ignite.internal.GridTaskSessionImpl; +import org.apache.ignite.internal.GridTaskSessionRequest; +import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException; +import org.apache.ignite.internal.IgniteDeploymentCheckedException; +import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException; +import org.apache.ignite.internal.managers.communication.GridIoManager; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.cache.CachePeekModes; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.util.GridConcurrentFactory; +import org.apache.ignite.internal.util.GridSpinReadWriteLock; +import org.apache.ignite.internal.util.lang.GridPeerDeployAware; +import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.plugin.security.SecurityPermission; +import org.jetbrains.annotations.Nullable; +import org.jsr166.LongAdder8; + +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; +import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; +import static org.apache.ignite.events.EventType.EVT_TASK_SESSION_ATTR_SET; +import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_SIBLINGS; +import static org.apache.ignite.internal.GridTopic.TOPIC_TASK; +import static org.apache.ignite.internal.GridTopic.TOPIC_TASK_CANCEL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBJ_ID; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TASK_NAME; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TIMEOUT; /** * This class defines task processor. @@ -1325,4 +1366,4 @@ public class GridTaskProcessor extends GridProcessorAdapter { } } } -} +} \ No 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/processors/task/GridTaskThreadContextKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java index df706cf..3bb1924 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java @@ -35,4 +35,4 @@ public enum GridTaskThreadContextKey { /** Security subject ID. */ TC_SUBJ_ID -} +} \ No newline at end of file
