You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/14 15:00:19 UTC
[25/40] ignite git commit: ignite-3207 Rename
IgniteConfiguration.gridName -> igniteInstanceName.
ignite-3207 Rename IgniteConfiguration.gridName -> igniteInstanceName.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f59f46d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f59f46d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f59f46d3
Branch: refs/heads/ignite-4565-ddl
Commit: f59f46d37a789dbe7f66e811b006259b18d9ba13
Parents: d9d6ff0
Author: Alexander Fedotov <al...@gmail.com>
Authored: Mon Mar 13 14:18:58 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 14:20:00 2017 +0300
----------------------------------------------------------------------
.../aop/aspectj/GridifyAspectJAspect.java | 15 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 15 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 15 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 15 +-
.../spring/GridifySetToValueSpringAspect.java | 15 +-
.../gridify/aop/spring/GridifySpringAspect.java | 15 +-
.../apache/ignite/gridify/AbstractAopTest.java | 6 +-
.../ignite/gridify/GridifySetToSetTarget.java | 18 +-
.../gridify/GridifySetToSetTargetInterface.java | 18 +-
.../ignite/gridify/GridifySetToValueTarget.java | 16 +-
.../GridifySetToValueTargetInterface.java | 16 +-
.../ignite/gridify/NonSpringAopSelfTest.java | 2 +-
.../ignite/gridify/SpringAopSelfTest.java | 2 +-
.../apache/ignite/gridify/TestAopTarget.java | 16 +-
.../ignite/gridify/TestAopTargetInterface.java | 16 +-
.../gridify/hierarchy/GridifyHierarchyTest.java | 2 +-
.../ignite/gridify/hierarchy/SuperTarget.java | 4 +-
.../apache/ignite/p2p/P2PGridifySelfTest.java | 8 +-
.../singlesplit/SingleSplitsLoadTest.java | 2 +-
.../gridify/GridifySingleSplitLoadTest.java | 6 +-
.../org/test/gridify/ExternalAopTarget.java | 16 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 6 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +-
.../s3/S3CheckpointManagerSelfTest.java | 6 +-
.../jmh/cache/JmhCacheAbstractBenchmark.java | 6 +-
.../internal/TaskEventSubjectIdSelfTest.java | 4 +-
.../ClientAbstractMultiThreadedSelfTest.java | 4 +-
.../client/ClientDefaultCacheSelfTest.java | 4 +-
.../internal/client/ClientStartNodeTask.java | 14 +-
.../internal/client/ClientStopNodeTask.java | 2 +-
.../ClientTcpSslAuthenticationSelfTest.java | 4 +-
...skExecutionAfterTopologyRestartSelfTest.java | 4 +-
.../internal/client/ClientTestRestServer.java | 6 +-
.../ClientAbstractMultiNodeSelfTest.java | 4 +-
.../integration/ClientAbstractSelfTest.java | 4 +-
.../integration/ClientPreferDirectSelfTest.java | 4 +-
.../client/router/ClientFailedInitSelfTest.java | 4 +-
.../client/router/RouterFactorySelfTest.java | 4 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 16 +-
...BinaryMarshallerInsertStatementSelfTest.java | 4 +-
...cBinaryMarshallerMergeStatementSelfTest.java | 4 +-
.../jdbc2/JdbcComplexQuerySelfTest.java | 4 +-
.../internal/jdbc2/JdbcConnectionSelfTest.java | 4 +-
.../jdbc2/JdbcDistributedJoinsQueryTest.java | 4 +-
.../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 4 +-
.../internal/jdbc2/JdbcLocalCachesSelfTest.java | 4 +-
.../internal/jdbc2/JdbcMetadataSelfTest.java | 4 +-
.../internal/jdbc2/JdbcNoDefaultCacheTest.java | 4 +-
.../jdbc2/JdbcPreparedStatementSelfTest.java | 4 +-
.../internal/jdbc2/JdbcResultSetSelfTest.java | 4 +-
.../internal/jdbc2/JdbcStatementSelfTest.java | 4 +-
.../rest/AbstractRestProcessorSelfTest.java | 4 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 6 +-
.../rest/JettyRestProcessorSignedSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 4 +-
.../rest/RestMemcacheProtocolSelfTest.java | 4 +-
.../rest/RestProcessorMultiStartSelfTest.java | 4 +-
.../rest/RestProcessorStartSelfTest.java | 8 +-
.../rest/TaskCommandHandlerSelfTest.java | 4 +-
.../tcp/redis/RedisProtocolSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 4 +-
.../ignite/jdbc/JdbcConnectionSelfTest.java | 6 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 4 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../ignite/jdbc/JdbcNoDefaultCacheTest.java | 4 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 4 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 4 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 4 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 15 +-
.../apache/ignite/IgniteSystemProperties.java | 8 +
.../main/java/org/apache/ignite/Ignition.java | 43 ++---
.../org/apache/ignite/IgnitionListener.java | 2 +-
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../apache/ignite/compute/gridify/Gridify.java | 10 +
.../ignite/compute/gridify/GridifySetToSet.java | 10 +
.../compute/gridify/GridifySetToValue.java | 10 +
.../configuration/IgniteConfiguration.java | 44 ++++-
.../apache/ignite/internal/GridDiagnostic.java | 16 +-
.../ignite/internal/GridKernalContext.java | 6 +-
.../ignite/internal/GridKernalContextImpl.java | 6 +-
.../ignite/internal/GridKernalGatewayImpl.java | 14 +-
.../apache/ignite/internal/GridLoggerProxy.java | 25 +--
.../apache/ignite/internal/IgniteKernal.java | 56 +++---
.../ignite/internal/IgniteNodeAttributes.java | 10 +-
.../org/apache/ignite/internal/IgnitionEx.java | 150 +++++++--------
.../ignite/internal/binary/BinaryContext.java | 2 +-
.../internal/binary/BinaryReaderExImpl.java | 2 +-
.../internal/binary/BinaryWriterExImpl.java | 2 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 4 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../cluster/ClusterNodeLocalMapImpl.java | 2 +-
.../internal/cluster/IgniteClusterImpl.java | 2 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 4 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../checkpoint/GridCheckpointManager.java | 2 +-
.../managers/communication/GridIoManager.java | 2 +-
.../discovery/GridDiscoveryManager.java | 9 +-
.../eventstorage/GridEventStorageManager.java | 2 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheContext.java | 11 +-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../cache/GridCacheEvictionManager.java | 9 +-
.../processors/cache/GridCacheGateway.java | 3 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheMvccManager.java | 2 +-
.../GridCachePartitionExchangeManager.java | 8 +-
.../processors/cache/GridCacheProcessor.java | 9 +-
.../cache/GridCacheSharedContext.java | 6 +-
.../cache/GridCacheSharedTtlCleanupManager.java | 2 +-
.../processors/cache/GridCacheTtlManager.java | 3 +-
.../dht/GridClientPartitionTopology.java | 7 +-
.../dht/GridDhtPartitionTopologyImpl.java | 9 +-
.../dht/preloader/GridDhtPartitionDemander.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../store/GridCacheStoreManagerAdapter.java | 2 +-
.../cache/store/GridCacheWriteBehindStore.java | 16 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../processors/clock/GridClockServer.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../closure/GridClosureProcessor.java | 6 +-
.../processors/cluster/ClusterProcessor.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 14 +-
.../continuous/GridContinuousProcessor.java | 2 +-
.../datastreamer/DataStreamProcessor.java | 4 +-
.../datastructures/DataStructuresProcessor.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 8 +-
.../igfs/IgfsFragmentizerManager.java | 4 +-
.../processors/igfs/IgfsIpcHandler.java | 2 +-
.../processors/igfs/IgfsNoopProcessor.java | 2 +-
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../internal/processors/igfs/IgfsServer.java | 6 +-
.../processors/igfs/IgfsServerManager.java | 2 +-
.../processors/igfs/IgfsThreadFactory.java | 6 +-
.../processors/job/GridJobProcessor.java | 2 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../jobmetrics/GridJobMetricsProcessor.java | 3 +-
.../internal/processors/odbc/OdbcProcessor.java | 6 +-
.../processors/platform/PlatformIgnition.java | 34 ++--
.../platform/PlatformProcessorImpl.java | 2 +-
.../platform/compute/PlatformAbstractJob.java | 2 +-
.../processors/port/GridPortProcessor.java | 2 +-
.../resource/GridResourceProcessor.java | 2 +-
.../processors/rest/GridRestProcessor.java | 8 +-
.../version/GridVersionCommandHandler.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 2 +-
.../service/GridServiceProcessor.java | 4 +-
.../session/GridTaskSessionProcessor.java | 2 +-
.../processors/task/GridTaskProcessor.java | 2 +-
.../processors/task/GridTaskWorker.java | 2 +-
.../timeout/GridTimeoutProcessor.java | 6 +-
.../suggestions/GridPerformanceSuggestions.java | 6 +-
.../ignite/internal/util/IgniteUtils.java | 33 ++--
.../ignite/internal/util/StripedExecutor.java | 32 ++--
.../shmem/IpcSharedMemoryServerEndpoint.java | 22 +--
.../util/nio/GridNioAsyncNotifyFilter.java | 16 +-
.../ignite/internal/util/nio/GridNioServer.java | 48 ++---
.../ignite/internal/util/worker/GridWorker.java | 22 +--
.../internal/visor/igfs/VisorIgfsEndpoint.java | 26 +--
.../visor/node/VisorBasicConfiguration.java | 12 +-
.../visor/node/VisorNodeDataCollectorJob.java | 2 +-
.../node/VisorNodeDataCollectorJobResult.java | 16 +-
.../visor/node/VisorNodeDataCollectorTask.java | 2 +-
.../node/VisorNodeDataCollectorTaskResult.java | 10 +-
.../apache/ignite/mxbean/IgnitionMXBean.java | 14 +-
.../java/org/apache/ignite/spi/IgniteSpi.java | 6 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 6 +-
.../ignite/spi/IgniteSpiThreadFactory.java | 10 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 4 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../spi/checkpoint/noop/NoopCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 12 +-
.../sharedfs/SharedFsTimeoutTask.java | 6 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 4 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../spi/collision/noop/NoopCollisionSpi.java | 2 +-
.../PriorityQueueCollisionSpi.java | 4 +-
.../communication/tcp/TcpCommunicationSpi.java | 20 +-
.../deployment/local/LocalDeploymentSpi.java | 4 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +-
.../memory/MemoryEventStorageSpi.java | 4 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 4 +-
.../jobstealing/JobStealingFailoverSpi.java | 4 +-
.../spi/failover/never/NeverFailoverSpi.java | 4 +-
.../spi/indexing/noop/NoopIndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 4 +-
.../WeightedRandomLoadBalancingSpi.java | 4 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +-
.../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 6 +-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../ignite/stream/socket/SocketStreamer.java | 6 +-
.../thread/IgniteStripedThreadPoolExecutor.java | 6 +-
.../org/apache/ignite/thread/IgniteThread.java | 57 +++---
.../ignite/thread/IgniteThreadFactory.java | 18 +-
.../ignite/thread/IgniteThreadPoolExecutor.java | 12 +-
.../test/config/default-spring-url-testing.xml | 2 +-
.../core/src/test/config/load/dsi-load-base.xml | 2 +-
.../test/config/loaders/grid-cfg-2-grids.xml | 4 +-
.../core/src/test/config/loaders/grid-cfg.xml | 2 +-
.../config/websession/example-cache-client.xml | 2 +-
.../test/config/websession/example-cache2.xml | 2 +-
.../test/config/websession/spring-cache-1.xml | 2 +-
.../test/config/websession/spring-cache-2.xml | 2 +-
.../test/config/websession/spring-cache-3.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 4 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 6 +-
.../cache/IgniteWarmupClosureSelfTest.java | 4 +-
.../affinity/AffinityClientNodeSelfTest.java | 6 +-
...ityFunctionBackupFilterAbstractSelfTest.java | 4 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 4 +-
.../affinity/AffinityHistoryCleanupTest.java | 4 +-
.../fair/FairAffinityDynamicCacheSelfTest.java | 4 +-
.../fair/FairAffinityFunctionNodesSelfTest.java | 4 +-
.../local/LocalAffinityFunctionTest.java | 4 +-
...cheStoreSessionListenerAbstractSelfTest.java | 4 +-
...heStoreSessionListenerLifecycleSelfTest.java | 4 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 4 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 4 +-
.../store/StoreResourceInjectionSelfTest.java | 4 +-
.../CacheJdbcPojoStoreAbstractSelfTest.java | 4 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 4 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 4 +-
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 13 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +-
.../internal/ClusterGroupAbstractTest.java | 4 +-
.../internal/ClusterGroupHostsSelfTest.java | 4 +-
.../ignite/internal/ClusterMetricsSelfTest.java | 4 +-
.../internal/ClusterNodeMetricsSelfTest.java | 4 +-
.../ComputeJobCancelWithServiceSelfTest.java | 4 +-
.../ignite/internal/GridAffinityMappedTest.java | 11 +-
.../internal/GridAffinityP2PSelfTest.java | 11 +-
.../ignite/internal/GridAffinitySelfTest.java | 8 +-
.../GridAlwaysFailoverSpiFailSelfTest.java | 4 +-
.../internal/GridCacheRecreateLockTest.java | 2 +-
.../internal/GridCancelUnusedJobSelfTest.java | 6 +-
.../GridCancelledJobsMetricsSelfTest.java | 4 +-
.../GridCollisionJobsContextSelfTest.java | 10 +-
.../internal/GridCommunicationSelfTest.java | 2 +-
...omputationBinarylizableClosuresSelfTest.java | 4 +-
.../GridContinuousJobAnnotationSelfTest.java | 4 +-
.../ignite/internal/GridDeploymentSelfTest.java | 16 +-
.../internal/GridDiscoveryEventSelfTest.java | 4 +-
.../ignite/internal/GridDiscoverySelfTest.java | 6 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 2 +-
...ventStorageRuntimeConfigurationSelfTest.java | 4 +-
.../internal/GridFactoryVmShutdownTest.java | 2 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 4 +-
.../GridFailedInputParametersSelfTest.java | 2 +-
.../GridFailoverCustomTopologySelfTest.java | 4 +-
.../ignite/internal/GridFailoverSelfTest.java | 4 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 6 +-
.../internal/GridFailoverTopologySelfTest.java | 4 +-
.../ignite/internal/GridGetOrStartSelfTest.java | 8 +-
.../ignite/internal/GridHomePathSelfTest.java | 8 +-
.../GridJobCheckpointCleanupSelfTest.java | 6 +-
.../GridJobCollisionCancelSelfTest.java | 4 +-
.../GridJobMasterLeaveAwareSelfTest.java | 4 +-
.../internal/GridJobStealingSelfTest.java | 4 +-
.../GridJobStealingZeroActiveJobsSelfTest.java | 6 +-
.../internal/GridLifecycleAwareSelfTest.java | 4 +-
.../internal/GridLifecycleBeanSelfTest.java | 16 +-
.../GridLocalEventListenerSelfTest.java | 6 +-
.../internal/GridMultipleJobsSelfTest.java | 6 +-
.../internal/GridMultipleSpisSelfTest.java | 4 +-
.../GridMultipleVersionsDeploymentSelfTest.java | 4 +-
.../GridMultithreadedJobStealingSelfTest.java | 4 +-
.../ignite/internal/GridNodeLocalSelfTest.java | 2 +-
.../internal/GridNodeMetricsLogSelfTest.java | 4 +-
.../GridNodeVisorAttributesSelfTest.java | 4 +-
.../internal/GridNonHistoryMetricsSelfTest.java | 4 +-
.../GridProjectionForCachesSelfTest.java | 18 +-
...ectionLocalJobMultipleArgumentsSelfTest.java | 4 +-
.../internal/GridReleaseTypeSelfTest.java | 4 +-
.../internal/GridRuntimeExceptionSelfTest.java | 8 +-
.../internal/GridSpiExceptionSelfTest.java | 8 +-
.../ignite/internal/GridStartStopSelfTest.java | 6 +-
.../internal/GridStopWithWaitSelfTest.java | 12 +-
.../GridTaskFailoverAffinityRunTest.java | 6 +-
.../GridTaskFutureImplStopGridSelfTest.java | 8 +-
.../GridTaskInstanceExecutionSelfTest.java | 2 +-
.../internal/GridTaskJobRejectSelfTest.java | 4 +-
.../internal/GridTaskListenerSelfTest.java | 2 +-
.../internal/GridTaskMapAsyncSelfTest.java | 6 +-
.../internal/GridTaskResultCacheSelfTest.java | 4 +-
.../internal/GridTaskTimeoutSelfTest.java | 8 +-
.../IgniteClientReconnectAbstractTest.java | 4 +-
.../IgniteClientReconnectApiExceptionTest.java | 4 +-
.../IgniteClientReconnectCacheTest.java | 13 +-
...niteClientReconnectFailoverAbstractTest.java | 4 +-
.../IgniteClientReconnectFailoverTest.java | 4 +-
.../IgniteClientReconnectStreamerTest.java | 4 +-
.../IgniteComputeEmptyClusterGroupTest.java | 4 +-
.../internal/IgniteExecutorServiceTest.java | 14 +-
...gniteExplicitImplicitDeploymentSelfTest.java | 4 +-
.../IgniteLocalNodeMapBeforeStartTest.java | 2 +-
...RoundRobinErrorAfterClientReconnectTest.java | 6 +-
.../IgniteSlowClientDetectionSelfTest.java | 7 +-
...UpdateNotifierPerClusterSettingSelfTest.java | 4 +-
.../ignite/internal/TaskNodeRestartTest.java | 4 +-
.../internal/TestRecordingCommunicationSpi.java | 4 +-
.../BinaryArrayIdentityResolverSelfTest.java | 4 +-
.../BinaryConfigurationConsistencySelfTest.java | 4 +-
.../internal/binary/BinaryEnumsSelfTest.java | 4 +-
.../BinaryFieldIdentityResolverSelfTest.java | 4 +-
...ryIdentityResolverConfigurationSelfTest.java | 4 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 4 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 4 +-
...ilderSimpleNameLowerCaseMappersSelfTest.java | 4 +-
.../binary/BinaryObjectToStringSelfTest.java | 4 +-
.../BinarySerialiedFieldComparatorSelfTest.java | 4 +-
.../internal/binary/BinaryTreeSelfTest.java | 2 +-
.../binary/GridBinaryAffinityKeySelfTest.java | 6 +-
...aultBinaryMappersBinaryMetaDataSelfTest.java | 4 +-
...CaseBinaryMappersBinaryMetaDataSelfTest.java | 4 +-
...GridManagerLocalMessageListenerSelfTest.java | 6 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../GridCheckpointManagerAbstractSelfTest.java | 33 ++--
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
...idCommunicationManagerListenersSelfTest.java | 6 +-
.../GridCommunicationSendMessageSelfTest.java | 4 +-
.../IgniteCommunicationBalanceTest.java | 4 +-
.../communication/IgniteIoTestMessagesTest.java | 4 +-
.../IgniteVariousConnectionNumberTest.java | 6 +-
.../GridDeploymentManagerStopSelfTest.java | 2 +-
.../GridDeploymentMessageCountSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 10 +-
.../IgniteTopologyPrintFormatSelfTest.java | 8 +-
.../events/GridEventStorageManagerSelfTest.java | 4 +-
.../swapspace/GridSwapSpaceManagerSelfTest.java | 4 +-
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 4 +-
.../GridAffinityProcessorAbstractSelfTest.java | 4 +-
.../BinaryObjectOffHeapUnswapTemporaryTest.java | 4 +-
.../cache/CacheAffinityCallSelfTest.java | 6 +-
.../CacheAtomicSingleMessageCountSelfTest.java | 4 +-
.../cache/CacheClientStoreSelfTest.java | 6 +-
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 4 +-
.../cache/CacheEntryProcessorCopySelfTest.java | 4 +-
.../cache/CacheEnumOperationsAbstractTest.java | 4 +-
...CacheExchangeMessageDuplicatedStateTest.java | 6 +-
.../cache/CacheFutureExceptionSelfTest.java | 6 +-
.../cache/CacheGetEntryAbstractTest.java | 4 +-
...erceptorPartitionCounterLocalSanityTest.java | 4 +-
...torPartitionCounterRandomOperationsTest.java | 4 +-
.../CacheMetricsForClusterGroupSelfTest.java | 4 +-
.../processors/cache/CacheNamesSelfTest.java | 4 +-
.../CacheNamesWithSpecialCharactersTest.java | 4 +-
.../cache/CacheNearReaderUpdateTest.java | 4 +-
.../cache/CacheOffheapMapEntrySelfTest.java | 6 +-
.../CachePutEventListenerErrorSelfTest.java | 4 +-
.../processors/cache/CachePutIfAbsentTest.java | 4 +-
.../cache/CacheReadThroughRestartSelfTest.java | 6 +-
.../cache/CacheRebalancingSelfTest.java | 4 +-
.../CacheSerializableTransactionsTest.java | 4 +-
.../CacheStartupInDeploymentModesTest.java | 4 +-
.../cache/CacheStopAndDestroySelfTest.java | 6 +-
.../CacheStoreUsageMultinodeAbstractTest.java | 10 +-
.../cache/CacheSwapUnswapGetTest.java | 4 +-
.../CacheSwapUnswapGetTestSmallQueueSize.java | 4 +-
.../processors/cache/CacheTxFastFinishTest.java | 4 +-
.../CacheTxNotAllowReadFromBackupTest.java | 4 +-
.../processors/cache/CrossCacheLockTest.java | 6 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 6 +-
.../EntryVersionConsistencyReadThroughTest.java | 4 +-
...idAbstractCacheInterceptorRebalanceTest.java | 4 +-
...ridCacheAbstractByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 14 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 24 +--
.../GridCacheAbstractRemoveFailureTest.java | 6 +-
.../cache/GridCacheAbstractSelfTest.java | 10 +-
.../cache/GridCacheAbstractTxReadTest.java | 8 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 4 +-
.../cache/GridCacheAffinityApiSelfTest.java | 4 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 6 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 4 +-
...eAtomicEntryProcessorDeploymentSelfTest.java | 4 +-
.../GridCacheAtomicMessageCountSelfTest.java | 4 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 4 +-
...acheBasicStoreMultithreadedAbstractTest.java | 4 +-
.../cache/GridCacheClearAllSelfTest.java | 4 +-
.../cache/GridCacheClearLocallySelfTest.java | 10 +-
.../cache/GridCacheClearSelfTest.java | 4 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 4 +-
.../cache/GridCacheConcurrentMapTest.java | 4 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 18 +-
.../GridCacheConditionalDeploymentSelfTest.java | 4 +-
...idCacheConfigurationConsistencySelfTest.java | 4 +-
...ridCacheConfigurationValidationSelfTest.java | 46 ++---
.../GridCacheDaemonNodeAbstractSelfTest.java | 4 +-
.../cache/GridCacheDeploymentSelfTest.java | 22 +--
.../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheFinishPartitionsSelfTest.java | 4 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
...idCacheGetAndTransformStoreAbstractTest.java | 4 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 8 +-
.../cache/GridCacheIteratorPerformanceTest.java | 4 +-
.../cache/GridCacheKeyCheckSelfTest.java | 4 +-
.../processors/cache/GridCacheLeakTest.java | 4 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 4 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 4 +-
.../GridCacheMarshallerTxAbstractTest.java | 4 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 4 +-
.../cache/GridCacheMemoryModeSelfTest.java | 4 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 4 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 4 +-
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 4 +-
.../cache/GridCacheMvccManagerSelfTest.java | 4 +-
.../cache/GridCacheNestedTxAbstractTest.java | 4 +-
.../cache/GridCacheObjectToStringSelfTest.java | 4 +-
.../cache/GridCacheOffHeapCleanupTest.java | 4 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 4 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 4 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 4 +-
.../GridCacheOrderedPreloadingSelfTest.java | 4 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 4 +-
.../cache/GridCachePartitionedGetSelfTest.java | 4 +-
...hePartitionedProjectionAffinitySelfTest.java | 4 +-
.../cache/GridCachePartitionedWritesTest.java | 4 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 10 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 4 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../GridCacheReferenceCleanupSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 4 +-
...ridCacheReplicatedSynchronousCommitTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 4 +-
.../cache/GridCacheSlowTxWarnTest.java | 4 +-
.../processors/cache/GridCacheStopSelfTest.java | 4 +-
...ridCacheStoreManagerDeserializationTest.java | 6 +-
.../cache/GridCacheStorePutxSelfTest.java | 4 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 4 +-
.../cache/GridCacheSwapCleanupTest.java | 4 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 4 +-
...ridCacheSwapSpaceSpiConsistencySelfTest.java | 10 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 4 +-
.../GridCacheTtlManagerEvictionSelfTest.java | 4 +-
.../GridCacheTtlManagerNotificationTest.java | 4 +-
.../cache/GridCacheTtlManagerSelfTest.java | 4 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 10 +-
...idCacheValueConsistencyAbstractSelfTest.java | 4 +-
.../GridCacheVariableTopologySelfTest.java | 4 +-
.../cache/GridCacheVersionMultinodeTest.java | 4 +-
.../GridCacheVersionTopologyChangeTest.java | 4 +-
.../cache/GridLocalIgniteSerializationTest.java | 10 +-
...ProjectionForCachesOnDaemonNodeSelfTest.java | 4 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractTest.java | 10 +-
...IgniteCacheBinaryEntryProcessorSelfTest.java | 6 +-
.../IgniteCacheBinaryObjectsScanSelfTest.java | 6 +-
...teCacheConfigurationDefaultTemplateTest.java | 4 +-
.../IgniteCacheConfigurationTemplateTest.java | 4 +-
.../IgniteCacheContainsKeyAbstractSelfTest.java | 8 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 4 +-
.../cache/IgniteCacheCreateRestartSelfTest.java | 4 +-
.../IgniteCacheEntryListenerAbstractTest.java | 8 +-
...niteCacheEntryListenerExpiredEventsTest.java | 4 +-
.../IgniteCacheEntryProcessorCallTest.java | 8 +-
.../IgniteCacheEntryProcessorNodeJoinTest.java | 4 +-
...niteCacheExpireAndUpdateConsistencyTest.java | 4 +-
...IgniteCacheGetCustomCollectionsSelfTest.java | 4 +-
.../cache/IgniteCacheIncrementTxTest.java | 6 +-
...gniteCacheInvokeReadThroughAbstractTest.java | 4 +-
...gniteCacheLoadRebalanceEvictionSelfTest.java | 4 +-
.../IgniteCacheManyAsyncOperationsTest.java | 6 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 6 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 8 +-
...gniteCacheP2pUnmarshallingNearErrorTest.java | 4 +-
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 6 +-
.../IgniteCachePartitionMapUpdateTest.java | 4 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 8 +-
.../cache/IgniteCachePutAllRestartTest.java | 4 +-
.../IgniteCachePutStackOverflowSelfTest.java | 4 +-
.../IgniteCacheReadThroughEvictionSelfTest.java | 2 +-
.../IgniteCacheReadThroughStoreCallTest.java | 4 +-
...iteCacheScanPredicateDeploymentSelfTest.java | 6 +-
.../cache/IgniteCacheSerializationSelfTest.java | 6 +-
.../cache/IgniteCacheStartStopLoadTest.java | 4 +-
.../cache/IgniteCacheStoreCollectionTest.java | 4 +-
.../IgniteCacheStoreValueAbstractTest.java | 8 +-
.../IgniteCacheTopologySafeGetSelfTest.java | 4 +-
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 4 +-
.../cache/IgniteCachingProviderSelfTest.java | 8 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../IgniteDaemonNodeMarshallerCacheTest.java | 4 +-
.../cache/IgniteDynamicCacheAndNodeStop.java | 4 +-
.../cache/IgniteDynamicCacheFilterTest.java | 4 +-
...eDynamicCacheStartNoExchangeTimeoutTest.java | 6 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 4 +-
...niteDynamicCacheStartStopConcurrentTest.java | 4 +-
...niteDynamicCacheWithConfigStartSelfTest.java | 4 +-
.../IgniteDynamicClientCacheStartSelfTest.java | 8 +-
.../cache/IgniteInternalCacheTypesTest.java | 6 +-
...eMarshallerCacheConcurrentReadWriteTest.java | 4 +-
.../cache/IgniteOnePhaseCommitNearSelfTest.java | 10 +-
.../cache/IgnitePutAllLargeBatchSelfTest.java | 10 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 10 +-
.../IgniteStartCacheInTransactionSelfTest.java | 4 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 4 +-
.../cache/IgniteSystemCacheOnClientTest.java | 6 +-
...gniteTopologyValidatorAbstractCacheTest.java | 10 +-
...niteTopologyValidatorGridSplitCacheTest.java | 2 +-
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../cache/IgniteTxConfigCacheSelfTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 10 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 4 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 4 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +-
.../MarshallerCacheJobRunNodeRestartTest.java | 4 +-
.../cache/OffHeapTieredTransactionSelfTest.java | 4 +-
...heapCacheMetricsForClusterGroupSelfTest.java | 4 +-
.../cache/OffheapCacheOnClientsTest.java | 4 +-
...sExchangeOnDiscoveryHistoryOverflowTest.java | 2 +-
.../CacheKeepBinaryWithInterceptorTest.java | 4 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 8 +-
...acheBinaryObjectUserClassloaderSelfTest.java | 10 +-
...naryObjectsAbstractDataStreamerSelfTest.java | 4 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 4 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 4 +-
.../GridCacheBinaryStoreAbstractSelfTest.java | 4 +-
...yStoreBinariesSimpleNameMappersSelfTest.java | 4 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 4 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 6 +-
.../DataStreamProcessorBinarySelfTest.java | 4 +-
.../GridDataStreamerImplSelfTest.java | 4 +-
.../GridCacheAffinityRoutingBinarySelfTest.java | 4 +-
...sNearPartitionedByteArrayValuesSelfTest.java | 4 +-
...sPartitionedOnlyByteArrayValuesSelfTest.java | 4 +-
.../dht/GridCacheMemoryModeBinarySelfTest.java | 4 +-
...dCacheOffHeapTieredAtomicBinarySelfTest.java | 4 +-
.../GridCacheOffHeapTieredBinarySelfTest.java | 4 +-
...fHeapTieredEvictionAtomicBinarySelfTest.java | 4 +-
...acheOffHeapTieredEvictionBinarySelfTest.java | 4 +-
...IgniteCacheAbstractExecutionContextTest.java | 8 +-
...niteCacheContinuousExecutionContextTest.java | 4 +-
...IgniteCacheIsolatedExecutionContextTest.java | 4 +-
...niteCacheP2PDisableExecutionContextTest.java | 4 +-
.../IgniteCachePrivateExecutionContextTest.java | 4 +-
.../IgniteCacheSharedExecutionContextTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 46 ++---
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueCleanupSelfTest.java | 4 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 6 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 4 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 4 +-
.../IgniteAtomicsAbstractTest.java | 4 +-
.../IgniteClientDataStructuresAbstractTest.java | 6 +-
.../IgniteCollectionAbstractTest.java | 4 +-
.../IgniteDataStructureUniqueNameTest.java | 4 +-
.../IgniteDataStructureWithJobTest.java | 4 +-
.../IgniteSemaphoreAbstractSelfTest.java | 2 +-
...SemaphoreFailoverSafeReleasePermitsTest.java | 4 +-
...achePartitionedAtomicSequenceTxSelfTest.java | 4 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 4 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +-
.../CacheAbstractRestartSelfTest.java | 6 +-
.../distributed/CacheAffinityEarlyTest.java | 4 +-
...acheAsyncOperationsFailoverAbstractTest.java | 8 +-
.../distributed/CacheAsyncOperationsTest.java | 6 +-
.../CacheGetFutureHangsSelfTest.java | 4 +-
.../CacheGetInsideLockChangingTopologyTest.java | 4 +-
...ffinityAssignmentNodeJoinValidationTest.java | 4 +-
.../CacheLateAffinityAssignmentTest.java | 59 +++---
...CacheLoadingConcurrentGridStartSelfTest.java | 12 +-
.../CacheLockReleaseNodeLeaveTest.java | 4 +-
.../CachePutAllFailoverAbstractTest.java | 8 +-
.../CacheTryLockMultithreadedTest.java | 4 +-
...tractDistributedByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 4 +-
...tractPartitionedByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 4 +-
.../GridCacheBasicOpAbstractTest.java | 4 +-
.../GridCacheClientModesAbstractSelfTest.java | 24 +--
...ientModesTcpClientDiscoveryAbstractTest.java | 4 +-
...acheEntrySetIterationPreloadingSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 4 +-
.../distributed/GridCacheLockAbstractTest.java | 4 +-
.../distributed/GridCacheMixedModeSelfTest.java | 12 +-
.../GridCacheMultiNodeAbstractTest.java | 4 +-
.../GridCacheMultiNodeLockAbstractTest.java | 4 +-
...dCacheMultithreadedFailoverAbstractTest.java | 8 +-
.../GridCacheNodeFailureAbstractTest.java | 4 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 8 +-
...chePartitionedReloadAllAbstractSelfTest.java | 4 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 4 +-
.../GridCachePreloadLifecycleAbstractTest.java | 4 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../GridCacheTransformEventSelfTest.java | 4 +-
...yMetadataUpdateChangingTopologySelfTest.java | 11 +-
...niteBinaryMetadataUpdateNodeRestartTest.java | 4 +-
.../distributed/IgniteCache150ClientsTest.java | 6 +-
...micMessageRecoveryPairedConnectionsTest.java | 4 +-
...niteCacheClientNodeChangingTopologyTest.java | 15 +-
.../IgniteCacheClientNodeConcurrentStart.java | 6 +-
...teCacheClientNodePartitionsExchangeTest.java | 8 +-
.../IgniteCacheClientReconnectTest.java | 4 +-
...acheConnectionRecovery10ConnectionsTest.java | 4 +-
.../IgniteCacheConnectionRecoveryTest.java | 4 +-
.../IgniteCacheCreatePutMultiNodeSelfTest.java | 4 +-
.../distributed/IgniteCacheCreatePutTest.java | 4 +-
.../distributed/IgniteCacheGetRestartTest.java | 6 +-
.../distributed/IgniteCacheManyClientsTest.java | 4 +-
.../IgniteCacheMessageRecoveryAbstractTest.java | 4 +-
...eCacheMessageRecoveryIdleConnectionTest.java | 4 +-
.../IgniteCacheMessageWriteTimeoutTest.java | 4 +-
.../IgniteCacheNearOffheapGetSelfTest.java | 12 +-
.../IgniteCacheNearRestartRollbackSelfTest.java | 12 +-
.../IgniteCacheNodeJoinAbstractTest.java | 4 +-
.../distributed/IgniteCachePrimarySyncTest.java | 4 +-
.../IgniteCachePutGetRestartAbstractTest.java | 10 +-
.../IgniteCacheReadFromBackupTest.java | 4 +-
.../IgniteCacheServerNodeConcurrentStart.java | 4 +-
.../IgniteCacheSingleGetMessageTest.java | 4 +-
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 4 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 4 +-
.../IgniteCacheTxIteratorSelfTest.java | 4 +-
...arDisabledFairAffinityPutGetRestartTest.java | 4 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 16 +-
.../IgniteTxCachePrimarySyncTest.java | 4 +-
...teSynchronizationModesMultithreadedTest.java | 4 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 10 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 8 +-
.../IgniteTxPreloadAbstractTest.java | 4 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 +-
...heAbstractTransformWriteThroughSelfTest.java | 4 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 4 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 18 +-
.../dht/GridCacheColocatedDebugTest.java | 4 +-
...eColocatedOptimisticTransactionSelfTest.java | 4 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtEntrySetSelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 4 +-
.../dht/GridCacheDhtMappingSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 9 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 6 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadPerformanceTest.java | 4 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 16 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +-
.../dht/GridCacheDhtTxPreloadSelfTest.java | 4 +-
.../dht/GridCacheGlobalLoadTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 8 +-
...idCachePartitionedPreloadEventsSelfTest.java | 4 +-
...dCachePartitionedTopologyChangeSelfTest.java | 6 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 4 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 4 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 10 +-
.../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 +-
...gniteAtomicLongChangingTopologySelfTest.java | 4 +-
.../IgniteCacheCommitDelayTxRecoveryTest.java | 4 +-
.../dht/IgniteCacheConcurrentPutGetRemove.java | 4 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 6 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 8 +-
.../dht/IgniteCacheMultiTxLockSelfTest.java | 4 +-
...artitionedBackupNodeFailureRecoveryTest.java | 4 +-
...woBackupsPrimaryNodeFailureRecoveryTest.java | 4 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
.../dht/IgniteCrossCacheTxSelfTest.java | 4 +-
.../AtomicPutAllChangingTopologyTest.java | 2 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 4 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 4 +-
...tionedMultiNodeLongTxTimeoutFullApiTest.java | 4 +-
...nabledMultiNodeLongTxTimeoutFullApiTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 4 +-
...micFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 4 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 4 +-
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 4 +-
...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +-
...derFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...erNoStripedPoolMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 4 +-
.../near/GridCacheNearEvictionSelfTest.java | 4 +-
.../near/GridCacheNearJobExecutionSelfTest.java | 4 +-
.../near/GridCacheNearMetricsSelfTest.java | 4 +-
.../near/GridCacheNearMultiGetSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../GridCacheNearReaderPreloadSelfTest.java | 6 +-
.../near/GridCacheNearReadersSelfTest.java | 4 +-
.../near/GridCacheNearTxForceKeyTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
.../near/GridCacheNearTxPreloadSelfTest.java | 4 +-
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 20 +-
.../near/GridCachePartitionedBasicApiTest.java | 4 +-
.../GridCachePartitionedBasicOpSelfTest.java | 4 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 4 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 4 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCachePartitionedEventSelfTest.java | 2 +-
.../GridCachePartitionedEvictionSelfTest.java | 4 +-
...titionedExplicitLockNodeFailureSelfTest.java | 4 +-
...GridCachePartitionedFilteredPutSelfTest.java | 4 +-
.../GridCachePartitionedFullApiSelfTest.java | 8 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 4 +-
...LateAffDisabledMultiNodeFullApiSelfTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 4 +-
.../near/GridCachePartitionedLockSelfTest.java | 4 +-
.../GridCachePartitionedMetricsSelfTest.java | 8 +-
...achePartitionedMultiNodeCounterSelfTest.java | 79 ++++----
...achePartitionedMultiNodeFullApiSelfTest.java | 4 +-
...onedMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 4 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
.../near/GridCachePartitionedNestedTxTest.java | 4 +-
...edNoStripedPoolMultiNodeFullApiSelfTest.java | 4 +-
...GridCachePartitionedNodeFailureSelfTest.java | 4 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 4 +-
.../GridCachePartitionedStorePutSelfTest.java | 4 +-
...GridCachePartitionedTxConcurrentGetTest.java | 4 +-
...GridCachePartitionedTxMultiNodeSelfTest.java | 4 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
...achePartitionedTxSingleThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxTimeoutSelfTest.java | 4 +-
.../near/GridCachePutArrayValueSelfTest.java | 4 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 4 +-
.../near/IgniteCacheNearOnlyTxTest.java | 6 +-
.../near/IgniteCacheNearTxRollbackTest.java | 4 +-
.../near/NearCacheMultithreadedUpdateTest.java | 4 +-
.../near/NearCachePutAllMultinodeTest.java | 4 +-
.../near/NearCacheSyncUpdateTest.java | 4 +-
.../near/NoneRebalanceModeSelfTest.java | 4 +-
...cingDelayedPartitionMapExchangeSelfTest.java | 4 +-
.../GridCacheRebalancingAsyncSelfTest.java | 4 +-
.../GridCacheRebalancingOrderingTest.java | 6 +-
.../GridCacheRebalancingSyncCheckDataTest.java | 4 +-
.../GridCacheRebalancingSyncSelfTest.java | 6 +-
...eRebalancingUnmarshallingFailedSelfTest.java | 4 +-
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 4 +-
...tedFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 4 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 4 +-
...stractReplicatedByteArrayValuesSelfTest.java | 4 +-
...ridCacheAtomicReplicatedMetricsSelfTest.java | 4 +-
...nedFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedBasicApiTest.java | 4 +-
.../GridCacheReplicatedBasicOpSelfTest.java | 4 +-
.../GridCacheReplicatedEvictionSelfTest.java | 4 +-
.../GridCacheReplicatedFullApiSelfTest.java | 8 +-
.../GridCacheReplicatedJobExecutionTest.java | 4 +-
.../GridCacheReplicatedMarshallerTxTest.java | 4 +-
.../GridCacheReplicatedMetricsSelfTest.java | 4 +-
...atedMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedMultiNodeSelfTest.java | 4 +-
.../GridCacheReplicatedNodeFailureSelfTest.java | 4 +-
.../GridCacheReplicatedTxConcurrentGetTest.java | 4 +-
...GridCacheReplicatedTxMultiNodeBasicTest.java | 4 +-
...dCacheReplicatedTxMultiThreadedSelfTest.java | 4 +-
...CacheReplicatedTxSingleThreadedSelfTest.java | 4 +-
.../GridCacheReplicatedTxTimeoutSelfTest.java | 4 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 6 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +-
.../replicated/GridReplicatedTxPreloadTest.java | 4 +-
.../IgniteCacheSyncRebalanceModeSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +-
...idCacheReplicatedPreloadOffHeapSelfTest.java | 4 +-
.../GridCacheReplicatedPreloadSelfTest.java | 14 +-
...eplicatedPreloadStartStopEventsSelfTest.java | 4 +-
.../cache/eviction/EvictionAbstractTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 4 +-
...heConcurrentEvictionConsistencySelfTest.java | 4 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 4 +-
.../GridCacheDistributedEvictionsSelfTest.java | 4 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +-
.../GridCacheEvictionFilterSelfTest.java | 4 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 4 +-
.../GridCacheEvictionTouchSelfTest.java | 4 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
.../lru/LruNearEvictionPolicySelfTest.java | 4 +-
.../LruNearOnlyNearEvictionPolicySelfTest.java | 4 +-
.../SortedEvictionPolicyPerformanceTest.java | 4 +-
.../IgniteCacheClientNearCacheExpiryTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 4 +-
.../IgniteCacheLoadAllAbstractTest.java | 4 +-
...iteCacheNoLoadPreviousValueAbstractTest.java | 8 +-
.../IgniteCacheNoReadThroughAbstractTest.java | 8 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 8 +-
...IgniteCacheStoreNodeRestartAbstractTest.java | 6 +-
.../IgniteCacheStoreSessionAbstractTest.java | 6 +-
...acheStoreSessionWriteBehindAbstractTest.java | 6 +-
...dCacheAtomicLocalMetricsNoStoreSelfTest.java | 4 +-
.../GridCacheAtomicLocalMetricsSelfTest.java | 4 +-
.../local/GridCacheLocalBasicApiSelfTest.java | 4 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 4 +-
.../local/GridCacheLocalFullApiSelfTest.java | 8 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 4 +-
.../local/GridCacheLocalMetricsSelfTest.java | 8 +-
.../GridCacheLocalTxMultiThreadedSelfTest.java | 4 +-
.../GridCacheLocalTxSingleThreadedSelfTest.java | 4 +-
...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 4 +-
.../BinaryTxCacheLocalEntriesSelfTest.java | 8 +-
.../GridCacheQueryTransformerSelfTest.java | 4 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 4 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 2 +-
.../cache/query/IndexingSpiQueryTxSelfTest.java | 8 +-
.../continuous/CacheContinuousBatchAckTest.java | 12 +-
...heContinuousBatchForceServerModeAckTest.java | 8 +-
...eContinuousQueryAsyncFilterListenerTest.java | 4 +-
...CacheContinuousQueryCounterAbstractTest.java | 8 +-
...acheContinuousQueryExecuteInPrimaryTest.java | 4 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 4 +-
.../CacheContinuousQueryLostPartitionTest.java | 6 +-
...ontinuousQueryOperationFromCallbackTest.java | 4 +-
.../CacheContinuousQueryOperationP2PTest.java | 4 +-
.../CacheContinuousQueryOrderingEventTest.java | 4 +-
...acheContinuousQueryRandomOperationsTest.java | 4 +-
.../CacheContinuousQueryVariationsTest.java | 6 +-
...eEntryProcessorExternalizableFailedTest.java | 4 +-
.../CacheEntryProcessorNonSerializableTest.java | 4 +-
...CacheKeepBinaryIterationSwapEnabledTest.java | 4 +-
.../CacheKeepBinaryIterationTest.java | 4 +-
.../ClientReconnectContinuousQueryTest.java | 2 +-
...yRemoteFilterMissingInClassPathSelfTest.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
.../GridCacheContinuousQueryConcurrentTest.java | 6 +-
...eContinuousQueryMultiNodesFilteringTest.java | 10 +-
...eContinuousQueryReplicatedTxOneNodeTest.java | 4 +-
...niteCacheContinuousQueryBackupQueueTest.java | 4 +-
...CacheContinuousQueryClientReconnectTest.java | 4 +-
.../IgniteCacheContinuousQueryClientTest.java | 4 +-
...eCacheContinuousQueryImmutableEntryTest.java | 4 +-
...teCacheContinuousQueryNoUnsubscribeTest.java | 4 +-
...IgniteCacheContinuousQueryReconnectTest.java | 4 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 4 +-
.../IgniteCacheWriteBehindNoUpdateSelfTest.java | 4 +-
...CacheClientWriteBehindStoreAbstractTest.java | 12 +-
.../TxDeadlockDetectionNoHangsTest.java | 4 +-
.../transactions/TxDeadlockDetectionTest.java | 4 +-
...timisticDeadlockDetectionCrossCacheTest.java | 4 +-
.../TxOptimisticDeadlockDetectionTest.java | 4 +-
...simisticDeadlockDetectionCrossCacheTest.java | 4 +-
.../TxPessimisticDeadlockDetectionTest.java | 4 +-
...edEntryPartitionedAtomicOffHeapSelfTest.java | 4 +-
...PartitionedTransactionalOffHeapSelfTest.java | 4 +-
...nedEntryReplicatedAtomicOffHeapSelfTest.java | 4 +-
...yReplicatedTransactionalOffHeapSelfTest.java | 4 +-
.../clock/GridTimeSyncProcessorSelfTest.java | 4 +-
.../closure/GridClosureProcessorRemoteTest.java | 2 +-
.../closure/GridClosureProcessorSelfTest.java | 4 +-
.../closure/GridClosureSerializationTest.java | 4 +-
.../cluster/GridAddressResolverSelfTest.java | 6 +-
...ComputeJobExecutionErrorToLogManualTest.java | 4 +-
.../compute/PublicThreadpoolStarvationTest.java | 4 +-
.../continuous/GridEventConsumeSelfTest.java | 4 +-
.../continuous/GridMessageListenSelfTest.java | 4 +-
.../IgniteNoCustomEventsOnNodeStart.java | 4 +-
.../DataStreamProcessorSelfTest.java | 10 +-
.../datastreamer/DataStreamerImplSelfTest.java | 4 +-
.../DataStreamerMultiThreadedSelfTest.java | 4 +-
.../DataStreamerMultinodeCreateCacheTest.java | 4 +-
.../datastreamer/DataStreamerTimeoutTest.java | 4 +-
.../DataStreamerUpdateAfterLoadTest.java | 4 +-
.../IgniteDataStreamerPerformanceTest.java | 4 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 6 +-
.../igfs/IgfsBackupFailoverSelfTest.java | 13 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 4 +-
.../processors/igfs/IgfsCacheSelfTest.java | 4 +-
.../processors/igfs/IgfsCommonAbstractTest.java | 8 +-
.../igfs/IgfsDataManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMaxSizeSelfTest.java | 6 +-
.../igfs/IgfsMetaManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 4 +-
.../processors/igfs/IgfsModesSelfTest.java | 4 +-
.../processors/igfs/IgfsOneClientNodeTest.java | 4 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 4 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 4 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsSizeSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 2 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../processors/igfs/IgfsTaskSelfTest.java | 2 +-
.../IgfsAbstractRecordResolverSelfTest.java | 2 +-
...niteMessagingConfigVariationFullApiTest.java | 6 +-
.../odbc/OdbcProcessorValidationSelfTest.java | 2 +-
.../service/ClosureServiceClientsNodesTest.java | 10 +-
.../service/GridServiceClientNodeTest.java | 4 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
...GridServiceProxyClientReconnectSelfTest.java | 6 +-
.../GridServiceProxyNodeStopSelfTest.java | 4 +-
.../GridServiceSerializationSelfTest.java | 6 +-
...gniteServiceConfigVariationsFullApiTest.java | 4 +-
...yment2ClassLoadersDefaultMarshallerTest.java | 18 +-
...oymentClassLoadingDefaultMarshallerTest.java | 16 +-
.../IgniteServiceDynamicCachesSelfTest.java | 4 +-
...gniteServiceProxyTimeoutInitializedTest.java | 6 +-
.../service/IgniteServiceReassignmentTest.java | 4 +-
.../ServicePredicateAccessCacheTest.java | 4 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 6 +-
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +-
.../internal/util/nio/GridNioSelfTest.java | 2 +-
.../internal/util/nio/GridNioSslSelfTest.java | 2 +-
.../nio/IgniteExceptionInNioWorkerSelfTest.java | 4 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 4 +-
.../communication/GridIoManagerBenchmark0.java | 4 +-
.../GridTcpCommunicationBenchmark.java | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
.../multisplit/GridMultiSplitsLoadTest.java | 4 +-
.../GridMultiSplitsRedeployLoadTest.java | 2 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 8 +-
.../GridSingleSplitsRedeployLoadTest.java | 2 +-
.../direct/session/GridSessionLoadTest.java | 2 +-
.../direct/stealing/GridStealingLoadTest.java | 4 +-
.../ignite/loadtests/job/GridJobLoadTest.java | 6 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
...namicProxySerializationMultiJvmSelfTest.java | 4 +-
.../marshaller/GridMarshallerAbstractTest.java | 15 +-
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
...GridMessagingNoPeerClassLoadingSelfTest.java | 4 +-
.../ignite/messaging/GridMessagingSelfTest.java | 4 +-
.../IgniteMessagingWithClientTest.java | 6 +-
.../p2p/GridAbstractMultinodeRedeployTest.java | 4 +-
.../GridP2PContinuousDeploymentSelfTest.java | 18 +-
.../GridP2PDifferentClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PDoubleDeploymentSelfTest.java | 4 +-
.../p2p/GridP2PHotRedeploymentSelfTest.java | 4 +-
.../p2p/GridP2PJobClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PLocalDeploymentSelfTest.java | 4 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 4 +-
.../ignite/p2p/GridP2PNodeLeftSelfTest.java | 4 +-
.../p2p/GridP2PRecursionTaskSelfTest.java | 4 +-
.../p2p/GridP2PRemoteClassLoadersSelfTest.java | 4 +-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 4 +-
.../ignite/p2p/GridP2PTimeoutSelfTest.java | 4 +-
.../ignite/p2p/GridP2PUndeploySelfTest.java | 6 +-
.../PlatformJavaObjectFactoryProxySelfTest.java | 2 +-
.../ignite/platform/PlatformStopIgniteTask.java | 10 +-
...SessionCancelSiblingsFromFutureSelfTest.java | 6 +-
...ridSessionCancelSiblingsFromJobSelfTest.java | 6 +-
...idSessionCancelSiblingsFromTaskSelfTest.java | 6 +-
.../GridSessionCheckpointAbstractSelfTest.java | 2 +-
.../GridSessionCollisionSpiSelfTest.java | 2 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 6 +-
...dSessionFutureWaitTaskAttributeSelfTest.java | 6 +-
.../session/GridSessionJobFailoverSelfTest.java | 4 +-
...GridSessionJobWaitTaskAttributeSelfTest.java | 6 +-
.../ignite/session/GridSessionLoadSelfTest.java | 4 +-
.../GridSessionSetFutureAttributeSelfTest.java | 6 +-
...nSetFutureAttributeWaitListenerSelfTest.java | 6 +-
.../GridSessionSetJobAttributeSelfTest.java | 6 +-
...sionSetJobAttributeWaitListenerSelfTest.java | 6 +-
.../GridSessionSetTaskAttributeSelfTest.java | 6 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 6 +-
.../GridSessionWaitAttributeSelfTest.java | 8 +-
.../spi/GridSpiStartStopAbstractTest.java | 2 +-
.../spi/GridTcpSpiForwardingSelfTest.java | 10 +-
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../GridAbstractCommunicationSelfTest.java | 4 +-
.../communication/GridCacheMessageSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../GridTcpCommunicationSpiAbstractTest.java | 4 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 4 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 2 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 4 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 4 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 4 +-
.../tcp/IgniteCacheSslStartStopSelfTest.java | 4 +-
...CommunicationRecoveryAckClosureSelfTest.java | 4 +-
.../discovery/AbstractDiscoverySelfTest.java | 2 +-
...gniteClientReconnectMassiveShutdownTest.java | 4 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 6 +-
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 4 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 16 +-
.../tcp/TcpDiscoveryConcurrentStartTest.java | 4 +-
.../TcpDiscoveryMarshallerCheckSelfTest.java | 4 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +-
...DiscoveryNodeConfigConsistentIdSelfTest.java | 6 +-
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 4 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 36 ++--
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 4 +-
.../tcp/TcpDiscoverySpiConfigSelfTest.java | 2 +-
.../tcp/TcpDiscoverySpiWildcardSelfTest.java | 4 +-
.../discovery/tcp/TcpDiscoverySslSelfTest.java | 4 +-
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 2 +-
.../GridInternalTasksLoadBalancingSelfTest.java | 6 +-
.../GridSwapSpaceSpiConsistencySelfTest.java | 12 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../noop/GridNoopSwapSpaceSpiSelfTest.java | 4 +-
.../ignite/startup/GridVmNodesStarter.java | 4 +-
.../stream/socket/SocketStreamerSelfTest.java | 4 +-
.../ignite/testframework/GridTestNode.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 10 +-
.../configvariations/ConfigFactory.java | 8 +-
.../ConfigVariationsFactory.java | 6 +-
.../testframework/junits/GridAbstractTest.java | 185 ++++++++++---------
...IgniteCacheConfigVariationsAbstractTest.java | 12 +-
.../IgniteConfigVariationsAbstractTest.java | 12 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 15 +-
.../common/GridRollingRestartAbstractTest.java | 6 +-
.../junits/multijvm/IgniteProcessProxy.java | 51 ++---
.../junits/spi/GridSpiAbstractConfigTest.java | 2 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../util/AttributeNodeFilterSelfTest.java | 4 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +-
.../h2/GridBinaryH2IndexingGeoSelfTest.java | 4 +-
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 2 +-
.../hadoop/shuffle/HadoopShuffle.java | 2 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 6 +-
.../HadoopEmbeddedTaskExecutor.java | 2 +-
.../taskexecutor/HadoopExecutorService.java | 10 +-
.../external/HadoopExternalTaskExecutor.java | 2 +-
.../HadoopExternalCommunication.java | 20 +-
.../impl/HadoopAbstractMapReduceTest.java | 6 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 10 +-
.../hadoop/impl/HadoopGroupingTest.java | 4 +-
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 4 +-
.../impl/HadoopMapReduceEmbeddedSelfTest.java | 4 +-
.../impl/HadoopNoHadoopMapReduceTest.java | 4 +-
.../hadoop/impl/HadoopSortingExternalTest.java | 8 +-
.../hadoop/impl/HadoopSortingTest.java | 4 +-
.../impl/HadoopTaskExecutionSelfTest.java | 4 +-
.../hadoop/impl/HadoopTeraSortTest.java | 4 +-
.../hadoop/impl/HadoopValidationSelfTest.java | 4 +-
.../HadoopClientProtocolEmbeddedSelfTest.java | 4 +-
...opClientProtocolMultipleServersSelfTest.java | 4 +-
.../impl/igfs/Hadoop1DualAbstractTest.java | 6 +-
.../igfs/HadoopFIleSystemFactorySelfTest.java | 2 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 28 +--
...Igfs20FileSystemLoopbackPrimarySelfTest.java | 4 +-
...oopIgfs20FileSystemShmemPrimarySelfTest.java | 4 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 6 +-
...oopSecondaryFileSystemConfigurationTest.java | 22 +--
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 12 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 32 ++--
...niteHadoopFileSystemClientBasedOpenTest.java | 6 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 4 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 99 +++++-----
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 6 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 2 +-
...adoopFileSystemLoopbackAbstractSelfTest.java | 4 +-
...oopbackExternalToClientAbstractSelfTest.java | 4 +-
...condaryFileSystemInitializationSelfTest.java | 4 +-
...teHadoopFileSystemShmemAbstractSelfTest.java | 4 +-
...emShmemExternalToClientAbstractSelfTest.java | 4 +-
.../HadoopExternalTaskExecutionSelfTest.java | 16 +-
.../cache/hibernate/HibernateRegionFactory.java | 25 ++-
.../src/test/config/factory-cache1.xml | 2 +-
.../HibernateL2CacheConfigurationSelfTest.java | 20 +-
.../hibernate/HibernateL2CacheSelfTest.java | 24 +--
.../HibernateL2CacheTransactionalSelfTest.java | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
...CacheAbstractQueryDetailMetricsSelfTest.java | 4 +-
.../CacheAbstractQueryMetricsSelfTest.java | 4 +-
.../CacheBinaryKeyConcurrentQueryTest.java | 4 +-
.../cache/CacheIndexStreamerTest.java | 4 +-
.../CacheOffheapBatchIndexingBaseTest.java | 4 +-
.../cache/CacheQueryBuildValueTest.java | 4 +-
.../cache/CacheQueryNewClientSelfTest.java | 4 +-
.../CacheRandomOperationsMultithreadedTest.java | 4 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 6 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 6 +-
.../ClientReconnectAfterClusterRestartTest.java | 6 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +-
.../cache/GridCacheOffHeapSelfTest.java | 4 +-
.../GridCacheOffheapIndexEntryEvictTest.java | 4 +-
.../cache/GridCacheOffheapIndexGetSelfTest.java | 4 +-
.../GridCacheQueryIndexDisabledSelfTest.java | 4 +-
.../GridCacheQuerySerializationSelfTest.java | 4 +-
.../cache/GridCacheQuerySimpleBenchmark.java | 4 +-
.../processors/cache/GridCacheSwapSelfTest.java | 4 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 6 +-
.../IgniteBinaryObjectQueryArgumentsTest.java | 4 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 4 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 4 +-
.../IgniteCacheCollocatedQuerySelfTest.java | 4 +-
...acheConfigurationPrimitiveTypesSelfTest.java | 4 +-
.../IgniteCacheCrossCacheJoinRandomTest.java | 4 +-
...acheDistributedJoinCollocatedAndNotTest.java | 4 +-
...acheDistributedJoinCustomAffinityMapper.java | 4 +-
.../IgniteCacheDistributedJoinNoIndexTest.java | 4 +-
...ributedJoinPartitionedAndReplicatedTest.java | 4 +-
...CacheDistributedJoinQueryConditionsTest.java | 4 +-
.../cache/IgniteCacheDistributedJoinTest.java | 4 +-
...cheDuplicateEntityConfigurationSelfTest.java | 4 +-
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 4 +-
...teCacheFullTextQueryNodeJoiningSelfTest.java | 4 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 4 +-
...PartitionedAndReplicatedCollocationTest.java | 4 +-
...teCacheJoinPartitionedAndReplicatedTest.java | 4 +-
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 4 +-
.../cache/IgniteCacheLargeResultSelfTest.java | 4 +-
...eLockPartitionOnAffinityRunAbstractTest.java | 4 +-
...PartitionOnAffinityRunAtomicCacheOpTest.java | 4 +-
...titionOnAffinityRunWithCollisionSpiTest.java | 6 +-
.../cache/IgniteCacheNoClassQuerySelfTest.java | 4 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 4 +-
.../cache/IgniteCacheOffheapIndexScanTest.java | 4 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 4 +-
...IgniteCachePrimitiveFieldsQuerySelfTest.java | 4 +-
.../cache/IgniteCacheQueriesLoadTest1.java | 4 +-
.../IgniteCacheQueryH2IndexingLeakTest.java | 4 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 4 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +-
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 4 +-
.../IgniteCacheStarvationOnRebalanceTest.java | 4 +-
...ClientReconnectCacheQueriesFailoverTest.java | 4 +-
.../cache/IgniteClientReconnectQueriesTest.java | 4 +-
.../cache/IgniteCrossCachesJoinsQueryTest.java | 4 +-
.../cache/SqlFieldsQuerySelfTest.java | 4 +-
...lientQueryReplicatedNodeRestartSelfTest.java | 10 +-
...niteCacheDistributedQueryCancelSelfTest.java | 6 +-
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 6 +-
...artitionedFieldsQueryP2PEnabledSelfTest.java | 4 +-
...achePartitionedQueryP2PDisabledSelfTest.java | 4 +-
...cheQueryAbstractDistributedJoinSelfTest.java | 6 +-
.../near/IgniteCacheQueryNodeFailTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 4 +-
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 4 +-
...CacheReplicatedQueryP2PDisabledSelfTest.java | 4 +-
...eCacheLocalQueryCancelOrTimeoutSelfTest.java | 4 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 4 +-
.../query/IgniteSqlSplitterSelfTest.java | 4 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 4 +-
.../query/h2/sql/GridQueryParsingTest.java | 4 +-
.../FetchingQueryCursorStressTest.java | 2 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
.../cache/AbstractCacheJtaSelfTest.java | 8 +-
...CacheJtaConfigurationValidationSelfTest.java | 4 +-
...CacheJtaFactoryConfigValidationSelfTest.java | 4 +-
.../cache/GridJtaLifecycleAwareSelfTest.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 6 +-
.../log4j2/GridLog4j2CorrectFileNameTest.java | 6 +-
.../log4j2/GridLog4j2InitializedTest.java | 2 +-
.../logger/log4j2/Log4j2LoggerSelfTest.java | 6 +-
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 6 +-
.../IgniteAbstractOsgiContextActivator.java | 2 +-
.../activators/BasicIgniteTestActivator.java | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 17 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
.../scalar/tests/ScalarProjectionSpec.scala | 4 +-
.../schedule/IgniteScheduleProcessor.java | 2 +-
.../processors/schedule/ScheduleFutureImpl.java | 4 +-
.../org/apache/ignite/spark/IgniteContext.scala | 2 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 14 +-
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 6 +-
.../org/apache/ignite/spark/IgniteRDDSpec.scala | 14 +-
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 42 ++++-
.../spring/SpringTransactionManager.java | 50 +++--
.../src/test/config/jdbc-pojo-store-builtin.xml | 2 +-
.../src/test/config/jdbc-pojo-store-obj.xml | 2 +-
modules/spring/src/test/config/node1.xml | 2 +-
modules/spring/src/test/config/store-cache1.xml | 2 +-
.../src/test/java/config/ignite-test-config.xml | 2 +-
.../test/java/config/spring-transactions.xml | 2 +-
.../spring/GridSpringCacheManagerSelfTest.java | 6 +-
.../SpringCacheManagerContextInjectionTest.java | 2 +-
.../ignite/cache/spring/spring-caching.xml | 2 +-
.../store/jdbc/CachePojoStoreXmlSelfTest.java | 4 +-
.../ignite/internal/GridFactorySelfTest.java | 154 +++++++--------
.../GridSpringBeanSerializationSelfTest.java | 2 +-
.../internal/IgniteDynamicCacheConfigTest.java | 4 +-
.../GridSpringResourceInjectionSelfTest.java | 4 +-
.../GridTransformSpringInjectionSelfTest.java | 2 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +-
.../org/apache/ignite/spring-injection-test.xml | 2 +-
.../spring/injection/spring-resource.tmpl.xml | 2 +-
.../GridSpringTransactionManagerSelfTest.java | 6 +-
...gTransactionManagerContextInjectionTest.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 6 +-
.../scanners/UriDeploymentScannerManager.java | 12 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 6 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 4 +-
.../config/VisorConfigurationCommand.scala | 2 +-
.../visor/commands/node/VisorNodeCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 10 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 4 +-
.../commands/alert/VisorAlertCommandSpec.scala | 4 +-
.../cache/VisorCacheClearCommandSpec.scala | 4 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../cache/VisorCacheResetCommandSpec.scala | 4 +-
.../config/VisorConfigurationCommandSpec.scala | 4 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
.../disco/VisorDiscoveryCommandSpec.scala | 4 +-
.../events/VisorEventsCommandSpec.scala | 4 +-
.../visor/commands/gc/VisorGcCommandSpec.scala | 4 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 4 +-
.../ignite/console/demo/AgentClusterDemo.java | 4 +-
.../cache/websession/WebSessionFilter.java | 12 +-
.../servlet/ServletContextListenerStartup.java | 12 +-
.../ignite/startup/servlet/ServletStartup.java | 8 +-
.../internal/websession/WebSessionSelfTest.java | 21 ++-
.../ignite/yardstick/IgniteBenchmarkUtils.java | 2 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 10 +-
1251 files changed, 4046 insertions(+), 3844 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
index fefff9d..1bafbbb 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
@@ -67,13 +67,16 @@ public class GridifyAspectJAspect {
// Since annotations in Java don't allow 'null' as default value
// we have accept an empty string and convert it here.
// NOTE: there's unintended behavior when user specifies an empty
- // string as intended grid name.
- // NOTE: the 'ann.gridName() == null' check is added to mitigate
+ // string as intended Ignite instance name.
+ // NOTE: the 'ann.igniteInstanceName() == null' check is added to mitigate
// annotation bugs in some scripting languages (e.g. Groovy).
- String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName();
+ String igniteInstanceName = F.isEmpty(ann.igniteInstanceName()) ? ann.gridName() : ann.igniteInstanceName();
- if (G.state(gridName) != STARTED)
- throw new IgniteCheckedException("Grid is not locally started: " + gridName);
+ if (F.isEmpty(igniteInstanceName))
+ igniteInstanceName = null;
+
+ if (G.state(igniteInstanceName) != STARTED)
+ throw new IgniteCheckedException("Grid is not locally started: " + igniteInstanceName);
// Initialize defaults.
GridifyArgument arg = new GridifyArgumentAdapter(mtd.getDeclaringClass(), mtd.getName(),
@@ -91,7 +94,7 @@ public class GridifyAspectJAspect {
}
try {
- Ignite ignite = G.ignite(gridName);
+ Ignite ignite = G.ignite(igniteInstanceName);
// If task class was specified.
if (!ann.taskClass().equals(GridifyDefaultTask.class)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
index bf57742..0c93cf2 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
@@ -68,13 +68,16 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect
// Since annotations in Java don't allow 'null' as default value
// we have accept an empty string and convert it here.
// NOTE: there's unintended behavior when user specifies an empty
- // string as intended grid name.
- // NOTE: the 'ann.gridName() == null' check is added to mitigate
+ // string as intended Ignite instance name.
+ // NOTE: the 'ann.igniteInstanceName() == null' check is added to mitigate
// annotation bugs in some scripting languages (e.g. Groovy).
- String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName();
+ String igniteInstanceName = F.isEmpty(ann.igniteInstanceName()) ? ann.gridName() : ann.igniteInstanceName();
- if (G.state(gridName) != STARTED)
- throw new IgniteCheckedException("Grid is not locally started: " + gridName);
+ if (F.isEmpty(igniteInstanceName))
+ igniteInstanceName = null;
+
+ if (G.state(igniteInstanceName) != STARTED)
+ throw new IgniteCheckedException("Grid is not locally started: " + igniteInstanceName);
GridifyNodeFilter nodeFilter = null;
@@ -114,7 +117,7 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect
checkIsSplitToJobsAllowed(arg, ann);
try {
- Ignite ignite = G.ignite(gridName);
+ Ignite ignite = G.ignite(igniteInstanceName);
return execute(ignite.compute(), joinPnt.getSignature().getDeclaringType(), arg, nodeFilter,
ann.threshold(), ann.splitSize(), ann.timeout());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
index 283a0aa..a595aad 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
@@ -68,13 +68,16 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp
// Since annotations in Java don't allow 'null' as default value
// we have accept an empty string and convert it here.
// NOTE: there's unintended behavior when user specifies an empty
- // string as intended grid name.
- // NOTE: the 'ann.gridName() == null' check is added to mitigate
+ // string as intended Igninte instance name.
+ // NOTE: the 'ann.igniteInstanceName() == null' check is added to mitigate
// annotation bugs in some scripting languages (e.g. Groovy).
- String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName();
+ String igniteInstanceName = F.isEmpty(ann.igniteInstanceName()) ? ann.gridName() : ann.igniteInstanceName();
- if (G.state(gridName) != STARTED)
- throw new IgniteCheckedException("Grid is not locally started: " + gridName);
+ if (F.isEmpty(igniteInstanceName))
+ igniteInstanceName = null;
+
+ if (G.state(igniteInstanceName) != STARTED)
+ throw new IgniteCheckedException("Grid is not locally started: " + igniteInstanceName);
GridifyNodeFilter nodeFilter = null;
@@ -114,7 +117,7 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp
checkIsSplitToJobsAllowed(arg, ann);
try {
- Ignite ignite = G.ignite(gridName);
+ Ignite ignite = G.ignite(igniteInstanceName);
return execute(mtd, ignite.compute(), joinPnt.getSignature().getDeclaringType(), arg, nodeFilter,
ann.threshold(), ann.splitSize(), ann.timeout());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
index 6330ef1..f34ab28 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
@@ -66,13 +66,16 @@ public class GridifySetToSetSpringAspect extends GridifySetToSetAbstractAspect i
// Since annotations in Java don't allow 'null' as default value
// we have accept an empty string and convert it here.
// NOTE: there's unintended behavior when user specifies an empty
- // string as intended grid name.
- // NOTE: the 'ann.gridName() == null' check is added to mitigate
+ // string as intended Ignite instance name.
+ // NOTE: the 'ann.igniteInstanceName() == null' check is added to mitigate
// annotation bugs in some scripting languages (e.g. Groovy).
- String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName();
+ String igniteInstanceName = F.isEmpty(ann.igniteInstanceName()) ? ann.gridName() : ann.igniteInstanceName();
- if (G.state(gridName) != STARTED)
- throw new IgniteCheckedException("Grid is not locally started: " + gridName);
+ if (F.isEmpty(igniteInstanceName))
+ igniteInstanceName = null;
+
+ if (G.state(igniteInstanceName) != STARTED)
+ throw new IgniteCheckedException("Grid is not locally started: " + igniteInstanceName);
GridifyNodeFilter nodeFilter = null;
@@ -109,7 +112,7 @@ public class GridifySetToSetSpringAspect extends GridifySetToSetAbstractAspect i
checkIsSplitToJobsAllowed(arg, ann);
try {
- Ignite ignite = G.ignite(gridName);
+ Ignite ignite = G.ignite(igniteInstanceName);
return execute(ignite.compute(), invoc.getMethod().getDeclaringClass(), arg, nodeFilter,
ann.threshold(), ann.splitSize(), ann.timeout());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
index 05bf8d7..e845c5a 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
@@ -66,13 +66,16 @@ public class GridifySetToValueSpringAspect extends GridifySetToValueAbstractAspe
// Since annotations in Java don't allow 'null' as default value
// we have accept an empty string and convert it here.
// NOTE: there's unintended behavior when user specifies an empty
- // string as intended grid name.
- // NOTE: the 'ann.gridName() == null' check is added to mitigate
+ // string as intended Ignite instance name.
+ // NOTE: the 'ann.igniteInstanceName() == null' check is added to mitigate
// annotation bugs in some scripting languages (e.g. Groovy).
- String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName();
+ String igniteInstanceName = F.isEmpty(ann.igniteInstanceName()) ? ann.gridName() : ann.igniteInstanceName();
- if (G.state(gridName) != STARTED)
- throw new IgniteCheckedException("Grid is not locally started: " + gridName);
+ if (F.isEmpty(igniteInstanceName))
+ igniteInstanceName = null;
+
+ if (G.state(igniteInstanceName) != STARTED)
+ throw new IgniteCheckedException("Grid is not locally started: " + igniteInstanceName);
GridifyNodeFilter nodeFilter = null;
@@ -109,7 +112,7 @@ public class GridifySetToValueSpringAspect extends GridifySetToValueAbstractAspe
checkIsSplitToJobsAllowed(arg, ann);
try {
- Ignite ignite = G.ignite(gridName);
+ Ignite ignite = G.ignite(igniteInstanceName);
return execute(mtd, ignite.compute(), invoc.getMethod().getDeclaringClass(), arg, nodeFilter,
ann.threshold(), ann.splitSize(), ann.timeout());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
index 6d21d67..0ee6af1 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringAspect.java
@@ -65,13 +65,16 @@ public class GridifySpringAspect implements MethodInterceptor {
// Since annotations in Java don't allow 'null' as default value
// we have accept an empty string and convert it here.
// NOTE: there's unintended behavior when user specifies an empty
- // string as intended grid name.
- // NOTE: the 'ann.gridName() == null' check is added to mitigate
+ // string as intended Ignite instance name.
+ // NOTE: the 'ann.igniteInstanceName() == null' check is added to mitigate
// annotation bugs in some scripting languages (e.g. Groovy).
- String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName();
+ String igniteInstanceName = F.isEmpty(ann.igniteInstanceName()) ? ann.gridName() : ann.igniteInstanceName();
- if (G.state(gridName) != STARTED)
- throw new IgniteCheckedException("Grid is not locally started: " + gridName);
+ if (F.isEmpty(igniteInstanceName))
+ igniteInstanceName = null;
+
+ if (G.state(igniteInstanceName) != STARTED)
+ throw new IgniteCheckedException("Grid is not locally started: " + igniteInstanceName);
// Initialize defaults.
GridifyArgument arg = new GridifyArgumentAdapter(mtd.getDeclaringClass(), mtd.getName(),
@@ -88,7 +91,7 @@ public class GridifySpringAspect implements MethodInterceptor {
"Gridify.taskClass(), but not both: " + ann);
try {
- Ignite ignite = G.ignite(gridName);
+ Ignite ignite = G.ignite(igniteInstanceName);
if (!ann.taskClass().equals(GridifyDefaultTask.class))
return ignite.compute().withTimeout(ann.timeout()).execute(
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
index c3f7b9b..2008eff 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -49,8 +49,8 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
private DeploymentMode depMode = DeploymentMode.PRIVATE;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setDeploymentSpi(new LocalDeploymentSpi());
@@ -412,7 +412,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
// Create remote grid to execute test on.
Ignite locIgnite = startGrid();
- Ignite rmtIgnite = startGrid(getTestGridName() + "Remote");
+ Ignite rmtIgnite = startGrid(getTestIgniteInstanceName() + "Remote");
try {
AtomicInteger locDepCnt = new AtomicInteger(0);