http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java index 8e95ab8..5ed6502 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java @@ -18,10 +18,11 @@ package org.apache.ignite.internal.processors.query.h2.twostep.messages; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.nio.*; +import java.nio.ByteBuffer; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Request to fetch next page. @@ -164,4 +165,4 @@ public class GridQueryNextPageRequest implements Message { @Override public byte fieldsCount() { return 3; } -} +} \ 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/query/h2/twostep/messages/GridQueryNextPageResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index d06e118..ade7d90 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@ -17,14 +17,18 @@ package org.apache.ignite.internal.processors.query.h2.twostep.messages; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import java.util.Collection; +import org.apache.ignite.internal.GridDirectCollection; +import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.internal.IgniteCodeGeneratingFail; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Next page response. @@ -295,4 +299,4 @@ public class GridQueryNextPageResponse implements Message { public void retry(AffinityTopologyVersion retry) { this.retry = retry; } -} +} \ 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/query/h2/twostep/messages/GridQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java index 2b04c52..a7b4d7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java @@ -17,16 +17,20 @@ package org.apache.ignite.internal.processors.query.h2.twostep.messages; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridDirectCollection; +import org.apache.ignite.internal.IgniteCodeGeneratingFail; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Query request. @@ -307,4 +311,4 @@ public class GridQueryRequest implements Message { @Override public byte fieldsCount() { return 7; } -} +} \ 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/resource/GridNoImplicitInjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java index 93b833d..620f03c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridNoImplicitInjection.java @@ -22,4 +22,4 @@ package org.apache.ignite.internal.processors.resource; */ public interface GridNoImplicitInjection { -} +} \ 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/resource/GridResourceBasicInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java index 4ada7bb..ddb84ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceBasicInjector.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Simple injector which wraps only one resource object. @@ -68,4 +68,4 @@ class GridResourceBasicInjector<T> implements GridResourceInjector { @Override public String toString() { return S.toString(GridResourceBasicInjector.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/resource/GridResourceField.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java index fed7ebd..2c88bb6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.Collection; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.NotNull; /** * Wrapper for data where resource should be injected. @@ -90,4 +89,4 @@ class GridResourceField { @Override public String toString() { return S.toString(GridResourceField.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/resource/GridResourceInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java index 1a3566f..0b3a6c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceInjector.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.internal.managers.deployment.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.managers.deployment.GridDeployment; /** * Resource injector implementations contain logic and resources that @@ -53,4 +53,4 @@ interface GridResourceInjector { * @param dep Deployment to undeploy. */ public void undeploy(GridDeployment dep); -} +} \ 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/resource/GridResourceIoc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java index 1e85ecd..35824fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java @@ -17,18 +17,26 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.internal.util.GridLeanIdentitySet; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * Resource container contains caches for classes used for injection. @@ -343,4 +351,4 @@ class GridResourceIoc { return annMap.get(annCls); } } -} +} \ 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/resource/GridResourceJobContextInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java index 5c7b301..3a6e779 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.managers.deployment.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.compute.ComputeJobContext; +import org.apache.ignite.compute.ComputeTask; +import org.apache.ignite.internal.managers.deployment.GridDeployment; /** * Simple injector which wraps ComputeJobContext resource object. @@ -51,4 +52,4 @@ public class GridResourceJobContextInjector extends GridResourceBasicInjector<Co if (!(target instanceof ComputeTask)) super.inject(mtd, target, depCls, dep); } -} +} \ 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/resource/GridResourceLoggerInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java index 7a36067..8c66efa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.resources.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.resources.LoggerResource; /** * @@ -65,4 +66,4 @@ public class GridResourceLoggerInjector extends GridResourceBasicInjector<Ignite return rsrc; } -} +} \ 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/resource/GridResourceMethod.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java index ad08a40..9e411d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Wrapper for data where resource should be injected. @@ -85,4 +84,4 @@ class GridResourceMethod { @Override public String toString() { return S.toString(GridResourceMethod.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/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java index f5ba492..afe0ef1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java @@ -17,22 +17,42 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.cache.store.*; -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.lifecycle.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.services.*; -import org.apache.ignite.spi.*; -import org.jetbrains.annotations.*; - -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cache.store.CacheStoreSession; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeLoadBalancer; +import org.apache.ignite.compute.ComputeTask; +import org.apache.ignite.compute.ComputeTaskContinuousMapper; +import org.apache.ignite.compute.ComputeTaskSession; +import org.apache.ignite.internal.GridInternalWrapper; +import org.apache.ignite.internal.GridJobContextImpl; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.GridTaskSessionImpl; +import org.apache.ignite.internal.IgniteEx; +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.lifecycle.LifecycleBean; +import org.apache.ignite.resources.CacheNameResource; +import org.apache.ignite.resources.CacheStoreSessionResource; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.resources.JobContextResource; +import org.apache.ignite.resources.LoadBalancerResource; +import org.apache.ignite.resources.LoggerResource; +import org.apache.ignite.resources.ServiceResource; +import org.apache.ignite.resources.SpringApplicationContextResource; +import org.apache.ignite.resources.SpringResource; +import org.apache.ignite.resources.TaskContinuousMapperResource; +import org.apache.ignite.resources.TaskSessionResource; +import org.apache.ignite.services.Service; +import org.apache.ignite.spi.IgniteSpi; +import org.jetbrains.annotations.Nullable; /** * Processor for all Ignite and task/job resources. @@ -582,4 +602,4 @@ public class GridResourceProcessor extends GridProcessorAdapter { ioc.printMemoryStats(); } -} +} \ 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/resource/GridResourceServiceInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java index 9c2b2e6..f204e56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java @@ -17,12 +17,12 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.services.*; - -import java.util.*; +import java.util.Collection; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.resources.ServiceResource; +import org.apache.ignite.services.Service; /** * Grid service injector. @@ -81,4 +81,4 @@ public class GridResourceServiceInjector extends GridResourceBasicInjector<Colle if (svc != null) GridResourceUtils.inject(mtd.getMethod(), target, svc); } -} +} \ 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/resource/GridResourceUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java index 660d6ba..d27799c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceUtils.java @@ -17,11 +17,12 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.lang.*; - -import java.lang.reflect.*; -import java.util.concurrent.*; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.concurrent.Callable; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.lang.IgniteClosure; /** * Collection of utility methods used in package for classes reflection. @@ -103,4 +104,4 @@ final class GridResourceUtils { Callable.class.isAssignableFrom(f.getType()) || Runnable.class.isAssignableFrom(f.getType()) || IgniteClosure.class.isAssignableFrom(f.getType()); } -} +} \ 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/resource/GridSpringResourceContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java index f0d17ec..37b558f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.resource; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.IgnitionEx; /** * Interface was introduced to avoid compile-time dependency on spring framework. Spring resource context @@ -45,4 +45,3 @@ public interface GridSpringResourceContext { */ public Object unwrapTarget(Object target) throws IgniteCheckedException; } - http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java index 76a33b1..4f9b3ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.rest; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import org.jetbrains.annotations.Nullable; /** * Supported commands. @@ -193,4 +193,4 @@ public enum GridRestCommand { public String key() { return key; } -} +} \ 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/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index bb796d2..d606ba4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -17,38 +17,60 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.handlers.*; -import org.apache.ignite.internal.processors.rest.handlers.cache.*; -import org.apache.ignite.internal.processors.rest.handlers.datastructures.*; -import org.apache.ignite.internal.processors.rest.handlers.query.*; -import org.apache.ignite.internal.processors.rest.handlers.task.*; -import org.apache.ignite.internal.processors.rest.handlers.top.*; -import org.apache.ignite.internal.processors.rest.handlers.version.*; -import org.apache.ignite.internal.processors.rest.protocols.tcp.*; -import org.apache.ignite.internal.processors.rest.request.*; -import org.apache.ignite.internal.processors.security.*; -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.internal.util.worker.*; -import org.apache.ignite.internal.visor.util.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.security.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +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.CountDownLatch; +import java.util.concurrent.RejectedExecutionException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.ConnectorMessageInterceptor; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean; +import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler; +import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler; +import org.apache.ignite.internal.processors.rest.handlers.datastructures.DataStructuresCommandHandler; +import org.apache.ignite.internal.processors.rest.handlers.query.QueryCommandHandler; +import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler; +import org.apache.ignite.internal.processors.rest.handlers.top.GridTopologyCommandHandler; +import org.apache.ignite.internal.processors.rest.handlers.version.GridVersionCommandHandler; +import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestProtocol; +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.RestSqlQueryRequest; +import org.apache.ignite.internal.processors.security.SecurityContext; +import org.apache.ignite.internal.util.GridSpinReadWriteLock; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.worker.GridWorker; +import org.apache.ignite.internal.util.worker.GridWorkerFuture; +import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.plugin.security.AuthenticationContext; +import org.apache.ignite.plugin.security.SecurityCredentials; import org.apache.ignite.plugin.security.SecurityException; -import org.jsr166.*; +import org.apache.ignite.plugin.security.SecurityPermission; +import org.jsr166.LongAdder8; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.processors.rest.GridRestResponse.*; -import static org.apache.ignite.plugin.security.SecuritySubjectType.*; +import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_AUTH_FAILED; +import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_FAILED; +import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_SECURITY_CHECK_FAILED; +import static org.apache.ignite.plugin.security.SecuritySubjectType.REMOTE_CLIENT; /** * Rest processor implementation. @@ -697,4 +719,4 @@ public class GridRestProcessor extends GridProcessorAdapter { X.println(">>> protosSize: " + protos.size()); X.println(">>> handlersSize: " + handlers.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/rest/GridRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java index 468d7fa..202f742 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocol.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.*; -import org.apache.ignite.lang.*; - -import java.util.*; +import java.util.Collection; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.lang.IgniteBiTuple; /** * REST protocol. @@ -56,4 +55,4 @@ public interface GridRestProtocol { * Stops protocol. */ public abstract void 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/processors/rest/GridRestProtocolHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java index ed9fd81..b14beb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.rest.request.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; /** * Command protocol handler. @@ -37,4 +37,4 @@ public interface GridRestProtocolHandler { * @return Future. */ public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req); -} +} \ 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/GridRestResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java index 83c987f..ecbc6c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * JSON response. Getters and setters must conform to JavaBean standard. @@ -174,4 +177,4 @@ public class GridRestResponse implements Externalizable { err = U.readString(in); obj = in.readObject(); } -} +} \ 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/client/message/GridClientAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java index c6557bc..0d55b16 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java @@ -17,10 +17,13 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.UUID; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * This class provides implementation for commit message fields and cannot be used directly. @@ -99,4 +102,4 @@ public abstract class GridClientAbstractMessage implements GridClientMessage, Ex @Override public String toString() { return S.toString(GridClientAbstractMessage.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/client/message/GridClientAuthenticationRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java index 8eed157..d48df26 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Client authentication request. @@ -63,4 +64,4 @@ public class GridClientAuthenticationRequest extends GridClientAbstractMessage { @Override public String toString() { return S.toString(GridClientAuthenticationRequest.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/client/message/GridClientCacheRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java index 58e973b..b1afff1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Generic cache request. @@ -268,4 +271,4 @@ public class GridClientCacheRequest extends GridClientAbstractMessage { return getClass().getSimpleName() + " [op=" + op + ", key=" + key + ", val=" + val + ", val2=" + val2 + ", vals=" + vals + ", cacheFlagsOn=" + cacheFlagsOn + "]"; } -} +} \ 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/client/message/GridClientHandshakeRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java index b3dd30c..3790dd0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.Arrays; +import org.apache.ignite.internal.util.typedef.internal.U; /** * A client handshake request, containing version info and @@ -105,4 +104,4 @@ public class GridClientHandshakeRequest extends GridClientAbstractMessage { @Override public String toString() { return getClass().getSimpleName() + " [arr=" + Arrays.toString(arr) + ']'; } -} +} \ 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/client/message/GridClientHandshakeResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java index ec677dc..f125462 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeResponse.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.rest.client.message; -import java.io.*; +import java.io.Externalizable; /** * A client handshake response, containing result @@ -63,4 +63,4 @@ public class GridClientHandshakeResponse extends GridClientAbstractMessage { @Override public String toString() { return getClass().getSimpleName() + " [resCode=" + resCode + ']'; } -} +} \ 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/client/message/GridClientMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java index 4f34a9c..4db618d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientMessage.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.rest.client.message; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.UUID; /** * Interface for all client messages. @@ -79,4 +79,4 @@ public interface GridClientMessage extends Serializable { * @param sesTok Session token. */ public void sessionToken(byte[] sesTok); -} +} \ 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/client/message/GridClientNodeBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java index 833abd9..2a34c80 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeBean.java @@ -17,10 +17,15 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Node bean. @@ -278,4 +283,4 @@ public class GridClientNodeBean implements Externalizable { @Override public String toString() { return "GridClientNodeBean [id=" + nodeId + ']'; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java index 91bfd6a..4138c24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java @@ -17,7 +17,10 @@ package org.apache.ignite.internal.processors.rest.client.message; -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; /** * Node metrics bean. @@ -1457,4 +1460,4 @@ public class GridClientNodeMetricsBean implements Externalizable { rcvdMsgsCnt = in.readInt(); rcvdBytesCnt = in.readLong(); } -} +} \ 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/client/message/GridClientPingPacket.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java index 90235df..36c83c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPingPacket.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.rest.client.message; -import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*; +import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.IGNITE_REQ_FLAG; /** * Fictive ping packet. @@ -36,4 +36,4 @@ public class GridClientPingPacket extends GridClientAbstractMessage { @Override public String toString() { return getClass().getName(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java index e96baf5..5522095 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientPortableMetaData.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.Map; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Portable meta data sent from client. @@ -69,4 +68,4 @@ public class GridClientPortableMetaData { @Override public String toString() { return S.toString(GridClientPortableMetaData.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/client/message/GridClientResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java index c9a7263..8208229 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientResponse.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Bean representing client operation result. @@ -119,4 +120,4 @@ public class GridClientResponse extends GridClientAbstractMessage { "destId=" + destinationId() + ", status=" + successStatus + ", errMsg=" + errorMessage() + ", result=" + 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/processors/rest/client/message/GridClientTaskRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java index a7fa86e..6b53143 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.typedef.internal.U; /** * {@code Task} command request. @@ -121,4 +122,4 @@ public class GridClientTaskRequest extends GridClientAbstractMessage { @Override public String toString() { return getClass().getSimpleName() + " [taskName=" + taskName + ", arg=" + arg + "]"; } -} +} \ 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/client/message/GridClientTaskResultBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java index 696ac03..dc2a953 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskResultBean.java @@ -17,9 +17,11 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Task result. @@ -118,4 +120,4 @@ public class GridClientTaskResultBean implements Externalizable { return getClass().getSimpleName() + " [res=" + res + ", error=" + error + ", finished=" + finished + ", id=" + 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/processors/rest/client/message/GridClientTopologyRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java index 8b27084..f35bdad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTopologyRequest.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.processors.rest.client.message; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.UUID; +import org.apache.ignite.internal.util.typedef.internal.U; /** * {@code Topology} command request. @@ -146,4 +147,4 @@ public class GridClientTopologyRequest extends GridClientAbstractMessage { return getClass().getSimpleName() + " [includeMetrics=" + includeMetrics + ", includeAttrs=" + includeAttrs + "]"; } -} +} \ 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/client/message/GridRouterRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java index 7839e22..35411a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterRequest.java @@ -17,8 +17,11 @@ package org.apache.ignite.internal.processors.rest.client.message; -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.UUID; /** * Container for routed message information. @@ -73,4 +76,4 @@ public class GridRouterRequest extends GridClientAbstractMessage { return "GridRouterRequest [clientId=" + clientId() + ", reqId=" + requestId() + ", " + "destId=" + destinationId() + ", length=" + body.length + "]"; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java index 9054d8e..fb9297d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridRouterResponse.java @@ -17,8 +17,11 @@ package org.apache.ignite.internal.processors.rest.client.message; -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.UUID; /** * @@ -99,4 +102,4 @@ public class GridRouterResponse extends GridClientAbstractMessage { ", status=" + status + ", errMsg=" + errorMessage() + "]"; } -} +} \ 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/GridRestCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java index e185332..77427fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.rest.handlers; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.request.*; - -import java.util.*; +import java.util.Collection; +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.request.GridRestRequest; /** * Command handler. @@ -37,4 +37,4 @@ public interface GridRestCommandHandler { * @return Future. */ public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req); -} +} \ 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/GridRestCommandHandlerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java index 2fd0f2d..31c26b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandlerAdapter.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.rest.handlers; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.GridKernalContext; /** * Abstract command handler. @@ -48,4 +48,4 @@ public abstract class GridRestCommandHandlerAdapter implements GridRestCommandHa protected static String missingParameter(String param) { return "Failed to find mandatory parameter in request: " + param; } -} +} \ 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/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index 64f595d..b3af2f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -17,35 +17,78 @@ package org.apache.ignite.internal.processors.rest.handlers.cache; -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.transactions.*; -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.processors.task.*; -import org.apache.ignite.internal.util.future.*; -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.resources.*; -import org.jetbrains.annotations.*; - -import javax.cache.expiry.*; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.internal.GridClosureCallMode.*; -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; -import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*; -import static org.apache.ignite.transactions.TransactionConcurrency.*; -import static org.apache.ignite.transactions.TransactionIsolation.*; +import java.io.Serializable; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.Callable; +import javax.cache.expiry.Duration; +import javax.cache.expiry.ModifiedExpiryPolicy; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cache.CacheMetrics; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CachePeekMode; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.processors.cache.GridCacheAdapter; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; +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.GridRestCacheRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.lang.IgniteClosure2X; +import org.apache.ignite.internal.util.typedef.CX1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.jetbrains.annotations.Nullable; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.internal.GridClosureCallMode.BALANCE; +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_CAS; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CONTAINS_KEY; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CONTAINS_KEYS; +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_GET_AND_PUT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_PUT_IF_ABSENT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_REMOVE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_AND_REPLACE; +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_PUT_IF_ABSENT; +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_REMOVE_VALUE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_REPLACE_VALUE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_SIZE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.DESTROY_CACHE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.GET_OR_CREATE_CACHE; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER; +import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** * Command handler for API requests. @@ -1348,4 +1391,4 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { return c.sizeAsync(new CachePeekMode[]{CachePeekMode.PRIMARY}); } } -} +} \ 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/cache/GridCacheRestMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java index d723800..be38696 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestMetrics.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.processors.rest.handlers.cache; -import org.apache.ignite.internal.util.*; - -import java.util.*; +import java.util.Map; +import org.apache.ignite.internal.util.GridLeanMap; /** * Grid cache metrics for rest. @@ -139,4 +138,4 @@ public class GridCacheRestMetrics { return map; } -} +} \ 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/cache/GridCacheRestResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java index aa52f47..9d73867 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheRestResponse.java @@ -17,10 +17,12 @@ package org.apache.ignite.internal.processors.rest.handlers.cache; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.processors.rest.GridRestResponse; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Adds affinity node ID to cache responses. @@ -64,4 +66,4 @@ public class GridCacheRestResponse extends GridRestResponse { affinityNodeId = U.readString(in); } -} +} \ 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/datastructures/DataStructuresCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java index 5abbb77..e3cdcf2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/datastructures/DataStructuresCommandHandler.java @@ -17,19 +17,23 @@ package org.apache.ignite.internal.processors.rest.handlers.datastructures; -import org.apache.ignite.*; -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.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; +import java.util.Collection; +import java.util.concurrent.Callable; +import org.apache.ignite.IgniteAtomicLong; +import org.apache.ignite.IgniteCheckedException; +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.DataStructuresRequest; +import org.apache.ignite.internal.processors.rest.request.GridRestRequest; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.CX1; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_DECREMENT; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.ATOMIC_INCREMENT; /** * @@ -107,4 +111,4 @@ public class DataStructuresCommandHandler extends GridRestCommandHandlerAdapter } }, 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/rest/handlers/query/CacheQueryFieldsMetaResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java index 8c4ddb0..4c8a054 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java @@ -17,10 +17,12 @@ package org.apache.ignite.internal.processors.rest.handlers.query; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Cache query fields metadata. @@ -130,4 +132,4 @@ public class CacheQueryFieldsMetaResult implements Externalizable { fieldName = U.readString(in); fieldTypeName = U.readString(in); } -} +} \ 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/query/CacheQueryResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java index 544a094..f5a920f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryResult.java @@ -17,10 +17,13 @@ package org.apache.ignite.internal.processors.rest.handlers.query; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collection; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Client query result. @@ -117,4 +120,4 @@ public class CacheQueryResult implements Externalizable { items = U.readCollection(in); fieldsMeta = U.readCollection(in); } -} +} \ 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/query/QueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java index 1712dd4..64c7673 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java @@ -17,23 +17,35 @@ package org.apache.ignite.internal.processors.rest.handlers.query; -import org.apache.ignite.*; -import org.apache.ignite.cache.query.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.query.*; -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 org.apache.ignite.lang.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.query.Query; +import org.apache.ignite.cache.query.QueryCursor; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.cache.query.SqlQuery; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.cache.QueryCursorImpl; +import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; +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.processors.rest.request.RestSqlQueryRequest; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; + +import static org.apache.ignite.internal.processors.rest.GridRestCommand.CLOSE_SQL_QUERY; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXECUTE_SQL_FIELDS_QUERY; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXECUTE_SQL_QUERY; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.FETCH_SQL_QUERY; /** * Query command handler. @@ -289,4 +301,4 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { 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/processors/rest/handlers/task/GridTaskCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java index d832b21..232353a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java @@ -17,42 +17,70 @@ package org.apache.ignite.internal.processors.rest.handlers.task; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.eventstorage.*; -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.processors.task.*; -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.internal.visor.util.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.resources.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridClosureCallMode.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; -import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; -import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*; -import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +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.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.ComputeTaskInternalFuture; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.rest.GridRestCommand; +import org.apache.ignite.internal.processors.rest.GridRestResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean; +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.GridRestTaskRequest; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; +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.X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.jetbrains.annotations.Nullable; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS; +import static org.apache.ignite.IgniteSystemProperties.getInteger; +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.internal.GridClosureCallMode.BALANCE; +import static org.apache.ignite.internal.GridTopic.TOPIC_REST; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.EXE; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.NOOP; +import static org.apache.ignite.internal.processors.rest.GridRestCommand.RESULT; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBJ_ID; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_TIMEOUT; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q; /** * Command handler for API requests. @@ -636,4 +664,4 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter { clientId = U.readUuid(in); } } -} +} \ 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/task/GridTaskResultRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java index 951b1e0..64eb5fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.processors.rest.handlers.task; -import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Task result request. @@ -165,4 +166,4 @@ public class GridTaskResultRequest implements Message { @Override public byte fieldsCount() { return 2; } -} +} \ 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/task/GridTaskResultResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java index d29c525..8876d4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java @@ -17,11 +17,12 @@ package org.apache.ignite.internal.processors.rest.handlers.task; -import org.apache.ignite.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.nio.*; +import java.nio.ByteBuffer; +import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.jetbrains.annotations.Nullable; /** * Task result response. @@ -211,4 +212,4 @@ public class GridTaskResultResponse implements Message { @Override public byte fieldsCount() { return 4; } -} +} \ No newline at end of file
