http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index f241bcc..8fb7e5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -17,37 +17,86 @@ package org.apache.ignite.internal.processors.task; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.events.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.compute.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.processors.closure.*; -import org.apache.ignite.internal.processors.timeout.*; -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.marshaller.*; -import org.apache.ignite.resources.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; -import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.cluster.ClusterTopologyException; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAfterSend; +import org.apache.ignite.compute.ComputeJobBeforeFailover; +import org.apache.ignite.compute.ComputeJobFailoverException; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeJobSibling; +import org.apache.ignite.compute.ComputeLoadBalancer; +import org.apache.ignite.compute.ComputeTask; +import org.apache.ignite.compute.ComputeTaskContinuousMapper; +import org.apache.ignite.compute.ComputeTaskNoResultCache; +import org.apache.ignite.compute.ComputeTaskSpis; +import org.apache.ignite.compute.ComputeUserUndeclaredException; +import org.apache.ignite.events.Event; +import org.apache.ignite.events.JobEvent; +import org.apache.ignite.events.TaskEvent; +import org.apache.ignite.igfs.IgfsOutOfSpaceException; +import org.apache.ignite.internal.ComputeTaskInternalFuture; +import org.apache.ignite.internal.GridInternalException; +import org.apache.ignite.internal.GridJobCancelRequest; +import org.apache.ignite.internal.GridJobExecuteRequest; +import org.apache.ignite.internal.GridJobExecuteResponse; +import org.apache.ignite.internal.GridJobResultImpl; +import org.apache.ignite.internal.GridJobSiblingImpl; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.GridTaskSessionImpl; +import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException; +import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException; +import org.apache.ignite.internal.managers.deployment.GridDeployment; +import org.apache.ignite.internal.processors.closure.AffinityTask; +import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; +import org.apache.ignite.internal.util.typedef.CO; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.worker.GridWorker; +import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.resources.TaskContinuousMapperResource; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentLinkedDeque8; + +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; +import static org.apache.ignite.events.EventType.EVT_JOB_FAILED_OVER; +import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED; +import static org.apache.ignite.events.EventType.EVT_JOB_RESULTED; +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_REDUCED; +import static org.apache.ignite.events.EventType.EVT_TASK_STARTED; +import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT; +import static org.apache.ignite.internal.GridTopic.TOPIC_JOB; +import static org.apache.ignite.internal.GridTopic.TOPIC_JOB_CANCEL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.MANAGEMENT_POOL; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL; +import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER; /** * Grid task worker. Handles full task life cycle. @@ -1418,4 +1467,4 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { return S.toString(GridTaskWorker.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/timeout/GridSpiTimeoutObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java index a0fd9b4..1f9fc5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridSpiTimeoutObject.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.processors.timeout; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.spi.*; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.spi.IgniteSpiTimeoutObject; /** * Wrapper for {@link IgniteSpiTimeoutObject}. @@ -70,4 +70,4 @@ public class GridSpiTimeoutObject implements GridTimeoutObject { @Override public final String toString() { return S.toString(GridSpiTimeoutObject.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/timeout/GridTimeoutObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java index 1faaea8..a481cd9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObject.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.timeout; -import org.apache.ignite.lang.*; +import org.apache.ignite.lang.IgniteUuid; /** * All objects that can timeout should implement this interface. @@ -37,4 +37,4 @@ public interface GridTimeoutObject { * Timeout callback. */ public void onTimeout(); -} +} \ 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/timeout/GridTimeoutObjectAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java index 29e7d08..01e0642 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutObjectAdapter.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.timeout; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; /** * Default implementation for {@link GridTimeoutObject}. @@ -58,4 +58,4 @@ public abstract class GridTimeoutObjectAdapter implements GridTimeoutObject { @Override public long endTime() { return endTime; } -} +} \ 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/timeout/GridTimeoutProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java index e4f370c..0bbf9c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java @@ -17,19 +17,20 @@ package org.apache.ignite.internal.processors.timeout; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.util.worker.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.thread.*; - -import java.io.*; -import java.util.*; +import java.io.Closeable; +import java.util.Comparator; +import java.util.Iterator; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.util.GridConcurrentSkipListSet; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.worker.GridWorker; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.thread.IgniteThread; /** * Detects timeout events and processes them. @@ -272,4 +273,4 @@ public class GridTimeoutProcessor extends GridProcessorAdapter { return S.toString(CancelableTask.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/tck/TCKMBeanServerBuilder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java index 1e9aa43..29ab240 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/tck/TCKMBeanServerBuilder.java @@ -17,9 +17,15 @@ package org.apache.ignite.internal.tck; -import com.sun.jmx.mbeanserver.*; - -import javax.management.*; +import com.sun.jmx.mbeanserver.JmxMBeanServer; +import javax.management.ListenerNotFoundException; +import javax.management.MBeanNotificationInfo; +import javax.management.MBeanServer; +import javax.management.MBeanServerBuilder; +import javax.management.MBeanServerDelegate; +import javax.management.Notification; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; /** * This class is needed for JCache TCK tests. @@ -115,4 +121,4 @@ public class TCKMBeanServerBuilder extends MBeanServerBuilder { return System.getProperty("org.jsr107.tck.management.agentId"); } } -} +} \ 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/transactions/IgniteTxHeuristicCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java index d624381..978ad17 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxHeuristicCheckedException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.transactions; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Exception thrown whenever grid transaction enters an unknown state. @@ -48,4 +48,4 @@ public class IgniteTxHeuristicCheckedException extends IgniteCheckedException { public IgniteTxHeuristicCheckedException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java index 34b9eb3..b2b0e2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxOptimisticCheckedException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.transactions; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Exception thrown whenever grid transactions fail optimistically. @@ -44,4 +44,4 @@ public class IgniteTxOptimisticCheckedException extends IgniteCheckedException { public IgniteTxOptimisticCheckedException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java index f8ee265..ac4eece 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.transactions; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Exception thrown whenever grid transactions has been automatically rolled back. @@ -53,4 +53,4 @@ public class IgniteTxRollbackCheckedException extends IgniteCheckedException { public IgniteTxRollbackCheckedException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java index 451fb9e..9f64fa7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.transactions; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Exception thrown whenever grid transactions time out. @@ -44,4 +44,4 @@ public class IgniteTxTimeoutCheckedException extends IgniteCheckedException { public IgniteTxTimeoutCheckedException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java index 14509e8..7e9e448 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java @@ -17,15 +17,24 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.cache.*; -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.jetbrains.annotations.*; - -import java.util.*; +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; +import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter; +import org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate; +import org.apache.ignite.internal.processors.cache.GridCacheContext; +import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; +import org.apache.ignite.internal.util.lang.GridFunc; +import org.apache.ignite.internal.util.lang.GridNodePredicate; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.CU; +import org.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; /** * Internal utility class that contains not peer-deployable @@ -512,4 +521,4 @@ public class F0 { return F.asMap(key, val); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java index a50df1d..3cab510 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java @@ -17,14 +17,13 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.lang.annotation.*; -import java.util.concurrent.*; +import java.lang.annotation.Annotation; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.lang.GridTuple; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * Caches class loaders for classes. @@ -81,4 +80,4 @@ public final class GridAnnotationsCache { private GridAnnotationsCache() { // No-op. } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java index 8289f90..8be3610 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.Collection; +import org.jetbrains.annotations.Nullable; /** * This class encapsulates argument check (null and range) for public facing APIs. Unlike asserts @@ -162,4 +161,4 @@ public class GridArgumentCheck { throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name + NOT_NULL_OR_EMPTY_SUFFIX); } } -} +} \ 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/util/GridAtomicInitializer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java index 3c42009..e25dc88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Executes initialization operation once. @@ -110,4 +110,4 @@ public class GridAtomicInitializer<T> { @Override public String toString() { return S.toString(GridAtomicInitializer.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/util/GridAtomicInteger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java index 6f5d12d..d732767 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInteger.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.lang.*; - -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.lang.IgnitePredicate; /** * Extended version of {@link AtomicInteger}. @@ -246,4 +245,4 @@ public class GridAtomicInteger extends AtomicInteger { return false; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java index a502927..3b1a175 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicLong.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.lang.*; - -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.lang.IgnitePredicate; /** * Extended version of {@link AtomicLong}. @@ -246,4 +245,4 @@ public class GridAtomicLong extends AtomicLong { return false; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java index 178b04a..04d1a85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashMap.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jsr166.*; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jsr166.ConcurrentLinkedHashMap; -import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q; /** * Concurrent map with an upper bound. Once map reaches its maximum capacity, @@ -121,4 +121,4 @@ public class GridBoundedConcurrentLinkedHashMap<K, V> extends ConcurrentLinkedHa S.toString(GridBoundedConcurrentLinkedHashMap.class, this) : S.toString(GridBoundedConcurrentLinkedHashMap.class, this, "entrySet", keySet()); } -} +} \ 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/util/GridBoundedConcurrentLinkedHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java index a610e89..a06f2ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentLinkedHashSet.java @@ -17,14 +17,16 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentLinkedHashMap; -import java.util.concurrent.*; - -import static org.jsr166.ConcurrentLinkedHashMap.*; -import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*; +import static org.jsr166.ConcurrentLinkedHashMap.DFLT_CONCUR_LVL; +import static org.jsr166.ConcurrentLinkedHashMap.DFLT_INIT_CAP; +import static org.jsr166.ConcurrentLinkedHashMap.DFLT_LOAD_FACTOR; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q; /** * Concurrent set with an upper bound. Once set reaches its maximum capacity, @@ -159,4 +161,4 @@ public class GridBoundedConcurrentLinkedHashSet<E> extends GridSetWrapper<E> { S.toString(GridBoundedConcurrentLinkedHashSet.class, this) : S.toString(GridBoundedConcurrentLinkedHashSet.class, this, "elements", map().keySet()); } -} +} \ 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/util/GridBoundedConcurrentOrderedMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java index 5d92fa4..b091652 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedMap.java @@ -17,13 +17,15 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.util.Comparator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.SortedMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.lang.IgniteBiInClosure; +import org.jetbrains.annotations.Nullable; /** * Concurrent ordered map that automatically manages its maximum size. @@ -249,4 +251,4 @@ public class GridBoundedConcurrentOrderedMap<K, V> extends ConcurrentSkipListMap return rmvd; } -} +} \ 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/util/GridBoundedConcurrentOrderedSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java index 1578040..a1ebd58 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedConcurrentOrderedSet.java @@ -17,8 +17,11 @@ package org.apache.ignite.internal.util; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.util.Collection; +import java.util.Comparator; +import java.util.NoSuchElementException; +import java.util.SortedSet; +import java.util.concurrent.atomic.AtomicInteger; /** * Concurrent ordered set that automatically manages its maximum size. @@ -176,4 +179,4 @@ public class GridBoundedConcurrentOrderedSet<E> extends GridConcurrentSkipListSe return false; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java index a3552c4..ee6e9f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashMap.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.util; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; /** * Generic map with an upper bound. Once map reaches its maximum capacity, @@ -126,4 +127,4 @@ public class GridBoundedLinkedHashMap<K, V> extends LinkedHashMap<K, V> { return m; } -} +} \ 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/util/GridBoundedLinkedHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java index 79d763f..25bc2f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java @@ -17,7 +17,10 @@ package org.apache.ignite.internal.util; -import java.util.*; +import java.util.Collection; +import java.util.ConcurrentModificationException; +import java.util.HashMap; +import java.util.Iterator; /** * Hash table and linked list implementation of the {@code Set} interface, @@ -204,4 +207,4 @@ public class GridBoundedLinkedHashSet<E> extends GridSerializableSet<E> implemen return newSet; } -} +} \ 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/util/GridBusyLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java index a1de3d5..c23e1de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.tostring.*; - -import java.util.concurrent.locks.*; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; /** * Synchronization aid to track "busy" state of a subsystem that owns it. @@ -80,4 +79,4 @@ public class GridBusyLock { public void unblock() { lock.writeLock().unlock(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index 83939c0..5c236d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java @@ -17,14 +17,22 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.io.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.apache.ignite.internal.util.io.GridUnsafeDataInput; +import org.apache.ignite.internal.util.io.GridUnsafeDataOutput; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Re-sizable array implementation of the byte list (eliminating auto-boxing of primitive byte type). @@ -478,4 +486,4 @@ public class GridByteArrayList implements Message, Externalizable { @Override public String toString() { return S.toString(GridByteArrayList.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/util/GridCircularBuffer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java index 46c56cd..26c87ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCircularBuffer.java @@ -17,16 +17,17 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.atomic.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.lang.IgniteInClosureX; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteInClosure; +import org.jetbrains.annotations.Nullable; /** * This class implements a circular buffer for efficient data exchange. @@ -227,4 +228,4 @@ public class GridCircularBuffer<T> { return S.toString(Item.class, this, "hash=" + System.identityHashCode(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/util/GridClassLoaderCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java index 162c3f9..34bf69b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jsr166.ConcurrentHashMap8; /** * Caches class loaders for classes. @@ -128,4 +127,4 @@ public final class GridClassLoaderCache { private GridClassLoaderCache() { // No-op. } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java index 1c7cbd9..09f6c6d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClientByteUtils.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal.util; -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.UUID; /** * Primitive to byte array and backward conversions. @@ -234,4 +235,4 @@ public abstract class GridClientByteUtils { 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/util/GridCloseableIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java index c51238b..4563015 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapter.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.lang.*; - -import java.util.*; +import java.util.NoSuchElementException; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; +import org.apache.ignite.internal.util.lang.GridIteratorAdapter; /** * Convenient adapter for closeable iterator. @@ -107,4 +107,4 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte if (closed) throw new NoSuchElementException("Iterator has been closed."); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java index 0a73519..3e67fe8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCloseableIteratorAdapterEx.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.lang.*; - -import java.util.*; -import java.util.concurrent.atomic.*; +import java.util.NoSuchElementException; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; +import org.apache.ignite.internal.util.lang.GridIteratorAdapter; /** * Adapter for closeable iterator that can be safely closed concurrently. @@ -124,4 +124,4 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap @Override public boolean isClosed() { return closed.get(); } -} +} \ 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/util/GridCollections.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java index 85423b2..d3c47a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCollections.java @@ -17,9 +17,15 @@ package org.apache.ignite.internal.util; -import java.io.*; -import java.util.*; -import java.util.concurrent.locks.*; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.locks.ReentrantLock; /** * Provides locked wrappers around given maps and collections. Since {@link ReentrantLock} @@ -641,4 +647,4 @@ public final class GridCollections { } } } -} +} \ 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/util/GridConcurrentFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java index b71846a..6e0e876 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.jsr166.*; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteSystemProperties; +import org.jsr166.ConcurrentHashMap8; -import java.util.concurrent.*; - -import static org.apache.ignite.IgniteSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_MAP_CONCURRENCY_LEVEL; /** * Concurrent map factory. @@ -47,4 +46,4 @@ public class GridConcurrentFactory { return new ConcurrentHashMap8<>(16 * CONCURRENCY_LEVEL, 0.75f, CONCURRENCY_LEVEL); } -} +} \ 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/util/GridConcurrentHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java index 532b06e..955b7b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; +import java.util.Collection; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * Concurrent set implementation. @@ -116,4 +115,4 @@ public class GridConcurrentHashSet<E> extends GridSetWrapper<E> { @Override public String toString() { return S.toString(GridConcurrentHashSet.class, this, "elements", map().keySet()); } -} +} \ 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/util/GridConcurrentLinkedHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java index 671dc08..5a53b4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentLinkedHashSet.java @@ -17,14 +17,14 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentLinkedHashMap; -import java.util.*; -import java.util.concurrent.*; - -import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.*; +import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q; /** * Concurrent linked set implementation. @@ -128,4 +128,4 @@ public class GridConcurrentLinkedHashSet<E> extends GridSetWrapper<E> { S.toString(GridConcurrentLinkedHashSet.class, this) : S.toString(GridConcurrentLinkedHashSet.class, this, "elements", map().keySet()); } -} +} \ 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/util/GridConcurrentPhantomHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java index 804a2e5..ab8bb03 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java @@ -17,14 +17,21 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.lang.ref.*; -import java.util.*; +import java.lang.ref.PhantomReference; +import java.lang.ref.Reference; +import java.lang.ref.ReferenceQueue; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.NoSuchElementException; +import java.util.Set; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +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.apache.ignite.lang.IgniteClosure; +import org.jetbrains.annotations.Nullable; /** * Concurrent phantom hash set implementation. @@ -400,4 +407,4 @@ public class GridConcurrentPhantomHashSet<E> implements Set<E> { @Override public String toString() { return S.toString(GridConcurrentPhantomHashSet.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/util/GridConcurrentSkipListSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java index 51b5acd..a7a0ddc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentSkipListSet.java @@ -17,12 +17,20 @@ package org.apache.ignite.internal.util; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; - -import static java.lang.Boolean.*; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.SortedSet; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.ConcurrentSkipListSet; +import org.jetbrains.annotations.Nullable; + +import static java.lang.Boolean.TRUE; /** * This class provided the same logic as {@link ConcurrentSkipListSet}. It adds @@ -299,4 +307,4 @@ public class GridConcurrentSkipListSet<E> extends GridSerializableSet<E> impleme @Override public NavigableSet<E> descendingSet() { return new GridConcurrentSkipListSet<>(m.descendingMap()); } -} +} \ 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/util/GridConcurrentWeakHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java index cb0109d..bba392c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java @@ -17,14 +17,21 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.lang.ref.*; -import java.util.*; +import java.lang.ref.Reference; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.NoSuchElementException; +import java.util.Set; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +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.apache.ignite.lang.IgniteClosure; +import org.jetbrains.annotations.Nullable; /** * Concurrent weak hash set implementation. @@ -400,4 +407,4 @@ public class GridConcurrentWeakHashSet<E> implements Set<E> { @Override public String toString() { return S.toString(GridConcurrentWeakHashSet.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/util/GridConfigurationFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java index 37d8756..94acea3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java @@ -17,12 +17,17 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import org.apache.ignite.internal.util.lang.GridTuple3; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Finds configuration files located in {@code IGNITE_HOME} folder @@ -151,4 +156,4 @@ public final class GridConfigurationFinder { return paths; } -} +} \ 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/util/GridConsistentHash.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java index 33ecacc..02f27c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConsistentHash.java @@ -17,14 +17,28 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.locks.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Random; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ignite.internal.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.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; /** * Controls key to node affinity using consistent hash algorithm. This class is thread-safe @@ -669,4 +683,4 @@ public class GridConsistentHash<N> { @Override public String toString() { return S.toString(GridConsistentHash.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/util/GridDebug.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java index 98c8664..ec3323e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java @@ -17,18 +17,25 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.lang.management.*; -import java.nio.charset.*; -import java.text.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.management.ManagementFactory; +import java.nio.charset.Charset; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; /** * Utility class for debugging. @@ -330,4 +337,4 @@ public class GridDebug { return formatEntry(ts, threadName, threadId, data); } } -} +} \ 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/util/GridEmptyCloseableIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java index e8df22e..a0e5f82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyCloseableIterator.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.lang.GridCloseableIterator; /** * Empty closeable iterator. @@ -39,4 +39,4 @@ public class GridEmptyCloseableIterator<T> extends GridEmptyIterator<T> implemen @Override public boolean isClosed() { return closed; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java index f8c1c95..f49c8a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEmptyIterator.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.NoSuchElementException; +import org.apache.ignite.internal.util.lang.GridIteratorAdapter; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Empty iterator. @@ -48,4 +47,4 @@ public class GridEmptyIterator<T> extends GridIteratorAdapter<T> { @Override public String toString() { return S.toString(GridEmptyIterator.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/util/GridEnumCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java index 31b3eaa..f84c1e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridEnumCache.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util; -import org.jsr166.*; - -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentMap; +import org.jsr166.ConcurrentHashMap8; /** * Cache for enum constants. @@ -54,4 +53,4 @@ public class GridEnumCache { public static void clear() { ENUM_CACHE.clear(); } -} +} \ 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/util/GridExecutionStatistics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java index 665ac93..a23fe28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java @@ -17,14 +17,15 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jsr166.ConcurrentHashMap8; /** * Accumulates execution statistics for named pieces of code. @@ -102,4 +103,4 @@ public class GridExecutionStatistics { ", average duration=" + avgDuration + ", total duration=" + totalDuration + "]"); } } -} +} \ 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/util/GridFixedSizeInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java index e8e8ea7..13982c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridFixedSizeInputStream.java @@ -17,7 +17,8 @@ package org.apache.ignite.internal.util; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; /** * Input stream wrapper which allows to read exactly expected number of bytes. @@ -82,4 +83,4 @@ public class GridFixedSizeInputStream extends InputStream { 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/util/GridHandleTable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java index 05a089c..319a633 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java @@ -17,9 +17,8 @@ package org.apache.ignite.internal.util; -import sun.misc.*; - -import java.util.*; +import java.util.Arrays; +import sun.misc.Unsafe; /** * Lightweight identity hash table which maps objects to integer handles, @@ -195,4 +194,4 @@ public class GridHandleTable { private int hash(Object obj) { return System.identityHashCode(obj) & 0x7FFFFFFF; } -} +} \ 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/util/GridJavaProcess.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java index 4946eb2..92c20fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java @@ -17,14 +17,21 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.lang.GridAbsClosure; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteInClosure; +import org.jetbrains.annotations.Nullable; /** * Wrapper class around the {@link Process} suited to run any Java class as separate java process. @@ -300,4 +307,4 @@ public final class GridJavaProcess { U.closeQuiet(proc.getOutputStream()); } } -} +} \ 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/util/GridKeyLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java index f851766..09a7db4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * This is an utility class for 'splitting' locking of some resources. @@ -151,4 +150,4 @@ public class GridKeyLock { notifyAll(); } } -} +} \ 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/util/GridLeanIdentitySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java index a4e18c8..fb6ba67 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanIdentitySet.java @@ -17,7 +17,10 @@ package org.apache.ignite.internal.util; -import java.util.*; +import java.util.AbstractSet; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.Map; /** * @@ -114,4 +117,4 @@ public class GridLeanIdentitySet<T> extends AbstractSet<T> { @Override public int size() { return 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/util/GridLeanMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java index 74631a4..c0f7c5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java @@ -17,12 +17,17 @@ package 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 java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.jetbrains.annotations.Nullable; /** * Lean map implementation that keeps up to five entries in its fields. @@ -1263,4 +1268,4 @@ public class GridLeanMap<K, V> extends GridSerializableMap<K, V> implements Clon return false; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java index 20c92ce..e2283e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; +import java.util.Collection; +import java.util.Map; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Lean set implementation. Internally this set is based on {@link GridLeanMap}. @@ -80,4 +80,4 @@ public class GridLeanSet<E> extends GridSetWrapper<E> implements Cloneable { @Override public String toString() { return S.toString(GridLeanSet.class, this, "elements", map.keySet()); } -} +} \ 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/util/GridListSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java index 9744ef1..6226bd2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridListSet.java @@ -17,11 +17,18 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.Set; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * Implementation of {@link Set} based on internal list rather than hash table. @@ -526,4 +533,4 @@ public class GridListSet<V> extends GridSerializableSet<V> implements Cloneable } }; } -} +} \ 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/util/GridLogThrottle.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java index 607b17b..745619a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java @@ -17,14 +17,13 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * Grid log throttle. @@ -253,4 +252,4 @@ public class GridLogThrottle { */ public abstract void doLog(IgniteLogger log, String longMsg, String shortMsg, Throwable e, boolean quiet); } -} +} \ 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/util/GridLongList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java index 1711f03..9ef6abb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java @@ -17,14 +17,22 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.NoSuchElementException; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.SB; +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; /** * Minimal list API to work with primitive longs. This list exists @@ -571,4 +579,4 @@ public class GridLongList implements Message, Externalizable { @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/util/GridMutex.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java index e964d60..800f83c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMutex.java @@ -17,9 +17,11 @@ package org.apache.ignite.internal.util; -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.S; /** * Serializable mutex. @@ -53,4 +55,4 @@ public class GridMutex implements Externalizable, Cloneable { @Override public String toString() { return S.toString(GridMutex.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/util/GridQueue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java index 2a16ac3..665e7b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridQueue.java @@ -17,11 +17,15 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.AbstractCollection; +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Queue; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * Queue which supports addition at tail and removing at head. This @@ -345,4 +349,4 @@ public class GridQueue<E> extends AbstractCollection<E> implements Queue<E> { ", actual=" + modCnt + ']'); } } -} +} \ 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/util/GridRandom.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java index fde7f85..9622853 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridRandom.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.util; -import java.util.*; -import java.util.concurrent.*; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; /** * Random to be used from a single thread. Compatible with {@link Random} but faster. @@ -54,4 +54,4 @@ public class GridRandom extends Random { rnd = (rnd * 0x5DEECE66DL + 0xBL) & ((1L << 48) - 1); return (int)(rnd >>> (48 - bits)); } -} +} \ 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/util/GridReflectionCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java index c5ded18..cd069f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java @@ -17,16 +17,23 @@ package org.apache.ignite.internal.util; -import org.apache.ignite.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.IgniteSystemProperties.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.lang.IgnitePredicate; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_REFLECTION_CACHE_SIZE; /** * Reflection field and method cache for classes. @@ -247,4 +254,4 @@ public class GridReflectionCache implements Externalizable { fp = (IgnitePredicate<Field>)in.readObject(); mp = (IgnitePredicate<Method>)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/util/GridSerializableCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java index 2577605..2b8315f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableCollection.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.util; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.AbstractCollection; /** * Makes {@link AbstractCollection} as {@link Serializable} and is @@ -30,4 +30,4 @@ public abstract class GridSerializableCollection<E> extends AbstractCollection<E private static final long serialVersionUID = 0L; // No-op. -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java index 5b32293..2a1135a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterable.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util; -import java.io.*; +import java.io.Serializable; /** * Makes {@link Iterable} as {@link Serializable} and is @@ -25,4 +25,4 @@ import java.io.*; */ public interface GridSerializableIterable<E> extends Iterable<E>, 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/internal/util/GridSerializableIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java index f2d07ac..79d0c04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSerializableIterator.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.util; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Iterator; /** * Makes {@link Iterator} as {@link Serializable} and is @@ -26,4 +26,4 @@ import java.util.*; */ public interface GridSerializableIterator<E> extends Iterator<E>, Serializable { // No-op. -} +} \ No newline at end of file
