main - imports fixed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8379e92 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8379e92 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8379e92 Branch: refs/heads/ignite-1093-2 Commit: e8379e9254354bd01dfef9f872ad13b5a5bcdffe Parents: 34f98a6 Author: S.Vladykin <[email protected]> Authored: Mon Aug 31 17:28:07 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Mon Aug 31 17:28:07 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 274 ++++++++++++++----- .../platform/PlatformNoopProcessor.java | 9 +- .../processors/platform/PlatformProcessor.java | 7 +- .../GridDiscoveryManagerAttributesSelfTest.java | 29 +- 4 files changed, 224 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 4fa3564..d9fef86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -17,81 +17,205 @@ package org.apache.ignite.internal; -import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.*; -import org.apache.ignite.internal.managers.checkpoint.*; -import org.apache.ignite.internal.managers.collision.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.managers.discovery.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.managers.failover.*; -import org.apache.ignite.internal.managers.indexing.*; -import org.apache.ignite.internal.managers.loadbalancer.*; -import org.apache.ignite.internal.managers.swapspace.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.portable.*; -import org.apache.ignite.internal.processors.cacheobject.*; -import org.apache.ignite.internal.processors.clock.*; -import org.apache.ignite.internal.processors.closure.*; -import org.apache.ignite.internal.processors.cluster.*; -import org.apache.ignite.internal.processors.continuous.*; -import org.apache.ignite.internal.processors.datastreamer.*; -import org.apache.ignite.internal.processors.datastructures.*; -import org.apache.ignite.internal.processors.hadoop.*; -import org.apache.ignite.internal.processors.job.*; -import org.apache.ignite.internal.processors.jobmetrics.*; -import org.apache.ignite.internal.processors.nodevalidation.*; -import org.apache.ignite.internal.processors.offheap.*; -import org.apache.ignite.internal.processors.platform.*; -import org.apache.ignite.internal.processors.plugin.*; -import org.apache.ignite.internal.processors.port.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.processors.resource.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.security.*; -import org.apache.ignite.internal.processors.segmentation.*; -import org.apache.ignite.internal.processors.service.*; -import org.apache.ignite.internal.processors.session.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.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.apache.ignite.lifecycle.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.optimized.*; -import org.apache.ignite.marshaller.portable.*; -import org.apache.ignite.mxbean.*; -import org.apache.ignite.plugin.*; -import org.apache.ignite.spi.*; -import org.jetbrains.annotations.*; - -import javax.management.*; -import java.io.*; -import java.lang.management.*; -import java.lang.reflect.*; -import java.text.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.internal.GridKernalState.*; -import static org.apache.ignite.internal.IgniteComponentType.*; -import static org.apache.ignite.internal.IgniteNodeAttributes.*; -import static org.apache.ignite.internal.IgniteVersionUtils.*; -import static org.apache.ignite.lifecycle.LifecycleEventType.*; +import java.io.Externalizable; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InvalidObjectException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.lang.reflect.Constructor; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Properties; +import java.util.Timer; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; +import javax.management.JMException; +import javax.management.ObjectName; +import org.apache.ignite.IgniteAtomicLong; +import org.apache.ignite.IgniteAtomicReference; +import org.apache.ignite.IgniteAtomicSequence; +import org.apache.ignite.IgniteAtomicStamped; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteClientDisconnectedException; +import org.apache.ignite.IgniteCompute; +import org.apache.ignite.IgniteCountDownLatch; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteEvents; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.IgniteMessaging; +import org.apache.ignite.IgnitePortables; +import org.apache.ignite.IgniteQueue; +import org.apache.ignite.IgniteScheduler; +import org.apache.ignite.IgniteServices; +import org.apache.ignite.IgniteSet; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.IgniteTransactions; +import org.apache.ignite.Ignition; +import org.apache.ignite.cache.affinity.Affinity; +import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.cluster.ClusterMetrics; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.CollectionConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.cluster.ClusterGroupAdapter; +import org.apache.ignite.internal.cluster.IgniteClusterEx; +import org.apache.ignite.internal.managers.GridManager; +import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager; +import org.apache.ignite.internal.managers.collision.GridCollisionManager; +import org.apache.ignite.internal.managers.communication.GridIoManager; +import org.apache.ignite.internal.managers.deployment.GridDeploymentManager; +import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; +import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; +import org.apache.ignite.internal.managers.failover.GridFailoverManager; +import org.apache.ignite.internal.managers.indexing.GridIndexingManager; +import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; +import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager; +import org.apache.ignite.internal.processors.GridProcessor; +import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor; +import org.apache.ignite.internal.processors.cache.GridCacheAdapter; +import org.apache.ignite.internal.processors.cache.GridCacheContext; +import org.apache.ignite.internal.processors.cache.GridCacheProcessor; +import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessor; +import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl; +import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; +import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor; +import org.apache.ignite.internal.processors.closure.GridClosureProcessor; +import org.apache.ignite.internal.processors.cluster.ClusterProcessor; +import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor; +import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor; +import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor; +import org.apache.ignite.internal.processors.hadoop.Hadoop; +import org.apache.ignite.internal.processors.job.GridJobProcessor; +import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.processors.nodevalidation.OsDiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor; +import org.apache.ignite.internal.processors.platform.PlatformNoopProcessor; +import org.apache.ignite.internal.processors.platform.PlatformProcessor; +import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor; +import org.apache.ignite.internal.processors.port.GridPortProcessor; +import org.apache.ignite.internal.processors.port.GridPortRecord; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.processors.resource.GridResourceProcessor; +import org.apache.ignite.internal.processors.resource.GridSpringResourceContext; +import org.apache.ignite.internal.processors.rest.GridRestProcessor; +import org.apache.ignite.internal.processors.security.GridSecurityProcessor; +import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor; +import org.apache.ignite.internal.processors.service.GridServiceProcessor; +import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor; +import org.apache.ignite.internal.processors.task.GridTaskProcessor; +import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.util.GridEnumCache; +import org.apache.ignite.internal.util.GridTimerTask; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.future.IgniteFutureImpl; +import org.apache.ignite.internal.util.lang.GridAbsClosure; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.CI1; +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.CU; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.lifecycle.LifecycleAware; +import org.apache.ignite.lifecycle.LifecycleBean; +import org.apache.ignite.lifecycle.LifecycleEventType; +import org.apache.ignite.marshaller.MarshallerExclusions; +import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.portable.PortableMarshaller; +import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean; +import org.apache.ignite.mxbean.IgniteMXBean; +import org.apache.ignite.mxbean.ThreadPoolMXBean; +import org.apache.ignite.plugin.IgnitePlugin; +import org.apache.ignite.plugin.PluginNotFoundException; +import org.apache.ignite.plugin.PluginProvider; +import org.apache.ignite.spi.IgniteSpi; +import org.apache.ignite.spi.IgniteSpiVersionCheckException; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_STARVATION_CHECK_INTERVAL; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER; +import static org.apache.ignite.IgniteSystemProperties.getBoolean; +import static org.apache.ignite.IgniteSystemProperties.snapshot; +import static org.apache.ignite.internal.GridKernalState.DISCONNECTED; +import static org.apache.ignite.internal.GridKernalState.STARTED; +import static org.apache.ignite.internal.GridKernalState.STARTING; +import static org.apache.ignite.internal.GridKernalState.STOPPED; +import static org.apache.ignite.internal.GridKernalState.STOPPING; +import static org.apache.ignite.internal.IgniteComponentType.IGFS; +import static org.apache.ignite.internal.IgniteComponentType.IGFS_HELPER; +import static org.apache.ignite.internal.IgniteComponentType.SCHEDULE; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_DATE; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CLIENT_MODE; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CONSISTENCY_CHECK_SKIPPED; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_GRID_NAME; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JIT_NAME; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JMX_PORT; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_ARGS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_PID; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_LANG_RUNTIME; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTENT_ID; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PEER_CLASSLOADING; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PHY_RAM; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PORTABLE_PROTO_VER; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PREFIX; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_RESTART_ENABLED; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_PORT_RANGE; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME; +import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR; +import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR; +import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; +import static org.apache.ignite.internal.IgniteVersionUtils.REV_HASH_STR; +import static org.apache.ignite.internal.IgniteVersionUtils.VER; +import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR; +import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_START; +import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_START; /** * Ignite kernal. http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java index eadb4c7..8cba731 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.processors.platform; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.jetbrains.annotations.Nullable; /** * No-op processor. http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java index a22c787..a53c6b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.processors.platform; -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.processors.GridProcessor; +import org.jetbrains.annotations.Nullable; /** * Platform processor. http://git-wip-us.apache.org/repos/asf/ignite/blob/e8379e92/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java index 7e11592..82da10f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java @@ -17,19 +17,22 @@ package org.apache.ignite.internal.managers.discovery; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.lang.reflect.*; -import java.util.*; - -import static org.apache.ignite.configuration.DeploymentMode.*; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.DeploymentMode; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteNodeAttributes; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; +import static org.apache.ignite.configuration.DeploymentMode.SHARED; /** * Tests for node attributes consistency checks.
