http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java index 002596b..d6c7fab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java @@ -17,15 +17,16 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.util.typedef.internal.S; -import java.io.*; -import java.util.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray; /** * Data transfer object for node configuration data. @@ -227,4 +228,4 @@ public class VisorGridConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorGridConfiguration.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/visor/node/VisorIgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java index 3bd27b4..e85484d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java @@ -17,17 +17,22 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; - -import static org.apache.ignite.internal.processors.igfs.IgfsEx.*; -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_CONFIG_PATH; +import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_URI; +import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_USER_NAME; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; /** * Data transfer object for IGFS configuration properties. @@ -389,4 +394,4 @@ public class VisorIgfsConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorIgfsConfiguration.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/visor/node/VisorLifecycleConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java index 3e0f9cc..396c7f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java @@ -17,13 +17,12 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; +import java.io.Serializable; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; -import java.io.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray; /** * Data transfer object for node lifecycle configuration properties. @@ -58,4 +57,4 @@ public class VisorLifecycleConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorLifecycleConfiguration.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/visor/node/VisorMetricsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java index e76adac..c5ff882 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Serializable; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Data transfer object for node metrics configuration properties. @@ -77,4 +76,4 @@ public class VisorMetricsConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorMetricsConfiguration.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/visor/node/VisorNodeConfigurationCollectorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java index e257443..109b1d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorJob.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; /** * Grid configuration data collect job. @@ -44,4 +44,4 @@ public class VisorNodeConfigurationCollectorJob extends VisorJob<Void, VisorGrid @Override public String toString() { return S.toString(VisorNodeConfigurationCollectorJob.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/visor/node/VisorNodeConfigurationCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java index e4ed188..0f43a6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeConfigurationCollectorTask.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.visor.*; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.visor.VisorOneNodeTask; /** * Grid configuration data collect task. @@ -32,4 +32,4 @@ public class VisorNodeConfigurationCollectorTask extends VisorOneNodeTask<Void, @Override protected VisorNodeConfigurationCollectorJob job(Void arg) { return new VisorNodeConfigurationCollectorJob(arg, debug); } -} +} \ 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/visor/node/VisorNodeDataCollectorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java index 4d601d2..1deabe5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java @@ -17,23 +17,28 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.igfs.*; -import org.apache.ignite.internal.util.ipc.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.cache.*; -import org.apache.ignite.internal.visor.compute.*; -import org.apache.ignite.internal.visor.igfs.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; -import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.*; -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.util.Collection; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.processors.cache.GridCacheProcessor; +import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter; +import org.apache.ignite.internal.util.ipc.IpcServerEndpoint; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.cache.VisorCache; +import org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder; +import org.apache.ignite.internal.visor.igfs.VisorIgfs; +import org.apache.ignite.internal.visor.igfs.VisorIgfsEndpoint; + +import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isIgfsCache; +import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isSystemCache; +import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.COMPUTE_MONITORING_HOLDER_KEY; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.VISOR_TASK_EVTS; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.checkExplicitTaskMonitoring; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.collectEvents; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.log; /** * Job that collects data from node. @@ -225,4 +230,4 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa @Override public String toString() { return S.toString(VisorNodeDataCollectorJob.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/visor/node/VisorNodeDataCollectorJobResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java index 134447c..0c90aa8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.internal.visor.cache.*; -import org.apache.ignite.internal.visor.event.*; -import org.apache.ignite.internal.visor.igfs.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import org.apache.ignite.internal.visor.cache.VisorCache; +import org.apache.ignite.internal.visor.event.VisorGridEvent; +import org.apache.ignite.internal.visor.igfs.VisorIgfs; +import org.apache.ignite.internal.visor.igfs.VisorIgfsEndpoint; /** * Data collector job result. @@ -189,4 +190,4 @@ public class VisorNodeDataCollectorJobResult implements Serializable { public void errorCount(long errorCount) { errCnt = errorCount; } -} +} \ 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/visor/node/VisorNodeDataCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java index 3b2d45c..395cddb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java @@ -17,18 +17,22 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.util.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterGroupEmptyException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.apache.ignite.internal.visor.VisorTaskArgument; +import org.apache.ignite.internal.visor.util.VisorExceptionWrapper; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped; /** * Collects current Grid state mostly topology and metrics. @@ -134,4 +138,4 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData if (jobRes.igfssEx() != null) taskRes.igfssEx().put(nid, new VisorExceptionWrapper(jobRes.igfssEx())); } -} +} \ 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/visor/node/VisorNodeDataCollectorTaskArg.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java index 7be546d..975dd28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskArg.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.visor.node; -import java.io.*; +import java.io.Serializable; /** * Data collector task arguments. @@ -140,4 +140,4 @@ public class VisorNodeDataCollectorTaskArg implements Serializable { public void systemCaches(boolean sysCaches) { this.sysCaches = sysCaches; } -} +} \ 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/visor/node/VisorNodeDataCollectorTaskResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java index 1a4eb02..9ca1232 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java @@ -17,13 +17,18 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.internal.visor.cache.*; -import org.apache.ignite.internal.visor.event.*; -import org.apache.ignite.internal.visor.igfs.*; -import org.apache.ignite.internal.visor.util.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.internal.visor.cache.VisorCache; +import org.apache.ignite.internal.visor.event.VisorGridEvent; +import org.apache.ignite.internal.visor.igfs.VisorIgfs; +import org.apache.ignite.internal.visor.igfs.VisorIgfsEndpoint; +import org.apache.ignite.internal.visor.util.VisorExceptionWrapper; /** * Data collector task result. @@ -169,4 +174,4 @@ public class VisorNodeDataCollectorTaskResult implements Serializable { public Map<UUID, Long> errorCounts() { return errCnts; } -} +} \ 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/visor/node/VisorNodeEventsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java index 3b3d8dd..f219908 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java @@ -17,23 +17,33 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.compute.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.event.*; -import org.apache.ignite.internal.visor.util.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.events.DeploymentEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.events.JobEvent; +import org.apache.ignite.events.TaskEvent; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.apache.ignite.internal.visor.event.VisorGridEvent; +import org.apache.ignite.internal.visor.util.VisorEventMapper; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.events.EventType.EVTS_JOB_EXECUTION; +import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.EVT_MAPPER; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.concat; /** * Task that runs on specified node and returns events data. @@ -320,4 +330,4 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv return S.toString(VisorNodeEventsCollectorJob.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/visor/node/VisorNodeGcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java index 12e186b..42afc73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java @@ -17,15 +17,19 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.cluster.ClusterMetrics; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; /** * Task to run gc on nodes. @@ -95,4 +99,4 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi return S.toString(VisorNodeGcJob.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/visor/node/VisorNodePingTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java index 64c8376..f59ea01 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java @@ -17,15 +17,16 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.List; +import java.util.UUID; +import org.apache.ignite.cluster.ClusterTopologyException; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.lang.GridTuple3; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorOneNodeTask; +import org.jetbrains.annotations.Nullable; /** * Ping other node. @@ -77,4 +78,4 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean return S.toString(VisorNodePingJob.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/visor/node/VisorNodeRestartTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java index 5c54434..bb29371 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeRestartTask.java @@ -17,14 +17,14 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.List; +import org.apache.ignite.Ignition; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.jetbrains.annotations.Nullable; /** * Restarts nodes. @@ -75,4 +75,4 @@ public class VisorNodeRestartTask extends VisorMultiNodeTask<Void, Void, Void> { @Override protected VisorNodesRestartJob job(Void arg) { return new VisorNodesRestartJob(arg, debug); } -} +} \ 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/visor/node/VisorNodeStopTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java index 659dab9..16bf5d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeStopTask.java @@ -17,14 +17,14 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.List; +import org.apache.ignite.Ignition; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.jetbrains.annotations.Nullable; /** * Stops nodes. @@ -75,4 +75,4 @@ public class VisorNodeStopTask extends VisorMultiNodeTask<Void, Void, Void> { return S.toString(VisorNodesStopJob.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/visor/node/VisorNodeSuppressedErrorsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java index 9fc1cc4..1f673ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java @@ -17,16 +17,20 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.util.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.IgniteExceptionRegistry; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.apache.ignite.internal.visor.util.VisorExceptionWrapper; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; /** * Task to collect last errors on nodes. @@ -106,4 +110,4 @@ public class VisorNodeSuppressedErrorsTask extends VisorMultiNodeTask<Map<UUID, return S.toString(VisorNodeSuppressedErrorsJob.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/visor/node/VisorPeerToPeerConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java index 5c4f8fc..622aa6d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java @@ -17,13 +17,12 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; +import java.io.Serializable; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; -import java.io.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray; /** * Data transfer object for node P2P configuration properties. @@ -80,4 +79,4 @@ public class VisorPeerToPeerConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorPeerToPeerConfiguration.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/visor/node/VisorRestConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java index e2ac497..c5ab55a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java @@ -17,15 +17,17 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; - -import static java.lang.System.*; -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.io.Serializable; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; + +import static java.lang.System.getProperty; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_HOST; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.intValue; /** * Create data transfer object for node REST configuration properties. @@ -154,4 +156,4 @@ public class VisorRestConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorRestConfiguration.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/visor/node/VisorSegmentationConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java index ebc8252..84365dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java @@ -17,14 +17,13 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.segmentation.*; -import org.jetbrains.annotations.*; +import java.io.Serializable; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.segmentation.SegmentationPolicy; +import org.jetbrains.annotations.Nullable; -import java.io.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray; /** * Data transfer object for node segmentation configuration properties. @@ -103,4 +102,4 @@ public class VisorSegmentationConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorSegmentationConfiguration.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/visor/node/VisorSpisConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java index 4afb90f..c576426 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java @@ -17,17 +17,20 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.spi.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.spi.IgniteSpi; +import org.apache.ignite.spi.IgniteSpiConfiguration; + +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactObject; /** * Data transfer object for node SPIs configuration properties. @@ -230,4 +233,4 @@ public class VisorSpisConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorSpisConfiguration.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/visor/node/VisorTransactionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java index 773f9dd..419350d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.transactions.*; - -import java.io.*; +import java.io.Serializable; +import org.apache.ignite.configuration.TransactionConfiguration; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.transactions.TransactionConcurrency; +import org.apache.ignite.transactions.TransactionIsolation; /** * Data transfer object for transaction configuration. @@ -113,4 +113,4 @@ public class VisorTransactionConfiguration implements Serializable { @Override public String toString() { return S.toString(VisorTransactionConfiguration.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/visor/query/VisorQueryArg.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java index 5050414..843dfce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.visor.query; -import java.io.*; +import java.io.Serializable; /** * Arguments for {@link VisorQueryTask}. @@ -78,4 +78,4 @@ public class VisorQueryArg implements Serializable { public int pageSize() { return pageSize; } -} +} \ 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/visor/query/VisorQueryCleanupTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java index 5ceb300..c1f06ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java @@ -17,18 +17,24 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.util.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.apache.ignite.internal.visor.VisorTaskArgument; +import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped; /** * Task for cleanup not needed SCAN or SQL queries result futures from node local. @@ -117,4 +123,4 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti return S.toString(VisorQueryCleanupJob.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/visor/query/VisorQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java index a587b89..3d5c58d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java @@ -17,12 +17,12 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.cache.query.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import org.apache.ignite.cache.query.QueryCursor; +import org.apache.ignite.internal.processors.cache.QueryCursorImpl; +import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Wrapper for query cursor. @@ -92,4 +92,4 @@ public class VisorQueryCursor<T> implements Iterator<T>, AutoCloseable { @Override public String toString() { return S.toString(VisorQueryCursor.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/visor/query/VisorQueryField.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java index cd97c7c..3191e56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryField.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Serializable; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Data transfer object for query field type description. @@ -103,4 +102,4 @@ public class VisorQueryField implements Serializable { @Override public String toString() { return S.toString(VisorQueryField.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/visor/query/VisorQueryJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java index bd9fb1e..40c5cc3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java @@ -17,22 +17,31 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.*; -import org.apache.ignite.cache.query.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.util.*; -import org.apache.ignite.lang.*; - -import javax.cache.*; -import java.sql.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import javax.cache.Cache; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.query.ScanQuery; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.internal.processors.cache.GridCacheProcessor; +import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; +import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.util.VisorExceptionWrapper; +import org.apache.ignite.lang.IgniteBiTuple; + +import static org.apache.ignite.internal.visor.query.VisorQueryUtils.RMV_DELAY; +import static org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_COL_NAMES; +import static org.apache.ignite.internal.visor.query.VisorQueryUtils.SCAN_QRY_NAME; +import static org.apache.ignite.internal.visor.query.VisorQueryUtils.SQL_QRY_NAME; +import static org.apache.ignite.internal.visor.query.VisorQueryUtils.fetchScanQueryRows; +import static org.apache.ignite.internal.visor.query.VisorQueryUtils.fetchSqlQueryRows; /** * Job for execute SCAN or SQL query and get first page of results. @@ -175,4 +184,4 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten @Override public String toString() { return S.toString(VisorQueryJob.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/visor/query/VisorQueryNextPageTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java index a3ff089..52a167d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java @@ -17,15 +17,16 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.lang.*; - -import javax.cache.*; -import java.util.*; -import java.util.concurrent.*; +import java.util.List; +import java.util.concurrent.ConcurrentMap; +import javax.cache.Cache; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorOneNodeTask; +import org.apache.ignite.lang.IgniteBiTuple; /** * Task for collecting next page previously executed SQL or SCAN query. @@ -133,4 +134,4 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin return S.toString(VisorQueryNextPageJob.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/visor/query/VisorQueryResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java index 48c26b9..b086f7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResult.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.List; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Result for cache query tasks. @@ -76,4 +75,4 @@ public class VisorQueryResult implements Serializable { @Override public String toString() { return S.toString(VisorQueryResult.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/visor/query/VisorQueryResultEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java index 35f08b3..218cb36 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryResultEx.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.UUID; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Result for cache query tasks. @@ -85,4 +86,4 @@ public class VisorQueryResultEx extends VisorQueryResult { @Override public String toString() { return S.toString(VisorQueryResultEx.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/visor/query/VisorQueryTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java index 98c876a..d996f6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.visor.*; -import org.apache.ignite.internal.visor.util.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.visor.VisorOneNodeTask; +import org.apache.ignite.internal.visor.util.VisorExceptionWrapper; +import org.apache.ignite.lang.IgniteBiTuple; /** * Task for execute SCAN or SQL query and get first page of results. @@ -34,4 +34,4 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, IgniteBiTupl @Override protected VisorQueryJob job(VisorQueryArg arg) { return new VisorQueryJob(arg, debug); } -} +} \ 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/visor/query/VisorQueryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java index be1d15d..e89093f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java @@ -17,12 +17,15 @@ package org.apache.ignite.internal.visor.query; -import org.apache.ignite.internal.util.*; - -import javax.cache.*; -import java.math.*; -import java.net.*; -import java.util.*; +import java.math.BigDecimal; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import javax.cache.Cache; +import org.apache.ignite.internal.util.IgniteUtils; /** * Contains utility methods for Visor query tasks and jobs. @@ -192,4 +195,4 @@ public class VisorQueryUtils { return rows; } -} +} \ 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/visor/util/VisorClusterGroupEmptyException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java index 0cca514..831e520 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorClusterGroupEmptyException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.visor.util; -import org.apache.ignite.cluster.*; +import org.apache.ignite.cluster.ClusterGroupEmptyException; /** * Exception to throw from Visor tasks in case of empty topology. @@ -34,4 +34,4 @@ public class VisorClusterGroupEmptyException extends ClusterGroupEmptyException public VisorClusterGroupEmptyException(String msg) { super(msg); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java index b9ff1aa..7e3ae96 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java @@ -17,13 +17,21 @@ package org.apache.ignite.internal.visor.util; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.visor.event.*; -import org.apache.ignite.lang.*; - -import java.util.*; +import java.util.UUID; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.events.DeploymentEvent; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.events.JobEvent; +import org.apache.ignite.events.TaskEvent; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.visor.event.VisorGridDeploymentEvent; +import org.apache.ignite.internal.visor.event.VisorGridDiscoveryEvent; +import org.apache.ignite.internal.visor.event.VisorGridEvent; +import org.apache.ignite.internal.visor.event.VisorGridJobEvent; +import org.apache.ignite.internal.visor.event.VisorGridTaskEvent; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.IgniteUuid; /** * Mapper from grid event to Visor data transfer object. @@ -86,4 +94,4 @@ public class VisorEventMapper implements IgniteClosure<Event, VisorGridEvent> { return map(evt, evt.type(), evt.id(), evt.name(), evt.node().id(), evt.timestamp(), evt.message(), evt.shortDisplay()); } -} +} \ 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/visor/util/VisorExceptionWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java index d2ae0e1..c47c3c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java @@ -78,4 +78,4 @@ public class VisorExceptionWrapper extends Throwable { @Override public String toString() { return (detailMsg != null) ? (clsName + ": " + detailMsg) : clsName; } -} +} \ 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/visor/util/VisorMimeTypes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java index 0a76f98..1792e04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java @@ -17,11 +17,12 @@ package org.apache.ignite.internal.visor.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Map; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Helper class to get MIME type. @@ -1016,4 +1017,4 @@ public class VisorMimeTypes { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 6636a08..579f50c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -17,37 +17,70 @@ package org.apache.ignite.internal.visor.util; -import org.apache.ignite.*; -import org.apache.ignite.cache.eviction.*; -import org.apache.ignite.cache.eviction.fifo.*; -import org.apache.ignite.cache.eviction.lru.*; -import org.apache.ignite.cache.eviction.random.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.processors.igfs.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.event.*; -import org.apache.ignite.internal.visor.file.*; -import org.apache.ignite.internal.visor.log.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.net.*; -import java.nio.*; -import java.nio.channels.*; -import java.nio.charset.*; -import java.nio.file.*; -import java.text.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.zip.*; - -import static java.lang.System.*; -import static org.apache.ignite.configuration.FileSystemConfiguration.*; -import static org.apache.ignite.events.EventType.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.net.InetAddress; +import java.net.URL; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.file.Path; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cache.eviction.EvictionPolicy; +import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicyMBean; +import org.apache.ignite.cache.eviction.lru.LruEvictionPolicyMBean; +import org.apache.ignite.cache.eviction.random.RandomEvictionPolicyMBean; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.processors.igfs.IgfsEx; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.visor.event.VisorGridEvent; +import org.apache.ignite.internal.visor.event.VisorGridEventsLost; +import org.apache.ignite.internal.visor.file.VisorFileBlock; +import org.apache.ignite.internal.visor.log.VisorLogFile; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; + +import static java.lang.System.getProperty; +import static org.apache.ignite.configuration.FileSystemConfiguration.DFLT_IGFS_LOG_DIR; +import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOY_FAILED; +import static org.apache.ignite.events.EventType.EVT_JOB_CANCELLED; +import static org.apache.ignite.events.EventType.EVT_JOB_FAILED; +import static org.apache.ignite.events.EventType.EVT_JOB_FAILED_OVER; +import static org.apache.ignite.events.EventType.EVT_JOB_FINISHED; +import static org.apache.ignite.events.EventType.EVT_JOB_REJECTED; +import static org.apache.ignite.events.EventType.EVT_JOB_STARTED; +import static org.apache.ignite.events.EventType.EVT_JOB_TIMEDOUT; +import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOY_FAILED; +import static org.apache.ignite.events.EventType.EVT_TASK_FAILED; +import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED; +import static org.apache.ignite.events.EventType.EVT_TASK_STARTED; +import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT; /** * Contains utility methods for Visor tasks and jobs. @@ -871,4 +904,4 @@ public class VisorTaskUtils { return bos.toByteArray(); } -} +} \ 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/lang/IgniteAsyncSupport.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java index be05a38..50a8700 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java @@ -39,4 +39,4 @@ public interface IgniteAsyncSupport { * @return Future for previous asynchronous operation. */ public <R> IgniteFuture<R> future(); -} +} \ 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/lang/IgniteAsyncSupported.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java index e70c07a..1bb7162 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupported.java @@ -17,7 +17,11 @@ package org.apache.ignite.lang; -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; /** * Annotation to indicate that method can be executed asynchronously if async mode is enabled. @@ -34,4 +38,4 @@ import java.lang.annotation.*; @Target(ElementType.METHOD) public @interface IgniteAsyncSupported { -} +} \ 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/lang/IgniteBiClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java index 0920805..0afd597 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiClosure.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Defines generic closure with two parameters. Bi-Closure is a simple executable which @@ -36,4 +36,4 @@ public interface IgniteBiClosure<E1, E2, R> extends Serializable { * @return Closure return value. */ public abstract R apply(E1 e1, E2 e2); -} +} \ 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/lang/IgniteBiInClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java index 15f44da..0d99c73 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiInClosure.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Closure with two in-parameters and void return type. @@ -33,4 +33,4 @@ public interface IgniteBiInClosure<E1, E2> extends Serializable { * @param e2 Second parameter. */ public void apply(E1 e1, E2 e2); -} +} \ 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/lang/IgniteBiPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java index 1e57a9b..4aeb451 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiPredicate.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Defines a predicate which accepts two parameters and returns {@code true} or {@code false}. @@ -34,4 +34,4 @@ public interface IgniteBiPredicate<E1, E2> extends Serializable { * @return Return value. */ public boolean apply(E1 e1, E2 e2); -} +} \ 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/lang/IgniteBiTuple.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java index d1b75a4..6098007 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java @@ -17,13 +17,21 @@ package org.apache.ignite.lang; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.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.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +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.S; +import org.jetbrains.annotations.Nullable; /** * Convenience class representing mutable tuple of two values. @@ -293,4 +301,4 @@ public class IgniteBiTuple<V1, V2> implements Map<V1, V2>, Map.Entry<V1, V2>, @Override public String toString() { return S.toString(IgniteBiTuple.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/lang/IgniteCallable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java index 2e80c23..d94da21 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteCallable.java @@ -17,8 +17,8 @@ package org.apache.ignite.lang; -import java.io.*; -import java.util.concurrent.*; +import java.io.Serializable; +import java.util.concurrent.Callable; /** * Grid-aware adapter for {@link Callable} implementations. It adds {@link Serializable} interface @@ -26,4 +26,4 @@ import java.util.concurrent.*; * like in {@link org.apache.ignite.IgniteCompute#call(IgniteCallable)} method. */ public interface IgniteCallable<V> extends Callable<V>, Serializable { -} +} \ 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/lang/IgniteClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java index 70570c9..4bc1a4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Defines generic closure with one parameter. Closure is a simple executable which accepts a parameter and @@ -37,4 +37,4 @@ public interface IgniteClosure<E, R> extends Serializable { * @return Closure return value. */ public R apply(E e); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java index cb12a76..df1ab88 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java @@ -17,9 +17,9 @@ package org.apache.ignite.lang; -import org.apache.ignite.*; - -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteInterruptedException; /** * Future with simplified exception handling, functional programming support @@ -124,4 +124,4 @@ public interface IgniteFuture<V> { * @return Chained future that finishes after this future completes and done callback is called. */ public <T> IgniteFuture<T> chain(IgniteClosure<? super IgniteFuture<V>, T> doneCb); -} +} \ 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/lang/IgniteFutureCancelledException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java index f0c01a2..2c4b8a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureCancelledException.java @@ -17,8 +17,8 @@ package org.apache.ignite.lang; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteException; +import org.jetbrains.annotations.Nullable; /** * Future computation cannot be retrieved because it was cancelled. @@ -55,4 +55,4 @@ public class IgniteFutureCancelledException extends IgniteException { public IgniteFutureCancelledException(String msg, @Nullable Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java index c2f8945..4e94f96 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFutureTimeoutException.java @@ -17,8 +17,8 @@ package org.apache.ignite.lang; -import org.apache.ignite.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.IgniteException; +import org.jetbrains.annotations.Nullable; /** * Future computation completion is timed out. @@ -55,4 +55,4 @@ public class IgniteFutureTimeoutException extends IgniteException { public IgniteFutureTimeoutException(String msg, @Nullable Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java index f0faaef..81630f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteInClosure.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Closure with one in-parameter and void return type. @@ -31,4 +31,4 @@ public interface IgniteInClosure<E> extends Serializable { * @param e Closure argument. */ public void apply(E e); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java index 1f92ed4..1c7803b 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java @@ -17,7 +17,11 @@ package org.apache.ignite.lang; -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; /** * This annotations should be used to mark any type that should not be @@ -38,4 +42,4 @@ import java.lang.annotation.*; @Target({ElementType.TYPE}) public @interface IgniteNotPeerDeployable { // 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/lang/IgniteOutClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java index eb9eddb..3e514fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteOutClosure.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Closure that does not take any parameters and returns a value. @@ -31,4 +31,4 @@ public interface IgniteOutClosure<T> extends Serializable { * @return Return value. */ public T apply(); -} +} \ 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/lang/IgnitePredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java index 367a69d..92bc121 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Defines a predicate which accepts a parameter and returns {@code true} or {@code false}. @@ -32,4 +32,4 @@ public interface IgnitePredicate<E> extends Serializable { * @return Return value. */ public boolean apply(E e); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java index afdf06d..9826b6d 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java @@ -17,14 +17,17 @@ package org.apache.ignite.lang; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.regex.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.NotNull; /** * Represents node version. @@ -292,4 +295,4 @@ public class IgniteProductVersion implements Comparable<IgniteProductVersion>, E else throw new IllegalStateException("Failed to parse version: " + verStr); } -} +} \ 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/lang/IgniteReducer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java index 7055a9d..27145bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteReducer.java @@ -17,10 +17,9 @@ package org.apache.ignite.lang; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Collection; +import org.jetbrains.annotations.Nullable; /** * Defines generic reducer that collects multiple values and reduces them into one. @@ -48,4 +47,4 @@ public interface IgniteReducer<E, R> extends Serializable { * @return Reduced value. */ public R reduce(); -} +} \ 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/lang/IgniteRunnable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java index 5cae9e6..38d2364 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java @@ -17,7 +17,7 @@ package org.apache.ignite.lang; -import java.io.*; +import java.io.Serializable; /** * Grid-aware adapter for {@link Runnable} implementations. It adds {@link Serializable} interface @@ -26,4 +26,4 @@ import java.io.*; */ public interface IgniteRunnable extends Runnable, Serializable { // 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/lang/IgniteUuid.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java index 57e2c0d..5c6bb9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java @@ -17,13 +17,17 @@ package org.apache.ignite.lang; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collections; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.internal.util.lang.GridIterator; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.U; /** * This is a faster performing version of {@link UUID}. On basic tests this version is at least @@ -212,4 +216,4 @@ public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<Ignite @Override public String toString() { return shortString() + '-' + gid.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/lifecycle/LifecycleAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java index 364ddea..45af9d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java @@ -17,7 +17,7 @@ package org.apache.ignite.lifecycle; -import org.apache.ignite.*; +import org.apache.ignite.IgniteException; /** * All components provided in Ignite configuration can implement this interface. @@ -38,4 +38,4 @@ public interface LifecycleAware { * @throws IgniteException If failed. */ public void stop() throws IgniteException; -} +} \ 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/lifecycle/LifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java index 4132500..80688ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java @@ -17,7 +17,7 @@ package org.apache.ignite.lifecycle; -import org.apache.ignite.*; +import org.apache.ignite.IgniteException; /** * A bean that reacts to node lifecycle events defined in {@link LifecycleEventType}. @@ -100,4 +100,4 @@ public interface LifecycleBean { * @throws IgniteException Thrown in case of any errors. */ public void onLifecycleEvent(LifecycleEventType evt) throws IgniteException; -} +} \ No newline at end of file
