You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2022/03/18 13:03:11 UTC
[ignite] branch master updated: IGNITE-16702 Checkstyle Indentation rule added (#9897)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 71ff768 IGNITE-16702 Checkstyle Indentation rule added (#9897)
71ff768 is described below
commit 71ff768ac98b3411fee876d42cad9689f1b16c2a
Author: Nikolay <ni...@apache.org>
AuthorDate: Fri Mar 18 16:02:26 2022 +0300
IGNITE-16702 Checkstyle Indentation rule added (#9897)
---
checkstyle/checkstyle.xml | 2 +
.../computegrid/ComputeBroadcastExample.java | 2 +-
.../CatboostClassificationModelParserExample.java | 4 +-
.../CatboostRegressionModelParserExample.java | 10 +-
.../gridify/GridifySingleSplitLoadTest.java | 8 +-
.../GridDhtPartitionsStateValidatorBenchmark.java | 6 +-
.../jol/FileStoreHeapUtilizationJolBenchmark.java | 10 +-
.../cassandra/common/PropertyMappingHelper.java | 11 +-
.../apache/ignite/tests/load/PersonGenerator.java | 12 +-
.../common/AbstractEventSecurityContextTest.java | 17 +-
.../ignite/common/NodeSslConnectionMetricTest.java | 4 +-
.../common/RunningQueryInfoCheckInitiatorTest.java | 24 +-
.../internal/client/ClientStartNodeTask.java | 14 +-
.../client/integration/ClientAbstractSelfTest.java | 3 +-
.../jdbc2/JdbcStatementBatchingSelfTest.java | 3 +-
...thenticatorUserManagementAuthorizationTest.java | 2 +-
.../ignite/jdbc/thin/JdbcThinBulkLoadSelfTest.java | 8 +-
.../JdbcThinCacheToJdbcDataTypesCoverageTest.java | 39 +-
.../jdbc/thin/JdbcThinDefaultTimeoutTest.java | 13 +-
.../thin/JdbcThinMissingLongArrayResultsTest.java | 6 +-
.../commandline/ClusterChangeTagCommand.java | 2 +-
.../diagnostic/ConnectivityCommand.java | 4 +-
.../encryption/EncryptionSubcommands.java | 2 +-
.../snapshot/SnapshotRestoreCommand.java | 8 +-
.../TracingConfigurationArguments.java | 2 +-
.../util/GridCommandHandlerMetadataTest.java | 11 +-
.../apache/ignite/util/GridCommandHandlerTest.java | 16 +-
.../util/PerformanceStatisticsCommandTest.java | 18 +-
.../ignite/compute/gridify/GridifySetToValue.java | 2 +-
.../ignite/internal/GridTaskSessionImpl.java | 2 +-
.../org/apache/ignite/internal/IgniteKernal.java | 2 +-
.../apache/ignite/internal/IgniteMXBeanImpl.java | 2 +-
.../ignite/internal/IgniteMessagingImpl.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../internal/binary/BinaryReaderHandles.java | 2 +-
.../ignite/internal/binary/BinaryWriterExImpl.java | 30 +-
.../ignite/internal/client/GridClientCompute.java | 2 +-
.../internal/client/thin/ReliableChannel.java | 2 +-
.../internal/executor/GridExecutorService.java | 10 +-
.../internal/jdbc/thin/ConnectionProperties.java | 2 +-
.../jdbc/thin/ConnectionPropertiesImpl.java | 73 +-
.../managers/communication/GridIoManager.java | 2 +-
.../managers/deployment/GridDeploymentManager.java | 2 +-
.../protocol/gg/GridProtocolHandler.java | 2 +-
.../optimized/OptimizedMarshallerUtils.java | 4 +-
.../affinity/HistoryAffinityAssignmentImpl.java | 2 +-
.../IgniteAuthenticationProcessor.java | 6 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../cache/CacheClientReconnectDiscoveryData.java | 2 +-
.../cache/CacheJoinNodeDiscoveryData.java | 2 +-
.../cache/CacheWeakQueryIteratorsHolder.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 45 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../cache/GridCachePartitionExchangeManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 51 +-
.../processors/cache/GridCacheSharedContext.java | 2 +-
.../processors/cache/IgniteCacheExpiryPolicy.java | 4 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 10 +-
.../processors/cache/IgniteCacheProxyImpl.java | 4 +-
.../dht/CacheDistributedGetFutureAdapter.java | 21 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 4 +-
.../distributed/dht/atomic/GridDhtAtomicCache.java | 16 +-
.../dht/atomic/GridNearAtomicUpdateResponse.java | 4 +-
.../dht/preloader/GridDhtPartitionDemander.java | 10 +-
.../cache/distributed/near/GridNearCacheEntry.java | 4 +-
.../cache/distributed/near/GridNearTxLocal.java | 30 +-
.../processors/cache/mvcc/txlog/TxLog.java | 16 +-
.../GridCacheDatabaseSharedManager.java | 31 +-
.../dumpprocessors/ToStringDumpProcessor.java | 6 +-
.../cache/persistence/file/AsyncFileIO.java | 4 +-
.../persistence/file/FilePageStoreManager.java | 17 +-
.../metastorage/MetastoragePageIOUtils.java | 49 +-
.../pagemem/DelayedPageReplacementTracker.java | 3 +-
.../cache/persistence/pagemem/PageMemoryEx.java | 18 +-
.../snapshot/SnapshotMetadataCollectorTask.java | 16 +-
.../snapshot/SnapshotResponseRemoteFutureTask.java | 31 +-
.../snapshot/SnapshotRestoreProcess.java | 24 +-
.../cache/persistence/tree/BPlusTree.java | 2 +-
.../cache/persistence/wal/crc/PureJavaCrc32.java | 1024 ++++++++++----------
.../wal/serializer/TxRecordSerializer.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 3 +-
.../cache/transactions/IgniteInternalTx.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 11 +-
.../cluster/GridClusterStateProcessor.java | 8 +-
.../processors/datastreamer/DataStreamerImpl.java | 2 +-
.../processors/odbc/ClientListenerNioListener.java | 2 +-
.../processors/odbc/jdbc/JdbcRequestHandler.java | 2 +-
.../platform/callback/PlatformCallbackGateway.java | 2 +-
.../client/cache/ClientCacheGetAllRequest.java | 2 +-
.../cache/ClientCacheQueryContinuousRequest.java | 4 +-
.../internal/processors/pool/PoolProcessor.java | 32 +-
.../processors/query/GridQueryProcessor.java | 10 +-
.../processors/query/SqlClientContext.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../handlers/top/GridTopologyCommandHandler.java | 8 +-
.../internal/processors/task/GridTaskWorker.java | 4 +-
.../apache/ignite/internal/util/IgniteUtils.java | 2 +-
.../internal/util/future/GridFutureAdapter.java | 2 +-
.../internal/util/ipc/IpcEndpointFactory.java | 2 +-
.../offheap/unsafe/GridUnsafePartitionedMap.java | 2 +-
.../util/tostring/GridToStringBuilder.java | 51 +-
.../internal/visor/cache/VisorCachePartitions.java | 4 +-
...orFindAndDeleteGarbageInPersistenceClosure.java | 8 +-
.../consistency/VisorConsistencyRepairTask.java | 2 +-
.../visor/misc/VisorClusterChangeTagTask.java | 6 +-
.../apache/ignite/mxbean/ClusterMetricsMXBean.java | 28 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 10 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 2 +-
.../tcp/internal/ConnectionClientPool.java | 2 +-
.../tcp/internal/InboundConnectionHandler.java | 4 +-
.../TcpCommunicationConfigInitializer.java | 2 +-
.../ignite/spi/discovery/DiscoverySpiMBean.java | 14 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 4 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../RebalanceAfterResettingLostPartitionTest.java | 15 +-
...finityFunctionBackupFilterAbstractSelfTest.java | 2 +-
...rNodeAttributeAffinityBackupFilterSelfTest.java | 2 +-
.../store/IgniteCacheExpiryStoreLoadSelfTest.java | 4 +-
.../ignite/internal/ClusterGroupAbstractTest.java | 6 +-
.../GridCacheHashMapPutAllWarningsTest.java | 6 +-
.../GridFailoverCustomTopologySelfTest.java | 4 +-
.../ignite/internal/GridListenActorSelfTest.java | 2 +-
.../GridTaskFutureImplStopGridSelfTest.java | 2 +-
.../internal/IgniteClientReconnectLockTest.java | 19 +-
.../IgniteExplicitImplicitDeploymentSelfTest.java | 310 +++---
.../internal/MemoryLeaksOnRestartNodeTest.java | 2 +-
.../internal/binary/BinaryObjectToStringTest.java | 20 +-
.../internal/cluster/IgniteClusterIdTagTest.java | 18 +-
.../IgniteMessageFactoryImplTest.java | 6 +-
.../affinity/GridAffinityAssignmentV2Test.java | 78 +-
.../AuthenticationConfigurationClusterTest.java | 8 +-
.../AuthenticationProcessorNodeRestartTest.java | 4 +-
.../AuthenticationProcessorSelfTest.java | 4 +-
.../cache/CacheNearReaderUpdateTest.java | 2 +-
.../cache/CacheNoAffinityExchangeTest.java | 8 +-
.../CacheStoreUsageMultinodeAbstractTest.java | 7 +-
.../cache/CacheValidatorMetricsTest.java | 8 +-
.../EntryVersionConsistencyReadThroughTest.java | 8 +-
...acheAtomicEntryProcessorDeploymentSelfTest.java | 2 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 2 +-
.../GridCacheQuerySqlFieldInlineSizeSelfTest.java | 8 +-
.../GridCacheValueConsistencyAbstractSelfTest.java | 8 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 8 +-
.../cache/IgniteClientCacheStartFailoverTest.java | 2 +-
.../cache/WithKeepBinaryCacheFullApiTest.java | 120 +--
.../cache/binary/BinaryMetadataRemoveTest.java | 8 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 8 +-
...IgniteExchangeLatchManagerDiscoHistoryTest.java | 40 +-
.../CacheClientsConcurrentStartTest.java | 2 +-
.../distributed/CacheDetectLostPartitionsTest.java | 14 +-
.../distributed/CacheRentingStateRepairTest.java | 22 +-
.../distributed/GridExchangeFreeSwitchTest.java | 17 +-
.../dht/GridCacheColocatedDebugTest.java | 2 +-
...GridCachePartitionedTopologyChangeSelfTest.java | 2 +-
...idCachePartitionsUpdateCountersAndSizeTest.java | 4 +-
...dCacheAtomicOnheapMultiNodeFullApiSelfTest.java | 4 +-
.../cache/mvcc/CacheMvccAbstractFeatureTest.java | 8 +-
.../cache/mvcc/CacheMvccClusterRestartTest.java | 2 +-
...eMvccIteratorWithConcurrentTransactionTest.java | 30 +-
...cLocalEntriesWithConcurrentTransactionTest.java | 30 +-
...MvccScanQueryWithConcurrentTransactionTest.java | 44 +-
...CacheMvccSizeWithConcurrentTransactionTest.java | 20 +-
.../IgnitePdsBinaryMetadataAsyncWritingTest.java | 2 +-
...IgnitePdsCacheWalDisabledOnRebalancingTest.java | 2 +-
.../cache/persistence/db/IgnitePdsWithTtlTest.java | 10 +-
.../IgniteCheckpointDirtyPagesForLowLoadTest.java | 15 +-
.../db/wal/IgniteWalFlushFailoverTest.java | 10 +-
.../db/wal/reader/IgniteWalReaderTest.java | 2 +-
.../pagemem/RobinHoodBackwardShiftHashMapTest.java | 66 +-
.../snapshot/IgniteClusterSnapshotCheckTest.java | 8 +-
.../snapshot/IgniteSnapshotMXBeanTest.java | 5 +-
.../IgniteChangeGlobalStateTest.java | 12 +-
.../IgniteNoParrallelClusterIsAllowedTest.java | 2 +-
.../join/JoinActiveNodeToActiveCluster.java | 6 +-
.../cache/query/CacheScanQueryFailoverTest.java | 8 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 2 +-
.../CacheContinuousQueryRandomOperationsTest.java | 4 +-
...ontinuousWithTransformerReplicatedSelfTest.java | 2 +-
.../GridCacheContinuousQueryAbstractSelfTest.java | 6 +-
...niteCacheContinuousQueryImmutableEntryTest.java | 2 +-
...gniteCacheContinuousQueryNoUnsubscribeTest.java | 2 +-
.../cache/transactions/DepthFirstSearchTest.java | 165 ++--
.../processors/cache/warmup/WarmUpSelfTest.java | 4 +-
.../IgniteComputeCustomExecutorSelfTest.java | 14 +-
.../processors/database/BPlusTreeSelfTest.java | 2 +-
.../odbc/OdbcEscapeSequenceSelfTest.java | 72 +-
.../PerformanceStatisticsSelfTest.java | 20 +-
...tinuousQueryRemoteSecurityContextCheckTest.java | 2 +-
...mentDiscoveryListenerNotificationOrderTest.java | 180 ++--
.../internal/util/collection/BitSetIntSetTest.java | 66 +-
.../lang/GridMetadataAwareAdapterLoadTest.java | 4 +-
.../ignite/loadtests/cache/GridCacheLoadTest.java | 6 +-
...GridBoundedConcurrentLinkedHashSetLoadTest.java | 10 +-
.../security/SecurityPermissionSetBuilderTest.java | 38 +-
...dJobStealingCollisionSpiAttributesSelfTest.java | 32 +-
.../communication/GridCacheMessageSelfTest.java | 8 +-
.../tcp/TcpCommunicationSpiMultiJvmTest.java | 12 +-
.../FilterDataForClientNodeDiscoveryTest.java | 10 +-
.../tcp/TcpDiscoveryNetworkIssuesTest.java | 2 +-
.../tcp/TcpDiscoveryWithWrongServerTest.java | 4 +-
.../SocketStreamerUnmarshalVulnerabilityTest.java | 2 +-
.../testframework/MessageOrderLogListener.java | 8 +-
.../ignite/testframework/MvccFeatureChecker.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 3 +-
.../junits/common/GridCommonAbstractTest.java | 18 +-
.../common/GridCommonAbstractTestSelfTest.java | 99 +-
.../testframework/wal/record/RecordUtils.java | 161 +--
.../IgniteCacheIteratorsSelfTestSuite.java | 2 +-
.../ignite/thread/ThreadPoolMetricsTest.java | 48 +-
.../p2p/compute/AveragePersonSalaryCallable.java | 4 +-
.../cache/hibernate/HibernateL2CacheSelfTest.java | 2 +-
.../processors/query/h2/H2PooledConnection.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../processors/query/h2/twostep/SortedReducer.java | 2 +-
.../query/h2/twostep/UnsortedReducer.java | 2 +-
.../stat/IgniteStatisticsConfigurationManager.java | 44 +-
.../query/stat/IgniteStatisticsManagerImpl.java | 2 +-
.../visor/verify/ValidateIndexesClosure.java | 23 +-
.../ignite/cache/query/IndexQueryFailoverTest.java | 77 +-
.../cache/query/IndexQueryWrongIndexTest.java | 4 +-
.../cache/BinaryTypeMismatchLoggingTest.java | 7 +-
.../cache/CacheIteratorScanQueryTest.java | 2 +-
.../CacheRandomOperationsMultithreadedTest.java | 2 +-
.../IgniteBinaryObjectQueryArgumentsTest.java | 2 +-
...niteBinaryWrappedObjectFieldsQuerySelfTest.java | 3 +-
.../IgniteCacheAbstractInsertSqlQuerySelfTest.java | 15 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 12 +-
.../IgniteCacheConfigVariationsQueryTest.java | 8 +-
.../cache/IgniteCacheSqlQueryErrorSelfTest.java | 2 +-
.../QueryJoinWithDifferentNodeFiltersTest.java | 2 +-
.../cache/index/H2DynamicTableSelfTest.java | 2 +-
...ransactionsCommandsWithMvccEnabledSelfTest.java | 10 +-
.../cache/index/SqlTransactionsSelfTest.java | 10 +-
...cheMvccSqlTxQueriesWithReducerAbstractTest.java | 2 +-
.../cache/mvcc/MvccRepeatableReadBulkOpsTest.java | 10 +-
.../db/LongDestroyDurableBackgroundTaskTest.java | 8 +-
.../persistence/db/wal/IgniteWalRecoveryTest.java | 43 +-
.../query/CreateIndexOnInvalidDataTypeTest.java | 14 +-
.../query/IgniteQueryDedicatedPoolTest.java | 9 +-
.../internal/processors/query/LazyOnDmlTest.java | 2 +-
.../query/MemLeakOnSqlWithClientReconnectTest.java | 23 +-
...SqlFieldTypeValidationOnKeyValueInsertTest.java | 5 +-
.../h2/GridSubqueryJoinOptimizerSelfTest.java | 2 +-
.../inlinecolumn/ComputeInlineSizeTest.java | 28 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 122 +--
.../processors/query/stat/BusyExecutorTest.java | 2 +-
.../query/stat/SqlStatisticsCommandTests.java | 7 +-
.../ignite/logger/log4j2/Log4j2LoggerSelfTest.java | 5 +-
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 5 +-
.../org/apache/ignite/mesos/ClusterProperties.java | 2 +-
.../ml/catboost/CatboostClassificationModel.java | 12 +-
.../ml/catboost/CatboostRegressionModel.java | 12 +-
.../ml/catboost/CatboostRegressionModelParser.java | 5 +-
.../ignite/ml/clustering/kmeans/KMeansModel.java | 61 +-
.../PredictionsAggregator.java | 11 +-
.../ignite/ml/knn/ann/ANNClassificationModel.java | 8 +-
.../ml/math/distances/BrayCurtisDistance.java | 58 +-
.../ignite/ml/math/distances/CanberraDistance.java | 60 +-
.../ignite/ml/math/distances/DistanceMeasure.java | 27 +-
.../ml/math/distances/JensenShannonDistance.java | 102 +-
.../math/distances/WeightedMinkowskiDistance.java | 118 +--
.../encoding/target/TargetCounter.java | 80 +-
.../encoding/target/TargetEncodingMeta.java | 44 +-
.../regressions/linear/LinearRegressionModel.java | 29 +-
.../logistic/LogisticRegressionModel.java | 55 +-
.../ignite/ml/structures/LabeledVectorSet.java | 4 +-
.../ml/svm/SVMLinearClassificationModel.java | 54 +-
.../ml/trainers/AdaptableDatasetTrainer.java | 2 +-
.../apache/ignite/ml/tree/DecisionTreeNode.java | 19 +-
.../apache/ignite/ml/common/ExternalizeTest.java | 2 +-
.../impl/local/LocalDatasetBuilderTest.java | 26 +-
.../ml/dataset/primitive/SimpleDatasetTest.java | 12 +-
.../primitive/SimpleLabeledDatasetTest.java | 12 +-
.../ml/environment/LearningEnvironmentTest.java | 10 +-
.../ml/math/distances/BrayCurtisDistanceTest.java | 128 +--
.../ml/math/distances/CanberraDistanceTest.java | 128 +--
.../math/distances/JensenShannonDistanceTest.java | 132 +--
.../distances/WeightedMinkowskiDistanceTest.java | 146 +--
.../vector/DenseVectorConstructorTest.java | 50 +-
.../primitives/vector/VectorNormCasesTest.java | 142 +--
.../math/primitives/vector/VectorToMatrixTest.java | 16 +-
.../binarization/BinarizationPreprocessorTest.java | 4 +-
.../encoding/FrequencyEncoderPreprocessorTest.java | 38 +-
.../encoding/OneHotEncoderPreprocessorTest.java | 67 +-
.../encoding/StringEncoderPreprocessorTest.java | 38 +-
.../encoding/TargetEncoderPreprocessorTest.java | 64 +-
.../imputing/ImputerPreprocessorTest.java | 4 +-
.../MinMaxScalerPreprocessorTest.java | 4 +-
.../NormalizationPreprocessorTest.java | 4 +-
.../paramgrid/ParameterSetGeneratorTest.java | 2 +-
.../BinaryClassificationMetricsTest.java | 12 +-
.../metric/regression/RegressionMetricsTest.java | 12 +-
.../internal/mem/NumaAllocatorBasicTest.java | 2 +-
.../ignite/TracingConfigurationValidationTest.java | 4 +-
.../spring/IgniteExcludeInConfigurationTest.java | 4 +-
.../internal/websession/WebSessionSelfTest.java | 2 +-
.../yardstick/cache/CacheEntryEventAsyncProbe.java | 2 +-
.../cache/IgniteCreateIndexBenchmark.java | 2 +-
.../jdbc/vendors/BaseSelectRangeBenchmark.java | 2 +-
.../yarn/IgniteApplicationMasterSelfTest.java | 4 +-
.../zk/internal/ZkDiscoveryEventsData.java | 2 +-
.../zk/internal/ZkDiscoveryNodeLeaveEventData.java | 2 +-
.../zk/internal/ZookeeperDiscoveryImpl.java | 56 +-
305 files changed, 3304 insertions(+), 3366 deletions(-)
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 4c407e7..36984f4 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -183,6 +183,8 @@
<property name="checks" value="Javadoc"/>
<property name="files" value="BCrypt\.java|HLL\.java|HLLMetadata\.java|HLLType\.java|BigEndianAscendingWordSerializer\.java|NumberUtil\.java|SchemaVersionOne\.java|BigEndianAscendingWordDeserializer\.java|CacheView\.java|ConcurrentLinkedDeque8\.java|ConcurrentHashMap8\.java|ConcurrentLinkedHashMap\.java"/>
</module>
+
+ <module name="Indentation" />
</module>
<!--
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
index 3009392..8012991 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeBroadcastExample.java
@@ -49,7 +49,7 @@ public class ComputeBroadcastExample {
// Gather system info from all nodes.
gatherSystemInfo(ignite);
- }
+ }
}
/**
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostClassificationModelParserExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostClassificationModelParserExample.java
index 093469a..ecf73f4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostClassificationModelParserExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostClassificationModelParserExample.java
@@ -97,7 +97,7 @@ public class CatboostClassificationModelParserExample {
String[] values = testDataStr.split(",");
for (int i = 0; i < columns.length; i++) {
- testObj.put(columns[i], Double.valueOf(values[i]));
+ testObj.put(columns[i], Double.valueOf(values[i]));
}
double prediction = mdl.predict(VectorUtils.of(testObj)).get();
@@ -110,5 +110,5 @@ public class CatboostClassificationModelParserExample {
finally {
System.out.flush();
}
- }
+ }
}
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostRegressionModelParserExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostRegressionModelParserExample.java
index 3e5e258..ac1f979 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostRegressionModelParserExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/catboost/CatboostRegressionModelParserExample.java
@@ -84,7 +84,7 @@ public class CatboostRegressionModelParserExample {
try (Model<NamedVector, Future<Double>> mdl = mdlBuilder.build(reader, parser);
Scanner testDataScanner = new Scanner(testData);
Scanner testExpResultsScanner = new Scanner(testExpRes)) {
- String[] columns = new String[]{
+ String[] columns = new String[] {
"f_0",
"f_1",
"f_2",
@@ -117,9 +117,9 @@ public class CatboostRegressionModelParserExample {
System.out.println("Expected: " + expPrediction + ", prediction: " + prediction);
}
}
+ }
+ finally {
+ System.out.flush();
+ }
}
- finally {
- System.out.flush();
- }
- }
}
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
index 05cc63e..f8d0499 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -60,13 +60,13 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration();
/* Uncomment following code if you start it manually. */
- CommunicationSpi commSpi = new TcpCommunicationSpi();
+ CommunicationSpi commSpi = new TcpCommunicationSpi();
- cfg.setCommunicationSpi(commSpi);
+ cfg.setCommunicationSpi(commSpi);
- DiscoverySpi discoSpi = new TcpDiscoverySpi();
+ DiscoverySpi discoSpi = new TcpDiscoverySpi();
- cfg.setDiscoverySpi(discoSpi);
+ cfg.setDiscoverySpi(discoSpi);
/*
*/
@SuppressWarnings("TypeMayBeWeakened")
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
index 935bda9..2bdd40c 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
@@ -121,10 +121,12 @@ public class GridDhtPartitionsStateValidatorBenchmark extends JmhAbstractBenchma
Map<Integer, Long> cacheSizesMap = new HashMap<>();
- IntStream.range(0, PARTS).forEach(k -> { localPartitions.add(partitionMock(k, k + 1, k + 1));
+ IntStream.range(0, PARTS).forEach(k -> {
+ localPartitions.add(partitionMock(k, k + 1, k + 1));
long us = k > 20 && k <= 30 ? 0 : k + 2L;
updateCountersMap.put(k, new T2<>(k + 2L, us));
- cacheSizesMap.put(k, us); });
+ cacheSizesMap.put(k, us);
+ });
Mockito.when(topologyMock.localPartitions()).thenReturn(localPartitions);
Mockito.when(topologyMock.currentLocalPartitions()).thenReturn(localPartitions);
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
index 82dd5ca..ffc7b50 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
@@ -137,10 +137,12 @@ public class FileStoreHeapUtilizationJolBenchmark {
Ignition.stop(name, true);
- return new HashMap<TestResultParameterInfo, Comparable>() {{
- put(HEAP_USAGE_PARAM, layout.totalSize());
- put(CACHE_WORK_TIME_PARAM, time);
- }};
+ HashMap<TestResultParameterInfo, Comparable> res = new HashMap<>();
+
+ res.put(HEAP_USAGE_PARAM, layout.totalSize());
+ res.put(CACHE_WORK_TIME_PARAM, time);
+
+ return res;
}
/** */
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
index 5cff53e..9f6d457 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
@@ -42,7 +42,9 @@ public class PropertyMappingHelper {
private static final Class BYTES_ARRAY_CLASS = (new byte[] {}).getClass();
/** Mapping from Java to Cassandra types. */
- private static final Map<Class, DataType.Name> JAVA_TO_CASSANDRA_MAPPING = new HashMap<Class, DataType.Name>() {{
+ private static final Map<Class, DataType.Name> JAVA_TO_CASSANDRA_MAPPING = new HashMap<Class, DataType.Name>();
+
+ static {
put(String.class, DataType.Name.TEXT);
put(Integer.class, DataType.Name.INT);
put(int.class, DataType.Name.INT);
@@ -63,7 +65,12 @@ public class PropertyMappingHelper {
put(Date.class, DataType.Name.TIMESTAMP);
put(UUID.class, DataType.Name.UUID);
put(BigInteger.class, DataType.Name.VARINT);
- }};
+ }
+
+ /** */
+ private static void put(Class cls, DataType.Name name) {
+ JAVA_TO_CASSANDRA_MAPPING.put(cls, name);
+ }
/**
* Maps Cassandra type to specified Java type.
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
index 9a248ad..054c166 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
@@ -30,11 +30,13 @@ public class PersonGenerator implements Generator {
private static final Date DATE = new Date();
/** */
- private static final List<String> PHONES = new LinkedList<String>() {{
- add("1234567");
- add("7654321");
- add("1289054");
- }};
+ private static final List<String> PHONES = new LinkedList<String>();
+
+ static {
+ PHONES.add("1234567");
+ PHONES.add("7654321");
+ PHONES.add("1289054");
+ }
/** {@inheritDoc} */
@Override public Object generate(long i) {
diff --git a/modules/clients/src/test/java/org/apache/ignite/common/AbstractEventSecurityContextTest.java b/modules/clients/src/test/java/org/apache/ignite/common/AbstractEventSecurityContextTest.java
index a994908..8a6955d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/common/AbstractEventSecurityContextTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/common/AbstractEventSecurityContextTest.java
@@ -140,17 +140,16 @@ public abstract class AbstractEventSecurityContextTest extends AbstractSecurityT
String expLogin
) throws Exception {
assertTrue(waitForCondition(() -> {
- Collection<Event> evts = LISTENED_EVTS.get(node);
+ Collection<Event> evts = LISTENED_EVTS.get(node);
- if (evts == null)
- return false;
+ if (evts == null)
+ return false;
- return evts.stream()
- .map(Event::type)
- .collect(Collectors.toList())
- .containsAll(expEvtTypes);
- },
- getTestTimeout()));
+ return evts.stream()
+ .map(Event::type)
+ .collect(Collectors.toList())
+ .containsAll(expEvtTypes);
+ }, getTestTimeout()));
assertTrue(LISTENED_EVTS.get(node).stream()
.map(evt -> {
diff --git a/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java b/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java
index 149be86..cec78cc 100644
--- a/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java
@@ -358,7 +358,7 @@ public class NodeSslConnectionMetricTest extends GridCommonAbstractTest {
String cipherSuite,
String protocol
) throws Exception {
- return getConfiguration(getTestIgniteInstanceName(idx))
+ return getConfiguration(getTestIgniteInstanceName(idx))
.setSslContextFactory(sslContextFactory(keyStore, trustStore, cipherSuite, protocol))
.setClientMode(client);
}
@@ -384,7 +384,7 @@ public class NodeSslConnectionMetricTest extends GridCommonAbstractTest {
String cipherSuite,
String protocol
) {
- return new ClientConfiguration()
+ return new ClientConfiguration()
.setAddresses("127.0.0.1:10800")
.setSslMode(SslMode.REQUIRED)
.setSslContextFactory(sslContextFactory(keyStore, trustStore, cipherSuite, protocol));
diff --git a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
index ff3f160..88dd1b7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
@@ -255,21 +255,21 @@ public class RunningQueryInfoCheckInitiatorTest extends JdbcThinAbstractSelfTest
final AtomicBoolean end = new AtomicBoolean();
IgniteInternalFuture f = GridTestUtils.runAsync(() -> {
- try (Connection conn = DriverManager.getConnection(
- "jdbc:ignite:thin://127.0.0.1:" + clientPort(grid(0)) + "/?user=ignite&password=ignite")) {
- try (Statement stmt = conn.createStatement()) {
- stmt.execute("CREATE TABLE T (ID INT PRIMARY KEY, VAL INT)");
+ try (Connection conn = DriverManager.getConnection(
+ "jdbc:ignite:thin://127.0.0.1:" + clientPort(grid(0)) + "/?user=ignite&password=ignite")) {
+ try (Statement stmt = conn.createStatement()) {
+ stmt.execute("CREATE TABLE T (ID INT PRIMARY KEY, VAL INT)");
- stmt.execute("SET STREAMING ON");
+ stmt.execute("SET STREAMING ON");
- for (int i = 0; !end.get(); ++i)
- stmt.execute("INSERT INTO T VALUES(" + i + " , 0)");
- }
- }
- catch (SQLException e) {
- log.error("Unexpected exception", e);
+ for (int i = 0; !end.get(); ++i)
+ stmt.execute("INSERT INTO T VALUES(" + i + " , 0)");
}
- });
+ }
+ catch (SQLException e) {
+ log.error("Unexpected exception", e);
+ }
+ });
Consumer<String> initiatorChecker = initiatorId -> {
assertTrue("Invalid initiator ID: " + initiatorId,
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
index d22780d..666e501 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
@@ -53,12 +53,14 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ
/**
* Available node's configurations.
*/
- private static final Map<String, String> NODE_CFG = new HashMap<String, String>() {{
- put("tcp", "modules/clients/src/test/resources/spring-server-node.xml");
- put("http", "modules/clients/src/test/resources/spring-server-node.xml");
- put("tcp+ssl", "modules/clients/src/test/resources/spring-server-ssl-node.xml");
- put("http+ssl", "modules/clients/src/test/resources/spring-server-ssl-node.xml");
- }};
+ private static final Map<String, String> NODE_CFG = new HashMap<>();
+
+ static {
+ NODE_CFG.put("tcp", "modules/clients/src/test/resources/spring-server-node.xml");
+ NODE_CFG.put("http", "modules/clients/src/test/resources/spring-server-node.xml");
+ NODE_CFG.put("tcp+ssl", "modules/clients/src/test/resources/spring-server-ssl-node.xml");
+ NODE_CFG.put("http+ssl", "modules/clients/src/test/resources/spring-server-ssl-node.xml");
+ }
/** */
@LoggerResource
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index d137855..789119c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -598,8 +598,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
*/
private static class SleepTestTask extends ComputeTaskSplitAdapter<List<String>, Integer> {
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int gridSize, List<String> list)
- {
+ @Override protected Collection<? extends ComputeJob> split(int gridSize, List<String> list) {
Collection<ComputeJobAdapter> jobs = new ArrayList<>();
if (list != null)
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java
index 2f1c27c..05c0c6c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java
@@ -83,8 +83,7 @@ public class JdbcStatementBatchingSelfTest extends JdbcAbstractDmlStatementSelfT
*/
@Test
public void testErrorAmidstBatch() throws SQLException {
- BatchUpdateException reason = (BatchUpdateException)
- GridTestUtils.assertThrows(log,
+ BatchUpdateException reason = (BatchUpdateException)GridTestUtils.assertThrows(log,
new Callable<Object>() {
@Override public Object call() throws Exception {
try (Statement stmt = conn.createStatement()) {
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticatorUserManagementAuthorizationTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticatorUserManagementAuthorizationTest.java
index 5b2e9fd..9b72d99 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticatorUserManagementAuthorizationTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticatorUserManagementAuthorizationTest.java
@@ -91,7 +91,7 @@ public class JettyRestProcessorAuthenticatorUserManagementAuthorizationTest exte
String pwdParam,
String expErr
) throws Exception {
- JsonNode res = JSON_MAPPER.readTree(content(null, cmd,
+ JsonNode res = JSON_MAPPER.readTree(content(null, cmd,
"ignite.login", login,
"ignite.password", pwd,
"user", loginParam,
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinBulkLoadSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinBulkLoadSelfTest.java
index 3e28261..1442b01 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinBulkLoadSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinBulkLoadSelfTest.java
@@ -824,10 +824,10 @@ public class JdbcThinBulkLoadSelfTest extends JdbcThinAbstractDmlStatementSelfTe
(csvCharsetName != null)
? new WrongCharsetRecoder(csvCharsetName, stmtCharsetName)
: new IgniteClosure<String, String>() {
- @Override public String apply(String input) {
- return input;
- }
- };
+ @Override public String apply(String input) {
+ return input;
+ }
+ };
int cnt = 0;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
index 62647a3..b250d71 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
@@ -522,16 +522,16 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes
try {
if (writeSyncMode == CacheWriteSynchronizationMode.FULL_ASYNC &&
!waitForCondition(new GridAbsPredicateX() {
- @Override public boolean applyx() throws IgniteCheckedException {
- try {
- return !stmt.executeQuery().next();
- }
- catch (SQLException e) {
- throw new IgniteCheckedException(e);
- }
- }
- },
- TIMEOUT_FOR_KEY_RETRIEVAL_IN_FULL_ASYNC_MODE))
+ @Override public boolean applyx() throws IgniteCheckedException {
+ try {
+ return !stmt.executeQuery().next();
+ }
+ catch (SQLException e) {
+ throw new IgniteCheckedException(e);
+ }
+ }
+ },
+ TIMEOUT_FOR_KEY_RETRIEVAL_IN_FULL_ASYNC_MODE))
fail("Deleted data are still retrievable via SELECT.");
}
catch (GridClosureException e) {
@@ -565,16 +565,15 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes
try {
if (writeSyncMode == CacheWriteSynchronizationMode.FULL_ASYNC &&
!waitForCondition(new GridAbsPredicateX() {
- @Override public boolean applyx() throws IgniteCheckedException {
- try {
- return stmt.executeQuery().next();
- }
- catch (SQLException e) {
- throw new IgniteCheckedException(e);
- }
- }
- },
- TIMEOUT_FOR_KEY_RETRIEVAL_IN_FULL_ASYNC_MODE))
+ @Override public boolean applyx() throws IgniteCheckedException {
+ try {
+ return stmt.executeQuery().next();
+ }
+ catch (SQLException e) {
+ throw new IgniteCheckedException(e);
+ }
+ }
+ }, TIMEOUT_FOR_KEY_RETRIEVAL_IN_FULL_ASYNC_MODE))
fail("Unable to retrieve data via SELECT.");
}
catch (GridClosureException e) {
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDefaultTimeoutTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDefaultTimeoutTest.java
index e86bc21..aa5de4b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDefaultTimeoutTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDefaultTimeoutTest.java
@@ -115,15 +115,14 @@ public class JdbcThinDefaultTimeoutTest extends GridCommonAbstractTest {
Statement stmt = conn.createStatement();
GridTestUtils.assertThrows(log, () -> {
- ResultSet rs = stmt.executeQuery("select _key, _val, delay(5) from Integer");
+ ResultSet rs = stmt.executeQuery("select _key, _val, delay(5) from Integer");
- int cnt = 0;
- while (rs.next())
- cnt++;
+ int cnt = 0;
+ while (rs.next())
+ cnt++;
- return null;
- },
- SQLException.class, "The query was cancelled while executing");
+ return null;
+ }, SQLException.class, "The query was cancelled while executing");
}
}
}
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
index 62d0bb9..8111867 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
@@ -184,13 +184,11 @@ public class JdbcThinMissingLongArrayResultsTest extends JdbcThinAbstractSelfTes
@SuppressWarnings("unused")
public static class Key implements Serializable {
/** */
- @QuerySqlField(orderedGroups = {@QuerySqlField.Group(
- name = "date_sec_idx", order = 0, descending = true)})
+ @QuerySqlField(orderedGroups = {@QuerySqlField.Group(name = "date_sec_idx", order = 0, descending = true)})
private long date;
/** */
- @QuerySqlField(index = true, orderedGroups = {@QuerySqlField.Group(
- name = "date_sec_idx", order = 3)})
+ @QuerySqlField(index = true, orderedGroups = {@QuerySqlField.Group(name = "date_sec_idx", order = 3)})
private int securityId;
/**
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ClusterChangeTagCommand.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ClusterChangeTagCommand.java
index e1990cb..fc5820c 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ClusterChangeTagCommand.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ClusterChangeTagCommand.java
@@ -66,7 +66,7 @@ public class ClusterChangeTagCommand extends AbstractCommand<String> {
else
logger.warning("Error has occurred during tag update: " + res.errorMessage());
}
- catch (Throwable e) {
+ catch (Throwable e) {
logger.severe("Failed to execute Cluster ID and tag command: ");
logger.severe(CommandLogger.errorMessage(e));
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/ConnectivityCommand.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/ConnectivityCommand.java
index 99ca0cc..bc8b7c5 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/ConnectivityCommand.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/ConnectivityCommand.java
@@ -133,8 +133,8 @@ public class ConnectivityCommand implements Command<Void> {
return null;
})
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
table.addAll(row);
}
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/EncryptionSubcommands.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/EncryptionSubcommands.java
index c8d0941..8217572 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/EncryptionSubcommands.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/EncryptionSubcommands.java
@@ -83,7 +83,7 @@ public enum EncryptionSubcommands {
* @param text Command text (case insensitive).
* @return Command for the text. {@code Null} if there is no such command.
*/
- @Nullable public static EncryptionSubcommands of(String text) {
+ @Nullable public static EncryptionSubcommands of(String text) {
for (EncryptionSubcommands cmd : values()) {
if (cmd.name.equalsIgnoreCase(text))
return cmd;
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/snapshot/SnapshotRestoreCommand.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/snapshot/SnapshotRestoreCommand.java
index c183c11..e154d58 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/snapshot/SnapshotRestoreCommand.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/snapshot/SnapshotRestoreCommand.java
@@ -93,10 +93,10 @@ public class SnapshotRestoreCommand extends SnapshotSubcommand {
/** {@inheritDoc} */
@Override public void printUsage(Logger log) {
Map<String, String> params = generalUsageOptions();
- Map<String, String> startParams = new LinkedHashMap<String, String>(params) {{
- put(GROUPS.optionName(), GROUPS.description());
- put(SYNC.optionName(), SYNC.description());
- }};
+ Map<String, String> startParams = new LinkedHashMap<>(params);
+
+ startParams.put(GROUPS.optionName(), GROUPS.description());
+ startParams.put(SYNC.optionName(), SYNC.description());
usage(log, "Restore snapshot:", SNAPSHOT, startParams, RESTORE.toString(), SNAPSHOT_NAME_ARG, "--start",
optional(GROUPS.argName(), GROUPS.optionName()), optional(SYNC.argName()));
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/tracing/configuration/TracingConfigurationArguments.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/tracing/configuration/TracingConfigurationArguments.java
index 655f145..44dbbf6 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/tracing/configuration/TracingConfigurationArguments.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/tracing/configuration/TracingConfigurationArguments.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
/**
* This class contains all possible arguments after parsing tracing-configuration command input.
*/
- public final class TracingConfigurationArguments extends VisorTracingConfigurationItem {
+public final class TracingConfigurationArguments extends VisorTracingConfigurationItem {
/** */
private static final long serialVersionUID = 0L;
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java
index f4aa759..93f36e4 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java
@@ -416,13 +416,12 @@ public class GridCommandHandlerMetadataTest extends GridCommandHandlerClusterByC
// Executes any command to check disconnect.
GridTestUtils.assertThrows(log, () -> {
- try (Statement stmt = conn.createStatement()) {
- stmt.execute("SELECT * FROM test");
- }
+ try (Statement stmt = conn.createStatement()) {
+ stmt.execute("SELECT * FROM test");
+ }
- return null;
- },
- SQLException.class, "Failed to communicate with Ignite cluster");
+ return null;
+ }, SQLException.class, "Failed to communicate with Ignite cluster");
HashMap<Integer, BinaryType> metas = GridTestUtils.getFieldValue(conn, "metaHnd", "cache", "metas");
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index 2e8457f..2e6d93a 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -995,8 +995,8 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
}
}
- /** */
- private CountDownLatch getNewStateLatch(ClusterState oldState, ClusterState newState) {
+ /** */
+ private CountDownLatch getNewStateLatch(ClusterState oldState, ClusterState newState) {
if (oldState != newState) {
CountDownLatch latch = new CountDownLatch(G.allGrids().size());
@@ -1009,7 +1009,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
}
else
return new CountDownLatch(0);
- }
+ }
/**
* Test baseline collect works via control.sh
@@ -1778,14 +1778,14 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
// Test kill by xid.
validate(h, map -> {
- assertEquals(1, map.size());
+ assertEquals(1, map.size());
- Map.Entry<ClusterNode, VisorTxTaskResult> killedEntry = map.entrySet().iterator().next();
+ Map.Entry<ClusterNode, VisorTxTaskResult> killedEntry = map.entrySet().iterator().next();
- VisorTxInfo info = killedEntry.getValue().getInfos().get(0);
+ VisorTxInfo info = killedEntry.getValue().getInfos().get(0);
- assertEquals(toKill[0].getXid(), info.getXid());
- }, "--tx", "--kill",
+ assertEquals(toKill[0].getXid(), info.getXid());
+ }, "--tx", "--kill",
"--xid", toKill[0].getXid().toString(), // Use saved on first run value.
"--nodes", grid(0).localNode().consistentId().toString());
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/PerformanceStatisticsCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/PerformanceStatisticsCommandTest.java
index 6669714..a78f4d5 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/PerformanceStatisticsCommandTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/PerformanceStatisticsCommandTest.java
@@ -92,15 +92,15 @@ public class PerformanceStatisticsCommandTest extends GridCommandHandlerClusterB
assertEquals("Rotated.", lastOperationResult);
assertTrue(waitForCondition(() -> {
- try {
- return statisticsFiles().size() == G.allGrids().size() * 2;
- }
- catch (Exception e) {
- fail();
-
- return false;
- }
- }, TIMEOUT));
+ try {
+ return statisticsFiles().size() == G.allGrids().size() * 2;
+ }
+ catch (Exception e) {
+ fail();
+
+ return false;
+ }
+ }, TIMEOUT));
res = execute(PERFORMANCE_STATISTICS.text(), STATUS.toString());
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
index c9ec65a..e0473d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
@@ -165,7 +165,7 @@ public @interface GridifySetToValue {
* @return Optional parameter that defines the minimal value below which the
* execution will NOT be grid-enabled.
*/
- int threshold() default 0;
+ int threshold() default 0;
/**
* @return Optional parameter that defines a split size. Split size in other words means how big will
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
index 25742b7..df6c027 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
@@ -825,7 +825,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal {
/** {@inheritDoc} */
@Override public Collection<UUID> getTopology() {
if (topPred != null)
- return F.viewReadOnly(ctx.discovery().allNodes(), F.node2id(), topPred);
+ return F.viewReadOnly(ctx.discovery().allNodes(), F.node2id(), topPred);
return top != null ? top : F.nodeIds(ctx.discovery().allNodes());
}
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 7c0f399..dd6a914 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
@@ -1058,7 +1058,7 @@ public class IgniteKernal implements IgniteEx, Externalizable {
ackSpis();
List<PluginProvider> plugins = cfg.getPluginProviders() != null && cfg.getPluginProviders().length > 0 ?
- Arrays.asList(cfg.getPluginProviders()) : U.allPluginProviders();
+ Arrays.asList(cfg.getPluginProviders()) : U.allPluginProviders();
// Spin out SPIs & managers.
try {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java
index f592027..55ab1ab8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java
@@ -118,7 +118,7 @@ public class IgniteMXBeanImpl implements IgniteMXBean {
/** {@inheritDoc} */
@Override public boolean isNodeInBaseline() {
- return kernal.nodeInBaseline();
+ return kernal.nodeInBaseline();
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
index 10f4307..a24012a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
@@ -79,7 +79,7 @@ public class IgniteMessagingImpl extends AsyncSupportAdapter<IgniteMessaging>
/** {@inheritDoc} */
@Override public void send(@Nullable Object topic, Object msg) {
- send0(topic, msg, isAsync());
+ send0(topic, msg, isAsync());
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index a84715a..1c263a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -724,7 +724,7 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext>
- loadConfigurations(URL springCfgUrl) throws IgniteCheckedException {
+ loadConfigurations(URL springCfgUrl) throws IgniteCheckedException {
IgniteSpringHelper spring = SPRING.create(false);
return spring.loadConfigurations(springCfgUrl);
@@ -744,7 +744,7 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext>
- loadConfigurations(InputStream springCfgStream) throws IgniteCheckedException {
+ loadConfigurations(InputStream springCfgStream) throws IgniteCheckedException {
IgniteSpringHelper spring = SPRING.create(false);
return spring.loadConfigurations(springCfgStream);
@@ -764,7 +764,7 @@ public class IgnitionEx {
* been started or Spring XML configuration file is invalid.
*/
public static IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext>
- loadConfigurations(String springCfgPath) throws IgniteCheckedException {
+ loadConfigurations(String springCfgPath) throws IgniteCheckedException {
A.notNull(springCfgPath, "springCfgPath");
return loadConfigurations(IgniteUtils.resolveSpringUrl(springCfgPath));
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
index cae98fe..72d0545 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
@@ -55,7 +55,7 @@ public class BinaryReaderHandles {
return null;
case MODE_SINGLE:
- return pos == singlePos ? (T)data : null;
+ return pos == singlePos ? (T)data : null;
default:
assert mode == MODE_MULTIPLE;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index f3ccd0b..7ad25c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -709,21 +709,21 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
}
- /**
- * @param val Array of timestamps.
- */
- void doWriteTimestampArray(@Nullable Timestamp[] val) {
- if (val == null)
- out.writeByte(GridBinaryMarshaller.NULL);
- else {
- out.unsafeEnsure(1 + 4);
- out.unsafeWriteByte(GridBinaryMarshaller.TIMESTAMP_ARR);
- out.unsafeWriteInt(val.length);
-
- for (Timestamp ts : val)
- doWriteTimestamp(ts);
- }
- }
+ /**
+ * @param val Array of timestamps.
+ */
+ void doWriteTimestampArray(@Nullable Timestamp[] val) {
+ if (val == null)
+ out.writeByte(GridBinaryMarshaller.NULL);
+ else {
+ out.unsafeEnsure(1 + 4);
+ out.unsafeWriteByte(GridBinaryMarshaller.TIMESTAMP_ARR);
+ out.unsafeWriteInt(val.length);
+
+ for (Timestamp ts : val)
+ doWriteTimestamp(ts);
+ }
+ }
/**
* @param val Array of time.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index fb72f69..0113c36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -229,7 +229,7 @@ public interface GridClientCompute {
* @return Node for given ID or {@code null} if node with given id was not found.
* @throws GridClientException If client doesn't have an actual topology version.
*/
- public GridClientNode node(UUID id) throws GridClientException;
+ public GridClientNode node(UUID id) throws GridClientException;
/**
* Gets cached nodes for the given IDs based on most recently refreshed topology.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
index e842a5b..2ac2415 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
@@ -390,7 +390,7 @@ final class ReliableChannel implements AutoCloseable {
fut.completeExceptionally(err);
return null;
- }));
+ }));
if (result != null)
return new IgniteClientFutureImpl<>(fut);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
index 46f6c02..cf1c78b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
@@ -277,12 +277,12 @@ public class GridExecutorService implements ExecutorService, Externalizable {
try {
IgniteInternalFuture<T> fut = ctx.closure().runAsync(BALANCE, task, prj.nodes()).chain(
new CX1<IgniteInternalFuture<?>, T>() {
- @Override public T applyx(IgniteInternalFuture<?> fut) throws IgniteCheckedException {
- fut.get();
+ @Override public T applyx(IgniteInternalFuture<?> fut) throws IgniteCheckedException {
+ fut.get();
- return res;
- }
- });
+ return res;
+ }
+ });
return addFuture(fut);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
index d8ddfc2..389be4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
@@ -227,7 +227,7 @@ public interface ConnectionProperties {
*
* @param sslCipherSuites SSL cipher suites.
*/
- public void setSslCipherSuites(String sslCipherSuites);
+ public void setSslCipherSuites(String sslCipherSuites);
/**
* Gets algorithm that will be used to create a key manager.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
index bacb797..b00b0fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
@@ -104,23 +104,26 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
/** Nested transactions handling strategy. */
private StringProperty nestedTxMode = new StringProperty(
- "nestedTransactionsMode", "Way to handle nested transactions", NestedTxMode.ERROR.name(),
- new String[] { NestedTxMode.COMMIT.name(), NestedTxMode.ERROR.name(), NestedTxMode.IGNORE.name() },
- false, new PropertyValidator() {
- private static final long serialVersionUID = 0L;
-
- @Override public void validate(String mode) throws SQLException {
- if (!F.isEmpty(mode)) {
- try {
- NestedTxMode.valueOf(mode.toUpperCase());
- }
- catch (IllegalArgumentException e) {
- throw new SQLException("Invalid nested transactions handling mode, allowed values: " +
- Arrays.toString(nestedTxMode.choices), SqlStateCode.CLIENT_CONNECTION_FAILED);
+ "nestedTransactionsMode",
+ "Way to handle nested transactions",
+ NestedTxMode.ERROR.name(),
+ new String[] {NestedTxMode.COMMIT.name(), NestedTxMode.ERROR.name(), NestedTxMode.IGNORE.name()},
+ false,
+ new PropertyValidator() {
+ private static final long serialVersionUID = 0L;
+
+ @Override public void validate(String mode) throws SQLException {
+ if (!F.isEmpty(mode)) {
+ try {
+ NestedTxMode.valueOf(mode.toUpperCase());
+ }
+ catch (IllegalArgumentException e) {
+ throw new SQLException("Invalid nested transactions handling mode, allowed values: " +
+ Arrays.toString(nestedTxMode.choices), SqlStateCode.CLIENT_CONNECTION_FAILED);
+ }
}
}
- }
- });
+ });
/** SSL: Use SSL connection to Ignite node. */
private StringProperty sslMode = new StringProperty("sslMode",
@@ -236,23 +239,27 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
/** Disabled features. */
private StringProperty disabledFeatures = new StringProperty("disabledFeatures",
- "Sets enumeration of features to force disable its.", null, null, false, new PropertyValidator() {
- @Override public void validate(String val) throws SQLException {
- if (val == null)
- return;
-
- String[] features = val.split("\\W+");
-
- for (String f : features) {
- try {
- JdbcThinFeature.valueOf(f.toUpperCase());
- }
- catch (IllegalArgumentException e) {
- throw new SQLException("Unknown feature: " + f);
+ "Sets enumeration of features to force disable its.",
+ null,
+ null,
+ false,
+ new PropertyValidator() {
+ @Override public void validate(String val) throws SQLException {
+ if (val == null)
+ return;
+
+ String[] features = val.split("\\W+");
+
+ for (String f : features) {
+ try {
+ JdbcThinFeature.valueOf(f.toUpperCase());
+ }
+ catch (IllegalArgumentException e) {
+ throw new SQLException("Unknown feature: " + f);
+ }
}
}
- }
- });
+ });
/** Keep binary objects in binary form. */
private BooleanProperty keepBinary = new BooleanProperty("keepBinary",
@@ -269,10 +276,10 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
userAttrsFactory,
user, passwd,
dataPageScanEnabled,
- partitionAwareness,
+ partitionAwareness,
updateBatchSize,
- partitionAwarenessSQLCacheSize,
- partitionAwarenessPartDistributionsCacheSize,
+ partitionAwarenessSQLCacheSize,
+ partitionAwarenessPartDistributionsCacheSize,
qryTimeout,
connTimeout,
disabledFeatures,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 3bf6073..32187ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1451,7 +1451,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
/*if (msg0.processedFromNioThread())
c.run();
else*/
- ctx.pools().getStripedExecutorService().execute(-1, c);
+ ctx.pools().getStripedExecutorService().execute(-1, c);
return;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
index f0817df..3069f20 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
@@ -339,7 +339,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
*/
@Nullable public GridDeployment getDeployment(IgniteUuid ldrId) {
if (locDep != null)
- return locDep.classLoaderId().equals(ldrId) ? locDep : null;
+ return locDep.classLoaderId().equals(ldrId) ? locDep : null;
GridDeployment dep = locStore.getDeployment(ldrId);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
index 7acb201..f519d31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/protocol/gg/GridProtocolHandler.java
@@ -45,7 +45,7 @@ public class GridProtocolHandler extends URLStreamHandler {
* Deregisters deployment manager.
*/
public static void deregisterDeploymentManager() {
- mgr = null;
+ mgr = null;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
index 4ffd1e8..92c02a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -335,8 +335,8 @@ class OptimizedMarshallerUtils {
OptimizedClassDescriptor desc = clsMap.get(cls);
if (desc == null) {
- OptimizedClassDescriptor old = clsMap.putIfAbsent(cls, desc =
- new OptimizedClassDescriptor(cls, resolveTypeId(cls.getName(), mapper), clsMap, ctx, mapper));
+ OptimizedClassDescriptor old = clsMap.putIfAbsent(cls,
+ desc = new OptimizedClassDescriptor(cls, resolveTypeId(cls.getName(), mapper), clsMap, ctx, mapper));
if (old != null)
desc = old;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignmentImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignmentImpl.java
index d303fdf..6d30f54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignmentImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignmentImpl.java
@@ -260,7 +260,7 @@ public class HistoryAffinityAssignmentImpl implements HistoryAffinityAssignment
? assignments2ids(nodes)
: F.viewReadOnly(nodes, F.node2id());
}
- }
+ }
/** {@inheritDoc} */
@Override public Set<ClusterNode> nodes() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java
index afc60bd..a4ce406 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java
@@ -1209,9 +1209,9 @@ public class IgniteAuthenticationProcessor extends GridProcessorAdapter implemen
/**
* @param nodeId ID of the node that processes authentication request.
*/
- AuthenticateFuture(UUID nodeId) {
- this.nodeId = nodeId;
- }
+ AuthenticateFuture(UUID nodeId) {
+ this.nodeId = nodeId;
+ }
/**
* @return ID of the node that processes authentication request.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 9f4d851..a5a35ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -2920,7 +2920,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
DataRegionConfiguration drCfg,
int pageSize,
int partsNum
- ) {
+ ) {
String res = "Cache group '%s'" +
" brings high overhead for its metainformation in data region '%s'." +
" Metainformation required for its partitions (%d partitions, %d bytes per partition, %d MBs total)" +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
index c264263..83692fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
@@ -56,7 +56,7 @@ public class CacheClientReconnectDiscoveryData implements Serializable {
/**
* @return Information about caches started on re-joining client node.
*/
- public Map<String, CacheInfo> clientCaches() {
+ public Map<String, CacheInfo> clientCaches() {
return clientCaches;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
index 9611899..47f8dc4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
@@ -96,7 +96,7 @@ public class CacheJoinNodeDiscoveryData implements Serializable {
/**
*
*/
- public static class CacheInfo implements Serializable {
+ public static class CacheInfo implements Serializable {
/** */
private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
index e720693..48a0da4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
@@ -278,7 +278,7 @@ public class CacheWeakQueryIteratorsHolder<V> {
this.convert = convert;
weakRef = new WeakReference(this, refQueue);
- }
+ }
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index bc233d2..fe04467 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -738,20 +738,20 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
opCtx != null ? opCtx.readRepairStrategy() : null,
/*skip values*/true,
/*need ver*/false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, Boolean>() {
- @Override public Boolean applyx(IgniteInternalFuture<Map<K, V>> fut) throws IgniteCheckedException {
- Map<K, V> kvMap = fut.get();
+ @Override public Boolean applyx(IgniteInternalFuture<Map<K, V>> fut) throws IgniteCheckedException {
+ Map<K, V> kvMap = fut.get();
- if (keys.size() != kvMap.size())
- return false;
+ if (keys.size() != kvMap.size())
+ return false;
- for (Map.Entry<K, V> entry : kvMap.entrySet()) {
- if (entry.getValue() == null)
- return false;
- }
+ for (Map.Entry<K, V> entry : kvMap.entrySet()) {
+ if (entry.getValue() == null)
+ return false;
+ }
- return true;
- }
- });
+ return true;
+ }
+ });
}
/** {@inheritDoc} */
@@ -1407,10 +1407,10 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
opCtx != null ? opCtx.readRepairStrategy() : null,
/*skip vals*/false,
/*can remap*/false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
- @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
- return e.get().get(key);
- }
- });
+ @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
+ return e.get().get(key);
+ }
+ });
}
/** {@inheritDoc} */
@@ -1889,8 +1889,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
opCtx != null && opCtx.recovery(),
opCtx != null ? opCtx.readRepairStrategy() : null,
skipVals,
- needVer).chain(
- new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
+ needVer).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
@Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
Map<K, V> map = e.get();
@@ -3906,12 +3905,12 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (nodes.isEmpty())
return new GridFinishedFuture<>();
- return ctx.closures().callAsyncNoFailover(BROADCAST,
- new LoadKeysCallable<>(ctx.name(), keys, update, plc, keepBinary),
- nodes,
- true,
- 0,
- false);
+ return ctx.closures().callAsyncNoFailover(BROADCAST,
+ new LoadKeysCallable<>(ctx.name(), keys, update, plc, keepBinary),
+ nodes,
+ true,
+ 0,
+ false);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index f5dcbe5..7860734 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -953,7 +953,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
processMessage(nodeId, msg, c); // Will be handled by Rebalance Demander.
}
- break;
+ break;
case 116: {
GridNearSingleGetRequest req = (GridNearSingleGetRequest)msg;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 5ca5144..6a06e8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -400,7 +400,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
if (log.isDebugEnabled())
log.debug("Ignore event, cluster is inactive: " + evt);
- }
+ }
/** {@inheritDoc} */
@Override protected void start0() throws IgniteCheckedException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index e4d51fc..c3db29b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -3553,32 +3553,32 @@ public class GridCacheProcessor extends GridProcessorAdapter {
GridPlainClosure2<Collection<byte[]>, byte[], IgniteInternalFuture<Boolean>> startCacheClsr =
(grpKeys, masterKeyDigest) -> {
- assert ccfg == null || !ccfg.isEncryptionEnabled() || !grpKeys.isEmpty();
-
- DynamicCacheChangeRequest req = prepareCacheChangeRequest(
- ccfg,
- cacheName,
- nearCfg,
- cacheType,
- sql,
- failIfExists,
- failIfNotStarted,
- null,
- false,
- null,
- ccfg != null && ccfg.isEncryptionEnabled() ? grpKeys.iterator().next() : null,
- null,
- ccfg != null && ccfg.isEncryptionEnabled() ? masterKeyDigest : null);
+ assert ccfg == null || !ccfg.isEncryptionEnabled() || !grpKeys.isEmpty();
- if (req != null) {
- if (req.clientStartOnly())
- return startClientCacheChange(F.asMap(req.cacheName(), req), null);
+ DynamicCacheChangeRequest req = prepareCacheChangeRequest(
+ ccfg,
+ cacheName,
+ nearCfg,
+ cacheType,
+ sql,
+ failIfExists,
+ failIfNotStarted,
+ null,
+ false,
+ null,
+ ccfg != null && ccfg.isEncryptionEnabled() ? grpKeys.iterator().next() : null,
+ null,
+ ccfg != null && ccfg.isEncryptionEnabled() ? masterKeyDigest : null);
- return F.first(initiateCacheChanges(F.asList(req)));
- }
- else
- return new GridFinishedFuture<>();
- };
+ if (req != null) {
+ if (req.clientStartOnly())
+ return startClientCacheChange(F.asMap(req.cacheName(), req), null);
+
+ return F.first(initiateCacheChanges(F.asList(req)));
+ }
+ else
+ return new GridFinishedFuture<>();
+ };
try {
if (ccfg != null && ccfg.isEncryptionEnabled()) {
@@ -3800,8 +3800,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
});
}
- GridPlainClosure2<Collection<byte[]>, byte[], IgniteInternalFuture<Boolean>> startCacheClsr =
- (grpKeys, masterKeyDigest) -> {
+ GridPlainClosure2<Collection<byte[]>, byte[], IgniteInternalFuture<Boolean>> startCacheClsr = (grpKeys, masterKeyDigest) -> {
List<DynamicCacheChangeRequest> srvReqs = null;
Map<String, DynamicCacheChangeRequest> clientReqs = null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index a4a8c7e..17c77ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -788,7 +788,7 @@ public class GridCacheSharedContext<K, V> {
* @return WAL state manager.
*/
public WalStateManager walState() {
- return walStateMgr;
+ return walStateMgr;
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
index 401b158..9d18cb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java
@@ -53,8 +53,8 @@ public interface IgniteCacheExpiryPolicy {
* @param rdrs Entry readers.
*/
public void ttlUpdated(KeyCacheObject key,
- GridCacheVersion ver,
- @Nullable Collection<UUID> rdrs);
+ GridCacheVersion ver,
+ @Nullable Collection<UUID> rdrs);
/**
* Clears information about updated entries.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 46ccede..aad8f12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -2061,7 +2061,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
if (val != null)
val.valueBytes(coCtx);
- MvccUpdateDataRow updateRow = new MvccUpdateDataRow(
+ MvccUpdateDataRow updateRow = new MvccUpdateDataRow(
cctx,
key,
val,
@@ -2089,9 +2089,9 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
|| res == ResultType.VERSION_MISMATCH) // cannot update on write conflict
return updateRow;
else if (res == ResultType.VERSION_FOUND || // exceptional case
- res == ResultType.FILTERED || // Operation should be skipped.
- (res == ResultType.PREV_NULL && noCreate) // No op.
- ) {
+ res == ResultType.FILTERED || // Operation should be skipped.
+ (res == ResultType.PREV_NULL && noCreate) // No op.
+ ) {
// Do nothing, except cleaning up not needed versions
cleanup0(cctx, updateRow.cleanupRows());
@@ -2454,7 +2454,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
*/
private int cleanup0(GridCacheContext cctx, @Nullable List<MvccLinkAwareSearchRow> cleanupRows)
throws IgniteCheckedException {
- if (F.isEmpty(cleanupRows))
+ if (F.isEmpty(cleanupRows))
return 0;
int res = 0;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
index a962b24..aba9386 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
@@ -411,7 +411,7 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
catch (IgniteCheckedException | IgniteException e) {
throw cacheException(e);
}
- }
+ }
/** {@inheritDoc} */
@Override public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) {
@@ -2257,7 +2257,7 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
* Throws {@code IgniteCacheRestartingException} if proxy is restarting.
*/
public void checkRestart() {
- checkRestart(false);
+ checkRestart(false);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
index a0b805c..4abecc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
@@ -476,7 +476,7 @@ public abstract class CacheDistributedGetFutureAdapter<K, V>
/**
* @param e Failure exception.
*/
- public synchronized void onNodeLeft(ClusterTopologyCheckedException e) {
+ public synchronized void onNodeLeft(ClusterTopologyCheckedException e) {
if (remapped)
return;
@@ -499,17 +499,16 @@ public abstract class CacheDistributedGetFutureAdapter<K, V>
cctx.shared().exchange()
.affinityReadyFuture(awaitTopVer)
.listen((f) -> {
- try {
- // Remap.
- map(keys.keySet(), F.t(node, keys), f.get());
-
- onDone(Collections.<K, V>emptyMap());
- }
- catch (IgniteCheckedException ex) {
- CacheDistributedGetFutureAdapter.this.onDone(ex);
- }
+ try {
+ // Remap.
+ map(keys.keySet(), F.t(node, keys), f.get());
+
+ onDone(Collections.<K, V>emptyMap());
+ }
+ catch (IgniteCheckedException ex) {
+ CacheDistributedGetFutureAdapter.this.onDone(ex);
}
- );
+ });
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index 2c12695..326641a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -134,8 +134,8 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
txState = single ? new IgniteTxRemoteSingleStateImpl() :
new IgniteTxRemoteStateImpl(
- Collections.<IgniteTxKey, IgniteTxEntry>emptyMap(),
- new ConcurrentLinkedHashMap<IgniteTxKey, IgniteTxEntry>(U.capacity(txSize), 0.75f, 1));
+ Collections.<IgniteTxKey, IgniteTxEntry>emptyMap(),
+ new ConcurrentLinkedHashMap<IgniteTxKey, IgniteTxEntry>(U.capacity(txSize), 0.75f, 1));
assert topVer != null && topVer.topologyVersion() > 0 : topVer;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 90c09eff..03f4db0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -372,15 +372,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
ctx.cacheId(),
GridDhtAtomicNearResponse.class,
new CI2<UUID, GridDhtAtomicNearResponse>() {
- @Override public void apply(UUID uuid, GridDhtAtomicNearResponse msg) {
- processDhtAtomicNearResponse(uuid, msg);
- }
+ @Override public void apply(UUID uuid, GridDhtAtomicNearResponse msg) {
+ processDhtAtomicNearResponse(uuid, msg);
+ }
- @Override public String toString() {
- return "GridDhtAtomicNearResponse handler " +
- "[msgIdx=" + GridDhtAtomicNearResponse.CACHE_MSG_IDX + ']';
- }
- });
+ @Override public String toString() {
+ return "GridDhtAtomicNearResponse handler " +
+ "[msgIdx=" + GridDhtAtomicNearResponse.CACHE_MSG_IDX + ']';
+ }
+ });
ctx.io().addCacheHandler(
ctx.cacheId(),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index faf62c4..3048a74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -299,9 +299,9 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements
/**
* @return Indexes of keys for which values were generated on primary node.
*/
- @Nullable public List<Integer> nearValuesIndexes() {
+ @Nullable public List<Integer> nearValuesIndexes() {
return nearUpdates != null ? nearUpdates.nearValuesIndexes() : null;
- }
+ }
/**
* @param idx Index.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 6c66fab..acc4454 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -1252,10 +1252,12 @@ public class GridDhtPartitionDemander {
partitionsLeft.addAndGet(v.partitions().size());
- rebalancingParts.put(k.id(), new HashSet<Integer>(v.partitions().size()) {{
- addAll(v.partitions().historicalSet());
- addAll(v.partitions().fullSet());
- }});
+ HashSet<Integer> parts = new HashSet<>(v.partitions().size());
+
+ parts.addAll(v.partitions().historicalSet());
+ parts.addAll(v.partitions().fullSet());
+
+ rebalancingParts.put(k.id(), parts);
historical.addAll(v.partitions().historicalSet());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
index 1eee3f3..855dbd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
@@ -398,8 +398,8 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry {
try {
checkObsolete();
- if (cctx.statisticsEnabled())
- cctx.cache().metrics0().onRead(false);
+ if (cctx.statisticsEnabled())
+ cctx.cache().metrics0().onRead(false);
boolean ret = false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index a914a5b..c3d193a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -1080,7 +1080,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
if (entryProcessor != null)
transform = true;
- GridCacheVersion drVer = dataCenterId != null ? cacheCtx.cache().nextVersion(dataCenterId) : null;
+ GridCacheVersion drVer = dataCenterId != null ? cacheCtx.cache().nextVersion(dataCenterId) : null;
boolean loadMissed = enlistWriteEntry(cacheCtx,
entryTopVer,
@@ -2811,9 +2811,9 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
GridCacheVersion readVer = null;
EntryGetResult getRes = null;
- if ((!pessimistic() || (readCommitted() && !skipVals)) && readRepairStrategy == null) {
- IgniteCacheExpiryPolicy accessPlc =
- optimistic() ? accessPolicy(cacheCtx, txKey, expiryPlc) : null;
+ if ((!pessimistic() || (readCommitted() && !skipVals)) && readRepairStrategy == null) {
+ IgniteCacheExpiryPolicy accessPlc =
+ optimistic() ? accessPolicy(cacheCtx, txKey, expiryPlc) : null;
if (needReadVer) {
getRes = primaryLocal(entry) ?
@@ -3168,21 +3168,21 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
expiryPlc0,
skipVals,
needVer).chain(new C1<IgniteInternalFuture<Map<Object, Object>>, Void>() {
- @Override public Void apply(IgniteInternalFuture<Map<Object, Object>> f) {
- try {
- Map<Object, Object> map = f.get();
+ @Override public Void apply(IgniteInternalFuture<Map<Object, Object>> f) {
+ try {
+ Map<Object, Object> map = f.get();
- processLoaded(map, keys, needVer, c);
+ processLoaded(map, keys, needVer, c);
- return null;
- }
- catch (Exception e) {
- setRollbackOnly();
+ return null;
+ }
+ catch (Exception e) {
+ setRollbackOnly();
- throw new GridClosureException(e);
+ throw new GridClosureException(e);
+ }
}
- }
- });
+ });
}
else if (cacheCtx.isColocated()) {
if (readRepairStrategy != null) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
index fe5adfe..70d6996 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
@@ -143,14 +143,14 @@ public class TxLog implements CheckpointListener {
if (PageHandler.isWalDeltaRecordNeeded(pageMemory, TX_LOG_CACHE_ID, metaId, metaPage, wal, null))
assert io.getType() == PageIO.T_META;
- wal.log(new MetaPageInitRecord(
- TX_LOG_CACHE_ID,
- metaId,
- io.getType(),
- io.getVersion(),
- treeRoot,
- reuseListRoot
- ));
+ wal.log(new MetaPageInitRecord(
+ TX_LOG_CACHE_ID,
+ metaId,
+ io.getType(),
+ io.getVersion(),
+ treeRoot,
+ reuseListRoot
+ ));
isNew = true;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index cfe92e2..5d031e7 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -881,19 +881,18 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
notifyMetastorageReadyForRead();
- cctx.kernalContext().maintenanceRegistry()
- .registerWorkflowCallbackIfTaskExists(
- DEFRAGMENTATION_MNTC_TASK_NAME,
- task -> {
- prepareCacheDefragmentation(fromStore(task).cacheNames());
-
- return new DefragmentationWorkflowCallback(
- cctx.kernalContext()::log,
- defrgMgr,
- cctx.kernalContext().failure()
- );
- }
- );
+ cctx.kernalContext().maintenanceRegistry().registerWorkflowCallbackIfTaskExists(
+ DEFRAGMENTATION_MNTC_TASK_NAME,
+ task -> {
+ prepareCacheDefragmentation(fromStore(task).cacheNames());
+
+ return new DefragmentationWorkflowCallback(
+ cctx.kernalContext()::log,
+ defrgMgr,
+ cctx.kernalContext().failure()
+ );
+ }
+ );
}
finally {
if (metaStorage != null)
@@ -1454,7 +1453,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
}
if (cctx.kernalContext().query().moduleEnabled())
- cctx.kernalContext().query().beforeExchange(fut);
+ cctx.kernalContext().query().beforeExchange(fut);
}
/** {@inheritDoc} */
@@ -2258,7 +2257,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
}, groupId, partId, exec, semaphore);
}
- break;
+ break;
case PARTITION_DESTROY:
PartitionDestroyRecord destroyRecord = (PartitionDestroyRecord)rec;
@@ -2274,7 +2273,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
}, groupId, partId, exec, semaphore);
}
- break;
+ break;
default:
if (restoreBinaryState.needApplyBinaryUpdate() && rec instanceof PageDeltaRecord) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/dumpprocessors/ToStringDumpProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/dumpprocessors/ToStringDumpProcessor.java
index 12ed7e9..b2e08cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/dumpprocessors/ToStringDumpProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/dumpprocessors/ToStringDumpProcessor.java
@@ -66,11 +66,11 @@ class ToStringDumpProcessor {
/** Helper class for track lock/unlock count. */
private static class LockState {
/** */
- int readlock;
+ int readlock;
/** */
- int writelock;
- }
+ int writelock;
+ }
/** */
private String operationToString(int op) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIO.java
index d72e716..53f017a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIO.java
@@ -74,8 +74,8 @@ public class AsyncFileIO extends AbstractFileIO {
* @return Native file descriptor.
*/
private static int getFileDescriptor(AsynchronousFileChannel ch) {
- FileDescriptor fd = U.field(ch, "fdObj");
- return U.field(fd, "fd");
+ FileDescriptor fd = U.field(ch, "fdObj");
+ return U.field(fd, "fd");
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index efc92ca..3c8c1ea 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
@@ -385,12 +385,11 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
log.warning(errorMsg);
try {
- cctx.kernalContext().maintenanceRegistry()
- .registerMaintenanceTask(
- new MaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME,
- "Corrupted cache groups found",
- groupsWithWalDisabled.stream().collect(Collectors.joining(File.separator)))
- );
+ cctx.kernalContext().maintenanceRegistry().registerMaintenanceTask(
+ new MaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME,
+ "Corrupted cache groups found",
+ groupsWithWalDisabled.stream().collect(Collectors.joining(File.separator)))
+ );
} catch (IgniteCheckedException e) {
log.warning("Failed to register maintenance record for corrupted partition files.", e);
}
@@ -783,7 +782,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
() -> getPartitionFilePath(cacheWorkDir, p),
pageMetrics.totalPages()::add);
- partStores[partId] = partStore;
+ partStores[partId] = partStore;
}
return new CacheStoreHolder(idxStore, partStores);
@@ -1148,8 +1147,8 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
return marshaller.unmarshal(stream, U.resolveClassLoader(igniteCfg));
}
catch (IgniteCheckedException | IOException e) {
- throw new IgniteCheckedException("An error occurred during cache configuration loading from file [file=" +
- conf.getAbsolutePath() + "]", e);
+ throw new IgniteCheckedException("An error occurred during cache configuration loading from file [file=" +
+ conf.getAbsolutePath() + "]", e);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastoragePageIOUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastoragePageIOUtils.java
index ce6710f..c4fa822 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastoragePageIOUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastoragePageIOUtils.java
@@ -31,8 +31,11 @@ public class MetastoragePageIOUtils {
/**
* @see MetastorageBPlusIO#getLink(long, int)
*/
- public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO>
- long getLink(IO io, long pageAddr, int idx) {
+ public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO> long getLink(
+ IO io,
+ long pageAddr,
+ int idx
+ ) {
assert idx < io.getCount(pageAddr) : idx;
return PageUtils.getLong(pageAddr, io.offset(idx));
@@ -41,16 +44,22 @@ public class MetastoragePageIOUtils {
/**
* @see MetastorageBPlusIO#getKeySize(long, int)
*/
- public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO>
- short getKeySize(IO io, long pageAddr, int idx) {
+ public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO> short getKeySize(
+ IO io,
+ long pageAddr, int idx
+ ) {
return PageUtils.getShort(pageAddr, io.offset(idx) + 8);
}
/**
* @see MetastorageBPlusIO#getKey(long, int, MetastorageRowStore)
*/
- public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO>
- String getKey(IO io, long pageAddr, int idx, MetastorageRowStore rowStore) throws IgniteCheckedException {
+ public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO> String getKey(
+ IO io,
+ long pageAddr,
+ int idx,
+ MetastorageRowStore rowStore
+ ) throws IgniteCheckedException {
int off = io.offset(idx);
int len = PageUtils.getShort(pageAddr, off + 8);
@@ -73,10 +82,12 @@ public class MetastoragePageIOUtils {
/**
* @see MetastorageBPlusIO#getDataRow(long, int, MetastorageRowStore)
*/
- public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO>
- MetastorageDataRow getDataRow(IO io, long pageAddr, int idx, MetastorageRowStore rowStore)
- throws IgniteCheckedException
- {
+ public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO> MetastorageDataRow getDataRow(
+ IO io,
+ long pageAddr,
+ int idx,
+ MetastorageRowStore rowStore
+ ) throws IgniteCheckedException {
long link = io.getLink(pageAddr, idx);
int off = io.offset(idx);
@@ -101,8 +112,14 @@ public class MetastoragePageIOUtils {
/**
* @see BPlusIO#store(long, int, org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO, long, int)
*/
- public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO>
- void store(IO dstIo, long dstPageAddr, int dstIdx, BPlusIO<MetastorageRow> srcIo, long srcPageAddr, int srcIdx) {
+ public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO> void store(
+ IO dstIo,
+ long dstPageAddr,
+ int dstIdx,
+ BPlusIO<MetastorageRow> srcIo,
+ long srcPageAddr,
+ int srcIdx
+ ) {
int srcOff = srcIo.offset(srcIdx);
int dstOff = dstIo.offset(dstIdx);
@@ -112,8 +129,12 @@ public class MetastoragePageIOUtils {
/**
* @see BPlusIO#storeByOffset(long, int, Object)
*/
- public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO>
- void storeByOffset(IO io, long pageAddr, int off, MetastorageRow row) {
+ public static <IO extends BPlusIO<MetastorageRow> & MetastorageBPlusIO> void storeByOffset(
+ IO io,
+ long pageAddr,
+ int off,
+ MetastorageRow row
+ ) {
assert row.link() != 0;
PageUtils.putLong(pageAddr, off, row.link());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
index aff6eb5..bc4d5ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
@@ -45,8 +45,7 @@ public class DelayedPageReplacementTracker {
private final Stripe[] stripes;
/** Byte buffer thread local. */
- private final ThreadLocal<ByteBuffer> byteBufThreadLoc
- = new ThreadLocal<ByteBuffer>() {
+ private final ThreadLocal<ByteBuffer> byteBufThreadLoc = new ThreadLocal<ByteBuffer>() {
@Override protected ByteBuffer initialValue() {
ByteBuffer buf = ByteBuffer.allocateDirect(pageSize);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
index ffa8eca..a592b83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
@@ -138,15 +138,15 @@ public interface PageMemoryEx extends PageMemory {
* @param tracker Checkpoint metrics tracker.
* @throws IgniteCheckedException If failed to obtain page data.
*/
- public void checkpointWritePage(
- FullPageId pageId,
- ByteBuffer buf,
- PageStoreWriter pageWriter,
- CheckpointMetricsTracker tracker
- ) throws IgniteCheckedException;
-
- /** */
- public PageReadWriteManager pageManager();
+ public void checkpointWritePage(
+ FullPageId pageId,
+ ByteBuffer buf,
+ PageStoreWriter pageWriter,
+ CheckpointMetricsTracker tracker
+ ) throws IgniteCheckedException;
+
+ /** */
+ public PageReadWriteManager pageManager();
/**
* Marks partition as invalid / outdated.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java
index 2161027..c2c3b5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java
@@ -51,14 +51,14 @@ public class SnapshotMetadataCollectorTask
for (ClusterNode node : subgrid) {
map.put(new ComputeJobAdapter(snpName) {
- @IgniteInstanceResource
- private transient IgniteEx ignite;
-
- @Override public List<SnapshotMetadata> execute() throws IgniteException {
- return ignite.context().cache().context().snapshotMgr()
- .readSnapshotMetadatas(snpName);
- }
- }, node);
+ @IgniteInstanceResource
+ private transient IgniteEx ignite;
+
+ @Override public List<SnapshotMetadata> execute() throws IgniteException {
+ return ignite.context().cache().context().snapshotMgr()
+ .readSnapshotMetadatas(snpName);
+ }
+ }, node);
}
return map;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotResponseRemoteFutureTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotResponseRemoteFutureTask.java
index 4894032..4763ce6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotResponseRemoteFutureTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotResponseRemoteFutureTask.java
@@ -91,27 +91,26 @@ public class SnapshotResponseRemoteFutureTask extends AbstractSnapshotFutureTask
.contains(gp.getPartitionId())
) {
futs.add(CompletableFuture.runAsync(() -> {
- if (err.get() != null)
- return;
+ if (err.get() != null)
+ return;
- File cacheDir = cacheDirectory(new File(snpDir, databaseRelativePath(meta.folderName())),
- gp.getGroupId());
+ File cacheDir = cacheDirectory(new File(snpDir, databaseRelativePath(meta.folderName())),
+ gp.getGroupId());
- if (cacheDir == null) {
- throw new IgniteException("Cache directory not found [snpName=" + snpName + ", meta=" + meta +
- ", pair=" + gp + ']');
- }
+ if (cacheDir == null) {
+ throw new IgniteException("Cache directory not found [snpName=" + snpName + ", meta=" + meta +
+ ", pair=" + gp + ']');
+ }
- File snpPart = getPartitionFile(cacheDir.getParentFile(), cacheDir.getName(), gp.getPartitionId());
+ File snpPart = getPartitionFile(cacheDir.getParentFile(), cacheDir.getName(), gp.getPartitionId());
- if (!snpPart.exists()) {
- throw new IgniteException("Snapshot partition file not found [cacheDir=" + cacheDir +
- ", pair=" + gp + ']');
- }
+ if (!snpPart.exists()) {
+ throw new IgniteException("Snapshot partition file not found [cacheDir=" + cacheDir +
+ ", pair=" + gp + ']');
+ }
- snpSndr.sendPart(snpPart, cacheDir.getName(), gp, snpPart.length());
- },
- snpSndr.executor())
+ snpSndr.sendPart(snpPart, cacheDir.getName(), gp, snpPart.length());
+ }, snpSndr.executor())
.whenComplete((r, t) -> err.compareAndSet(null, t)));
return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
index 98d70fb..b707edf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
@@ -984,7 +984,7 @@ public class SnapshotRestoreProcess {
"[reqId=" + reqId +
", snapshot=" + opCtx0.snpName +
", map=" + snpAff.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
- e -> partitionsMapToCompactString(e.getValue()))) + ']');
+ e -> partitionsMapToCompactString(e.getValue()))) + ']');
}
for (Map.Entry<UUID, Map<Integer, Set<Integer>>> m : snpAff.entrySet()) {
@@ -1327,21 +1327,21 @@ public class SnapshotRestoreProcess {
Path partFile = Paths.get(targetDir.getAbsolutePath(), FilePageStoreManager.getPartitionFileName(partFut.partId));
CompletableFuture.supplyAsync(() -> {
- if (opCtx.stopChecker.getAsBoolean())
- throw new IgniteInterruptedException("The operation has been stopped on copy file: " + snpFile.getAbsolutePath());
+ if (opCtx.stopChecker.getAsBoolean())
+ throw new IgniteInterruptedException("The operation has been stopped on copy file: " + snpFile.getAbsolutePath());
- if (Thread.interrupted())
- throw new IgniteInterruptedException("Thread has been interrupted: " + Thread.currentThread().getName());
+ if (Thread.interrupted())
+ throw new IgniteInterruptedException("Thread has been interrupted: " + Thread.currentThread().getName());
- if (!snpFile.exists()) {
- throw new IgniteException("Partition snapshot file doesn't exist [snpName=" + opCtx.snpName +
- ", snpDir=" + snpFile.getAbsolutePath() + ", name=" + snpFile.getName() + ']');
- }
+ if (!snpFile.exists()) {
+ throw new IgniteException("Partition snapshot file doesn't exist [snpName=" + opCtx.snpName +
+ ", snpDir=" + snpFile.getAbsolutePath() + ", name=" + snpFile.getName() + ']');
+ }
- IgniteSnapshotManager.copy(mgr.ioFactory(), snpFile, partFile.toFile(), snpFile.length());
+ IgniteSnapshotManager.copy(mgr.ioFactory(), snpFile, partFile.toFile(), snpFile.length());
- return partFile;
- }, mgr.snapshotExecutorService())
+ return partFile;
+ }, mgr.snapshotExecutorService())
.whenComplete((r, t) -> opCtx.errHnd.accept(t))
.whenComplete((r, t) -> {
if (t == null)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
index a4cd165..180d35b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
@@ -1265,7 +1265,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
checkDestroyed();
try {
- new TreeVisitor(lower, upper, c).visit();
+ new TreeVisitor(lower, upper, c).visit();
}
catch (IgniteCheckedException e) {
throw new IgniteCheckedException("Runtime failure on bounds: [lower=" + lower + ", upper=" + upper + "]", e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
index 4c49be6..91ada99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
@@ -132,524 +132,524 @@ public class PureJavaCrc32 {
*/
private static final int[] T = new int[]{
/* T8_0 */
- 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
- 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
- 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
- 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
- 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
- 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
- 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
- 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
- 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
- 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
- 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
- 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
- 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
- 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
- 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
- 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
- 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
- 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
- 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
- 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
- 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
- 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
- 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
- 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
- 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
- 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
- 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
- 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
- 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
- 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
- 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
- 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
- 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
- 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
- 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
- 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
- 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
- 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
- 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
- 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
- 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
- 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
- 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
- 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
- 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
- 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
- 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
- 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
- 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
- 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
- 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
- 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
- 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
- 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
- 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
- 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
- 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
- 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
- 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
- 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
- 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
- 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
- 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
- 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D,
+ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+ 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+ 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+ 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+ 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+ 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+ 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+ 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+ 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+ 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+ 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+ 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+ 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+ 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+ 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+ 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+ 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+ 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+ 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+ 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+ 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+ 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+ 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+ 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+ 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+ 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+ 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+ 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+ 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+ 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+ 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+ 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+ 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+ 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+ 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+ 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+ 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+ 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+ 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+ 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+ 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+ 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+ 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+ 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+ 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+ 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+ 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+ 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+ 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+ 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+ 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+ 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+ 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+ 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+ 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+ 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+ 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+ 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+ 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+ 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+ 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+ 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+ 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+ 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D,
/* T8_1 */
- 0x00000000, 0x191B3141, 0x32366282, 0x2B2D53C3,
- 0x646CC504, 0x7D77F445, 0x565AA786, 0x4F4196C7,
- 0xC8D98A08, 0xD1C2BB49, 0xFAEFE88A, 0xE3F4D9CB,
- 0xACB54F0C, 0xB5AE7E4D, 0x9E832D8E, 0x87981CCF,
- 0x4AC21251, 0x53D92310, 0x78F470D3, 0x61EF4192,
- 0x2EAED755, 0x37B5E614, 0x1C98B5D7, 0x05838496,
- 0x821B9859, 0x9B00A918, 0xB02DFADB, 0xA936CB9A,
- 0xE6775D5D, 0xFF6C6C1C, 0xD4413FDF, 0xCD5A0E9E,
- 0x958424A2, 0x8C9F15E3, 0xA7B24620, 0xBEA97761,
- 0xF1E8E1A6, 0xE8F3D0E7, 0xC3DE8324, 0xDAC5B265,
- 0x5D5DAEAA, 0x44469FEB, 0x6F6BCC28, 0x7670FD69,
- 0x39316BAE, 0x202A5AEF, 0x0B07092C, 0x121C386D,
- 0xDF4636F3, 0xC65D07B2, 0xED705471, 0xF46B6530,
- 0xBB2AF3F7, 0xA231C2B6, 0x891C9175, 0x9007A034,
- 0x179FBCFB, 0x0E848DBA, 0x25A9DE79, 0x3CB2EF38,
- 0x73F379FF, 0x6AE848BE, 0x41C51B7D, 0x58DE2A3C,
- 0xF0794F05, 0xE9627E44, 0xC24F2D87, 0xDB541CC6,
- 0x94158A01, 0x8D0EBB40, 0xA623E883, 0xBF38D9C2,
- 0x38A0C50D, 0x21BBF44C, 0x0A96A78F, 0x138D96CE,
- 0x5CCC0009, 0x45D73148, 0x6EFA628B, 0x77E153CA,
- 0xBABB5D54, 0xA3A06C15, 0x888D3FD6, 0x91960E97,
- 0xDED79850, 0xC7CCA911, 0xECE1FAD2, 0xF5FACB93,
- 0x7262D75C, 0x6B79E61D, 0x4054B5DE, 0x594F849F,
- 0x160E1258, 0x0F152319, 0x243870DA, 0x3D23419B,
- 0x65FD6BA7, 0x7CE65AE6, 0x57CB0925, 0x4ED03864,
- 0x0191AEA3, 0x188A9FE2, 0x33A7CC21, 0x2ABCFD60,
- 0xAD24E1AF, 0xB43FD0EE, 0x9F12832D, 0x8609B26C,
- 0xC94824AB, 0xD05315EA, 0xFB7E4629, 0xE2657768,
- 0x2F3F79F6, 0x362448B7, 0x1D091B74, 0x04122A35,
- 0x4B53BCF2, 0x52488DB3, 0x7965DE70, 0x607EEF31,
- 0xE7E6F3FE, 0xFEFDC2BF, 0xD5D0917C, 0xCCCBA03D,
- 0x838A36FA, 0x9A9107BB, 0xB1BC5478, 0xA8A76539,
- 0x3B83984B, 0x2298A90A, 0x09B5FAC9, 0x10AECB88,
- 0x5FEF5D4F, 0x46F46C0E, 0x6DD93FCD, 0x74C20E8C,
- 0xF35A1243, 0xEA412302, 0xC16C70C1, 0xD8774180,
- 0x9736D747, 0x8E2DE606, 0xA500B5C5, 0xBC1B8484,
- 0x71418A1A, 0x685ABB5B, 0x4377E898, 0x5A6CD9D9,
- 0x152D4F1E, 0x0C367E5F, 0x271B2D9C, 0x3E001CDD,
- 0xB9980012, 0xA0833153, 0x8BAE6290, 0x92B553D1,
- 0xDDF4C516, 0xC4EFF457, 0xEFC2A794, 0xF6D996D5,
- 0xAE07BCE9, 0xB71C8DA8, 0x9C31DE6B, 0x852AEF2A,
- 0xCA6B79ED, 0xD37048AC, 0xF85D1B6F, 0xE1462A2E,
- 0x66DE36E1, 0x7FC507A0, 0x54E85463, 0x4DF36522,
- 0x02B2F3E5, 0x1BA9C2A4, 0x30849167, 0x299FA026,
- 0xE4C5AEB8, 0xFDDE9FF9, 0xD6F3CC3A, 0xCFE8FD7B,
- 0x80A96BBC, 0x99B25AFD, 0xB29F093E, 0xAB84387F,
- 0x2C1C24B0, 0x350715F1, 0x1E2A4632, 0x07317773,
- 0x4870E1B4, 0x516BD0F5, 0x7A468336, 0x635DB277,
- 0xCBFAD74E, 0xD2E1E60F, 0xF9CCB5CC, 0xE0D7848D,
- 0xAF96124A, 0xB68D230B, 0x9DA070C8, 0x84BB4189,
- 0x03235D46, 0x1A386C07, 0x31153FC4, 0x280E0E85,
- 0x674F9842, 0x7E54A903, 0x5579FAC0, 0x4C62CB81,
- 0x8138C51F, 0x9823F45E, 0xB30EA79D, 0xAA1596DC,
- 0xE554001B, 0xFC4F315A, 0xD7626299, 0xCE7953D8,
- 0x49E14F17, 0x50FA7E56, 0x7BD72D95, 0x62CC1CD4,
- 0x2D8D8A13, 0x3496BB52, 0x1FBBE891, 0x06A0D9D0,
- 0x5E7EF3EC, 0x4765C2AD, 0x6C48916E, 0x7553A02F,
- 0x3A1236E8, 0x230907A9, 0x0824546A, 0x113F652B,
- 0x96A779E4, 0x8FBC48A5, 0xA4911B66, 0xBD8A2A27,
- 0xF2CBBCE0, 0xEBD08DA1, 0xC0FDDE62, 0xD9E6EF23,
- 0x14BCE1BD, 0x0DA7D0FC, 0x268A833F, 0x3F91B27E,
- 0x70D024B9, 0x69CB15F8, 0x42E6463B, 0x5BFD777A,
- 0xDC656BB5, 0xC57E5AF4, 0xEE530937, 0xF7483876,
- 0xB809AEB1, 0xA1129FF0, 0x8A3FCC33, 0x9324FD72,
+ 0x00000000, 0x191B3141, 0x32366282, 0x2B2D53C3,
+ 0x646CC504, 0x7D77F445, 0x565AA786, 0x4F4196C7,
+ 0xC8D98A08, 0xD1C2BB49, 0xFAEFE88A, 0xE3F4D9CB,
+ 0xACB54F0C, 0xB5AE7E4D, 0x9E832D8E, 0x87981CCF,
+ 0x4AC21251, 0x53D92310, 0x78F470D3, 0x61EF4192,
+ 0x2EAED755, 0x37B5E614, 0x1C98B5D7, 0x05838496,
+ 0x821B9859, 0x9B00A918, 0xB02DFADB, 0xA936CB9A,
+ 0xE6775D5D, 0xFF6C6C1C, 0xD4413FDF, 0xCD5A0E9E,
+ 0x958424A2, 0x8C9F15E3, 0xA7B24620, 0xBEA97761,
+ 0xF1E8E1A6, 0xE8F3D0E7, 0xC3DE8324, 0xDAC5B265,
+ 0x5D5DAEAA, 0x44469FEB, 0x6F6BCC28, 0x7670FD69,
+ 0x39316BAE, 0x202A5AEF, 0x0B07092C, 0x121C386D,
+ 0xDF4636F3, 0xC65D07B2, 0xED705471, 0xF46B6530,
+ 0xBB2AF3F7, 0xA231C2B6, 0x891C9175, 0x9007A034,
+ 0x179FBCFB, 0x0E848DBA, 0x25A9DE79, 0x3CB2EF38,
+ 0x73F379FF, 0x6AE848BE, 0x41C51B7D, 0x58DE2A3C,
+ 0xF0794F05, 0xE9627E44, 0xC24F2D87, 0xDB541CC6,
+ 0x94158A01, 0x8D0EBB40, 0xA623E883, 0xBF38D9C2,
+ 0x38A0C50D, 0x21BBF44C, 0x0A96A78F, 0x138D96CE,
+ 0x5CCC0009, 0x45D73148, 0x6EFA628B, 0x77E153CA,
+ 0xBABB5D54, 0xA3A06C15, 0x888D3FD6, 0x91960E97,
+ 0xDED79850, 0xC7CCA911, 0xECE1FAD2, 0xF5FACB93,
+ 0x7262D75C, 0x6B79E61D, 0x4054B5DE, 0x594F849F,
+ 0x160E1258, 0x0F152319, 0x243870DA, 0x3D23419B,
+ 0x65FD6BA7, 0x7CE65AE6, 0x57CB0925, 0x4ED03864,
+ 0x0191AEA3, 0x188A9FE2, 0x33A7CC21, 0x2ABCFD60,
+ 0xAD24E1AF, 0xB43FD0EE, 0x9F12832D, 0x8609B26C,
+ 0xC94824AB, 0xD05315EA, 0xFB7E4629, 0xE2657768,
+ 0x2F3F79F6, 0x362448B7, 0x1D091B74, 0x04122A35,
+ 0x4B53BCF2, 0x52488DB3, 0x7965DE70, 0x607EEF31,
+ 0xE7E6F3FE, 0xFEFDC2BF, 0xD5D0917C, 0xCCCBA03D,
+ 0x838A36FA, 0x9A9107BB, 0xB1BC5478, 0xA8A76539,
+ 0x3B83984B, 0x2298A90A, 0x09B5FAC9, 0x10AECB88,
+ 0x5FEF5D4F, 0x46F46C0E, 0x6DD93FCD, 0x74C20E8C,
+ 0xF35A1243, 0xEA412302, 0xC16C70C1, 0xD8774180,
+ 0x9736D747, 0x8E2DE606, 0xA500B5C5, 0xBC1B8484,
+ 0x71418A1A, 0x685ABB5B, 0x4377E898, 0x5A6CD9D9,
+ 0x152D4F1E, 0x0C367E5F, 0x271B2D9C, 0x3E001CDD,
+ 0xB9980012, 0xA0833153, 0x8BAE6290, 0x92B553D1,
+ 0xDDF4C516, 0xC4EFF457, 0xEFC2A794, 0xF6D996D5,
+ 0xAE07BCE9, 0xB71C8DA8, 0x9C31DE6B, 0x852AEF2A,
+ 0xCA6B79ED, 0xD37048AC, 0xF85D1B6F, 0xE1462A2E,
+ 0x66DE36E1, 0x7FC507A0, 0x54E85463, 0x4DF36522,
+ 0x02B2F3E5, 0x1BA9C2A4, 0x30849167, 0x299FA026,
+ 0xE4C5AEB8, 0xFDDE9FF9, 0xD6F3CC3A, 0xCFE8FD7B,
+ 0x80A96BBC, 0x99B25AFD, 0xB29F093E, 0xAB84387F,
+ 0x2C1C24B0, 0x350715F1, 0x1E2A4632, 0x07317773,
+ 0x4870E1B4, 0x516BD0F5, 0x7A468336, 0x635DB277,
+ 0xCBFAD74E, 0xD2E1E60F, 0xF9CCB5CC, 0xE0D7848D,
+ 0xAF96124A, 0xB68D230B, 0x9DA070C8, 0x84BB4189,
+ 0x03235D46, 0x1A386C07, 0x31153FC4, 0x280E0E85,
+ 0x674F9842, 0x7E54A903, 0x5579FAC0, 0x4C62CB81,
+ 0x8138C51F, 0x9823F45E, 0xB30EA79D, 0xAA1596DC,
+ 0xE554001B, 0xFC4F315A, 0xD7626299, 0xCE7953D8,
+ 0x49E14F17, 0x50FA7E56, 0x7BD72D95, 0x62CC1CD4,
+ 0x2D8D8A13, 0x3496BB52, 0x1FBBE891, 0x06A0D9D0,
+ 0x5E7EF3EC, 0x4765C2AD, 0x6C48916E, 0x7553A02F,
+ 0x3A1236E8, 0x230907A9, 0x0824546A, 0x113F652B,
+ 0x96A779E4, 0x8FBC48A5, 0xA4911B66, 0xBD8A2A27,
+ 0xF2CBBCE0, 0xEBD08DA1, 0xC0FDDE62, 0xD9E6EF23,
+ 0x14BCE1BD, 0x0DA7D0FC, 0x268A833F, 0x3F91B27E,
+ 0x70D024B9, 0x69CB15F8, 0x42E6463B, 0x5BFD777A,
+ 0xDC656BB5, 0xC57E5AF4, 0xEE530937, 0xF7483876,
+ 0xB809AEB1, 0xA1129FF0, 0x8A3FCC33, 0x9324FD72,
/* T8_2 */
- 0x00000000, 0x01C26A37, 0x0384D46E, 0x0246BE59,
- 0x0709A8DC, 0x06CBC2EB, 0x048D7CB2, 0x054F1685,
- 0x0E1351B8, 0x0FD13B8F, 0x0D9785D6, 0x0C55EFE1,
- 0x091AF964, 0x08D89353, 0x0A9E2D0A, 0x0B5C473D,
- 0x1C26A370, 0x1DE4C947, 0x1FA2771E, 0x1E601D29,
- 0x1B2F0BAC, 0x1AED619B, 0x18ABDFC2, 0x1969B5F5,
- 0x1235F2C8, 0x13F798FF, 0x11B126A6, 0x10734C91,
- 0x153C5A14, 0x14FE3023, 0x16B88E7A, 0x177AE44D,
- 0x384D46E0, 0x398F2CD7, 0x3BC9928E, 0x3A0BF8B9,
- 0x3F44EE3C, 0x3E86840B, 0x3CC03A52, 0x3D025065,
- 0x365E1758, 0x379C7D6F, 0x35DAC336, 0x3418A901,
- 0x3157BF84, 0x3095D5B3, 0x32D36BEA, 0x331101DD,
- 0x246BE590, 0x25A98FA7, 0x27EF31FE, 0x262D5BC9,
- 0x23624D4C, 0x22A0277B, 0x20E69922, 0x2124F315,
- 0x2A78B428, 0x2BBADE1F, 0x29FC6046, 0x283E0A71,
- 0x2D711CF4, 0x2CB376C3, 0x2EF5C89A, 0x2F37A2AD,
- 0x709A8DC0, 0x7158E7F7, 0x731E59AE, 0x72DC3399,
- 0x7793251C, 0x76514F2B, 0x7417F172, 0x75D59B45,
- 0x7E89DC78, 0x7F4BB64F, 0x7D0D0816, 0x7CCF6221,
- 0x798074A4, 0x78421E93, 0x7A04A0CA, 0x7BC6CAFD,
- 0x6CBC2EB0, 0x6D7E4487, 0x6F38FADE, 0x6EFA90E9,
- 0x6BB5866C, 0x6A77EC5B, 0x68315202, 0x69F33835,
- 0x62AF7F08, 0x636D153F, 0x612BAB66, 0x60E9C151,
- 0x65A6D7D4, 0x6464BDE3, 0x662203BA, 0x67E0698D,
- 0x48D7CB20, 0x4915A117, 0x4B531F4E, 0x4A917579,
- 0x4FDE63FC, 0x4E1C09CB, 0x4C5AB792, 0x4D98DDA5,
- 0x46C49A98, 0x4706F0AF, 0x45404EF6, 0x448224C1,
- 0x41CD3244, 0x400F5873, 0x4249E62A, 0x438B8C1D,
- 0x54F16850, 0x55330267, 0x5775BC3E, 0x56B7D609,
- 0x53F8C08C, 0x523AAABB, 0x507C14E2, 0x51BE7ED5,
- 0x5AE239E8, 0x5B2053DF, 0x5966ED86, 0x58A487B1,
- 0x5DEB9134, 0x5C29FB03, 0x5E6F455A, 0x5FAD2F6D,
- 0xE1351B80, 0xE0F771B7, 0xE2B1CFEE, 0xE373A5D9,
- 0xE63CB35C, 0xE7FED96B, 0xE5B86732, 0xE47A0D05,
- 0xEF264A38, 0xEEE4200F, 0xECA29E56, 0xED60F461,
- 0xE82FE2E4, 0xE9ED88D3, 0xEBAB368A, 0xEA695CBD,
- 0xFD13B8F0, 0xFCD1D2C7, 0xFE976C9E, 0xFF5506A9,
- 0xFA1A102C, 0xFBD87A1B, 0xF99EC442, 0xF85CAE75,
- 0xF300E948, 0xF2C2837F, 0xF0843D26, 0xF1465711,
- 0xF4094194, 0xF5CB2BA3, 0xF78D95FA, 0xF64FFFCD,
- 0xD9785D60, 0xD8BA3757, 0xDAFC890E, 0xDB3EE339,
- 0xDE71F5BC, 0xDFB39F8B, 0xDDF521D2, 0xDC374BE5,
- 0xD76B0CD8, 0xD6A966EF, 0xD4EFD8B6, 0xD52DB281,
- 0xD062A404, 0xD1A0CE33, 0xD3E6706A, 0xD2241A5D,
- 0xC55EFE10, 0xC49C9427, 0xC6DA2A7E, 0xC7184049,
- 0xC25756CC, 0xC3953CFB, 0xC1D382A2, 0xC011E895,
- 0xCB4DAFA8, 0xCA8FC59F, 0xC8C97BC6, 0xC90B11F1,
- 0xCC440774, 0xCD866D43, 0xCFC0D31A, 0xCE02B92D,
- 0x91AF9640, 0x906DFC77, 0x922B422E, 0x93E92819,
- 0x96A63E9C, 0x976454AB, 0x9522EAF2, 0x94E080C5,
- 0x9FBCC7F8, 0x9E7EADCF, 0x9C381396, 0x9DFA79A1,
- 0x98B56F24, 0x99770513, 0x9B31BB4A, 0x9AF3D17D,
- 0x8D893530, 0x8C4B5F07, 0x8E0DE15E, 0x8FCF8B69,
- 0x8A809DEC, 0x8B42F7DB, 0x89044982, 0x88C623B5,
- 0x839A6488, 0x82580EBF, 0x801EB0E6, 0x81DCDAD1,
- 0x8493CC54, 0x8551A663, 0x8717183A, 0x86D5720D,
- 0xA9E2D0A0, 0xA820BA97, 0xAA6604CE, 0xABA46EF9,
- 0xAEEB787C, 0xAF29124B, 0xAD6FAC12, 0xACADC625,
- 0xA7F18118, 0xA633EB2F, 0xA4755576, 0xA5B73F41,
- 0xA0F829C4, 0xA13A43F3, 0xA37CFDAA, 0xA2BE979D,
- 0xB5C473D0, 0xB40619E7, 0xB640A7BE, 0xB782CD89,
- 0xB2CDDB0C, 0xB30FB13B, 0xB1490F62, 0xB08B6555,
- 0xBBD72268, 0xBA15485F, 0xB853F606, 0xB9919C31,
- 0xBCDE8AB4, 0xBD1CE083, 0xBF5A5EDA, 0xBE9834ED,
+ 0x00000000, 0x01C26A37, 0x0384D46E, 0x0246BE59,
+ 0x0709A8DC, 0x06CBC2EB, 0x048D7CB2, 0x054F1685,
+ 0x0E1351B8, 0x0FD13B8F, 0x0D9785D6, 0x0C55EFE1,
+ 0x091AF964, 0x08D89353, 0x0A9E2D0A, 0x0B5C473D,
+ 0x1C26A370, 0x1DE4C947, 0x1FA2771E, 0x1E601D29,
+ 0x1B2F0BAC, 0x1AED619B, 0x18ABDFC2, 0x1969B5F5,
+ 0x1235F2C8, 0x13F798FF, 0x11B126A6, 0x10734C91,
+ 0x153C5A14, 0x14FE3023, 0x16B88E7A, 0x177AE44D,
+ 0x384D46E0, 0x398F2CD7, 0x3BC9928E, 0x3A0BF8B9,
+ 0x3F44EE3C, 0x3E86840B, 0x3CC03A52, 0x3D025065,
+ 0x365E1758, 0x379C7D6F, 0x35DAC336, 0x3418A901,
+ 0x3157BF84, 0x3095D5B3, 0x32D36BEA, 0x331101DD,
+ 0x246BE590, 0x25A98FA7, 0x27EF31FE, 0x262D5BC9,
+ 0x23624D4C, 0x22A0277B, 0x20E69922, 0x2124F315,
+ 0x2A78B428, 0x2BBADE1F, 0x29FC6046, 0x283E0A71,
+ 0x2D711CF4, 0x2CB376C3, 0x2EF5C89A, 0x2F37A2AD,
+ 0x709A8DC0, 0x7158E7F7, 0x731E59AE, 0x72DC3399,
+ 0x7793251C, 0x76514F2B, 0x7417F172, 0x75D59B45,
+ 0x7E89DC78, 0x7F4BB64F, 0x7D0D0816, 0x7CCF6221,
+ 0x798074A4, 0x78421E93, 0x7A04A0CA, 0x7BC6CAFD,
+ 0x6CBC2EB0, 0x6D7E4487, 0x6F38FADE, 0x6EFA90E9,
+ 0x6BB5866C, 0x6A77EC5B, 0x68315202, 0x69F33835,
+ 0x62AF7F08, 0x636D153F, 0x612BAB66, 0x60E9C151,
+ 0x65A6D7D4, 0x6464BDE3, 0x662203BA, 0x67E0698D,
+ 0x48D7CB20, 0x4915A117, 0x4B531F4E, 0x4A917579,
+ 0x4FDE63FC, 0x4E1C09CB, 0x4C5AB792, 0x4D98DDA5,
+ 0x46C49A98, 0x4706F0AF, 0x45404EF6, 0x448224C1,
+ 0x41CD3244, 0x400F5873, 0x4249E62A, 0x438B8C1D,
+ 0x54F16850, 0x55330267, 0x5775BC3E, 0x56B7D609,
+ 0x53F8C08C, 0x523AAABB, 0x507C14E2, 0x51BE7ED5,
+ 0x5AE239E8, 0x5B2053DF, 0x5966ED86, 0x58A487B1,
+ 0x5DEB9134, 0x5C29FB03, 0x5E6F455A, 0x5FAD2F6D,
+ 0xE1351B80, 0xE0F771B7, 0xE2B1CFEE, 0xE373A5D9,
+ 0xE63CB35C, 0xE7FED96B, 0xE5B86732, 0xE47A0D05,
+ 0xEF264A38, 0xEEE4200F, 0xECA29E56, 0xED60F461,
+ 0xE82FE2E4, 0xE9ED88D3, 0xEBAB368A, 0xEA695CBD,
+ 0xFD13B8F0, 0xFCD1D2C7, 0xFE976C9E, 0xFF5506A9,
+ 0xFA1A102C, 0xFBD87A1B, 0xF99EC442, 0xF85CAE75,
+ 0xF300E948, 0xF2C2837F, 0xF0843D26, 0xF1465711,
+ 0xF4094194, 0xF5CB2BA3, 0xF78D95FA, 0xF64FFFCD,
+ 0xD9785D60, 0xD8BA3757, 0xDAFC890E, 0xDB3EE339,
+ 0xDE71F5BC, 0xDFB39F8B, 0xDDF521D2, 0xDC374BE5,
+ 0xD76B0CD8, 0xD6A966EF, 0xD4EFD8B6, 0xD52DB281,
+ 0xD062A404, 0xD1A0CE33, 0xD3E6706A, 0xD2241A5D,
+ 0xC55EFE10, 0xC49C9427, 0xC6DA2A7E, 0xC7184049,
+ 0xC25756CC, 0xC3953CFB, 0xC1D382A2, 0xC011E895,
+ 0xCB4DAFA8, 0xCA8FC59F, 0xC8C97BC6, 0xC90B11F1,
+ 0xCC440774, 0xCD866D43, 0xCFC0D31A, 0xCE02B92D,
+ 0x91AF9640, 0x906DFC77, 0x922B422E, 0x93E92819,
+ 0x96A63E9C, 0x976454AB, 0x9522EAF2, 0x94E080C5,
+ 0x9FBCC7F8, 0x9E7EADCF, 0x9C381396, 0x9DFA79A1,
+ 0x98B56F24, 0x99770513, 0x9B31BB4A, 0x9AF3D17D,
+ 0x8D893530, 0x8C4B5F07, 0x8E0DE15E, 0x8FCF8B69,
+ 0x8A809DEC, 0x8B42F7DB, 0x89044982, 0x88C623B5,
+ 0x839A6488, 0x82580EBF, 0x801EB0E6, 0x81DCDAD1,
+ 0x8493CC54, 0x8551A663, 0x8717183A, 0x86D5720D,
+ 0xA9E2D0A0, 0xA820BA97, 0xAA6604CE, 0xABA46EF9,
+ 0xAEEB787C, 0xAF29124B, 0xAD6FAC12, 0xACADC625,
+ 0xA7F18118, 0xA633EB2F, 0xA4755576, 0xA5B73F41,
+ 0xA0F829C4, 0xA13A43F3, 0xA37CFDAA, 0xA2BE979D,
+ 0xB5C473D0, 0xB40619E7, 0xB640A7BE, 0xB782CD89,
+ 0xB2CDDB0C, 0xB30FB13B, 0xB1490F62, 0xB08B6555,
+ 0xBBD72268, 0xBA15485F, 0xB853F606, 0xB9919C31,
+ 0xBCDE8AB4, 0xBD1CE083, 0xBF5A5EDA, 0xBE9834ED,
/* T8_3 */
- 0x00000000, 0xB8BC6765, 0xAA09C88B, 0x12B5AFEE,
- 0x8F629757, 0x37DEF032, 0x256B5FDC, 0x9DD738B9,
- 0xC5B428EF, 0x7D084F8A, 0x6FBDE064, 0xD7018701,
- 0x4AD6BFB8, 0xF26AD8DD, 0xE0DF7733, 0x58631056,
- 0x5019579F, 0xE8A530FA, 0xFA109F14, 0x42ACF871,
- 0xDF7BC0C8, 0x67C7A7AD, 0x75720843, 0xCDCE6F26,
- 0x95AD7F70, 0x2D111815, 0x3FA4B7FB, 0x8718D09E,
- 0x1ACFE827, 0xA2738F42, 0xB0C620AC, 0x087A47C9,
- 0xA032AF3E, 0x188EC85B, 0x0A3B67B5, 0xB28700D0,
- 0x2F503869, 0x97EC5F0C, 0x8559F0E2, 0x3DE59787,
- 0x658687D1, 0xDD3AE0B4, 0xCF8F4F5A, 0x7733283F,
- 0xEAE41086, 0x525877E3, 0x40EDD80D, 0xF851BF68,
- 0xF02BF8A1, 0x48979FC4, 0x5A22302A, 0xE29E574F,
- 0x7F496FF6, 0xC7F50893, 0xD540A77D, 0x6DFCC018,
- 0x359FD04E, 0x8D23B72B, 0x9F9618C5, 0x272A7FA0,
- 0xBAFD4719, 0x0241207C, 0x10F48F92, 0xA848E8F7,
- 0x9B14583D, 0x23A83F58, 0x311D90B6, 0x89A1F7D3,
- 0x1476CF6A, 0xACCAA80F, 0xBE7F07E1, 0x06C36084,
- 0x5EA070D2, 0xE61C17B7, 0xF4A9B859, 0x4C15DF3C,
- 0xD1C2E785, 0x697E80E0, 0x7BCB2F0E, 0xC377486B,
- 0xCB0D0FA2, 0x73B168C7, 0x6104C729, 0xD9B8A04C,
- 0x446F98F5, 0xFCD3FF90, 0xEE66507E, 0x56DA371B,
- 0x0EB9274D, 0xB6054028, 0xA4B0EFC6, 0x1C0C88A3,
- 0x81DBB01A, 0x3967D77F, 0x2BD27891, 0x936E1FF4,
- 0x3B26F703, 0x839A9066, 0x912F3F88, 0x299358ED,
- 0xB4446054, 0x0CF80731, 0x1E4DA8DF, 0xA6F1CFBA,
- 0xFE92DFEC, 0x462EB889, 0x549B1767, 0xEC277002,
- 0x71F048BB, 0xC94C2FDE, 0xDBF98030, 0x6345E755,
- 0x6B3FA09C, 0xD383C7F9, 0xC1366817, 0x798A0F72,
- 0xE45D37CB, 0x5CE150AE, 0x4E54FF40, 0xF6E89825,
- 0xAE8B8873, 0x1637EF16, 0x048240F8, 0xBC3E279D,
- 0x21E91F24, 0x99557841, 0x8BE0D7AF, 0x335CB0CA,
- 0xED59B63B, 0x55E5D15E, 0x47507EB0, 0xFFEC19D5,
- 0x623B216C, 0xDA874609, 0xC832E9E7, 0x708E8E82,
- 0x28ED9ED4, 0x9051F9B1, 0x82E4565F, 0x3A58313A,
- 0xA78F0983, 0x1F336EE6, 0x0D86C108, 0xB53AA66D,
- 0xBD40E1A4, 0x05FC86C1, 0x1749292F, 0xAFF54E4A,
- 0x322276F3, 0x8A9E1196, 0x982BBE78, 0x2097D91D,
- 0x78F4C94B, 0xC048AE2E, 0xD2FD01C0, 0x6A4166A5,
- 0xF7965E1C, 0x4F2A3979, 0x5D9F9697, 0xE523F1F2,
- 0x4D6B1905, 0xF5D77E60, 0xE762D18E, 0x5FDEB6EB,
- 0xC2098E52, 0x7AB5E937, 0x680046D9, 0xD0BC21BC,
- 0x88DF31EA, 0x3063568F, 0x22D6F961, 0x9A6A9E04,
- 0x07BDA6BD, 0xBF01C1D8, 0xADB46E36, 0x15080953,
- 0x1D724E9A, 0xA5CE29FF, 0xB77B8611, 0x0FC7E174,
- 0x9210D9CD, 0x2AACBEA8, 0x38191146, 0x80A57623,
- 0xD8C66675, 0x607A0110, 0x72CFAEFE, 0xCA73C99B,
- 0x57A4F122, 0xEF189647, 0xFDAD39A9, 0x45115ECC,
- 0x764DEE06, 0xCEF18963, 0xDC44268D, 0x64F841E8,
- 0xF92F7951, 0x41931E34, 0x5326B1DA, 0xEB9AD6BF,
- 0xB3F9C6E9, 0x0B45A18C, 0x19F00E62, 0xA14C6907,
- 0x3C9B51BE, 0x842736DB, 0x96929935, 0x2E2EFE50,
- 0x2654B999, 0x9EE8DEFC, 0x8C5D7112, 0x34E11677,
- 0xA9362ECE, 0x118A49AB, 0x033FE645, 0xBB838120,
- 0xE3E09176, 0x5B5CF613, 0x49E959FD, 0xF1553E98,
- 0x6C820621, 0xD43E6144, 0xC68BCEAA, 0x7E37A9CF,
- 0xD67F4138, 0x6EC3265D, 0x7C7689B3, 0xC4CAEED6,
- 0x591DD66F, 0xE1A1B10A, 0xF3141EE4, 0x4BA87981,
- 0x13CB69D7, 0xAB770EB2, 0xB9C2A15C, 0x017EC639,
- 0x9CA9FE80, 0x241599E5, 0x36A0360B, 0x8E1C516E,
- 0x866616A7, 0x3EDA71C2, 0x2C6FDE2C, 0x94D3B949,
- 0x090481F0, 0xB1B8E695, 0xA30D497B, 0x1BB12E1E,
- 0x43D23E48, 0xFB6E592D, 0xE9DBF6C3, 0x516791A6,
- 0xCCB0A91F, 0x740CCE7A, 0x66B96194, 0xDE0506F1,
+ 0x00000000, 0xB8BC6765, 0xAA09C88B, 0x12B5AFEE,
+ 0x8F629757, 0x37DEF032, 0x256B5FDC, 0x9DD738B9,
+ 0xC5B428EF, 0x7D084F8A, 0x6FBDE064, 0xD7018701,
+ 0x4AD6BFB8, 0xF26AD8DD, 0xE0DF7733, 0x58631056,
+ 0x5019579F, 0xE8A530FA, 0xFA109F14, 0x42ACF871,
+ 0xDF7BC0C8, 0x67C7A7AD, 0x75720843, 0xCDCE6F26,
+ 0x95AD7F70, 0x2D111815, 0x3FA4B7FB, 0x8718D09E,
+ 0x1ACFE827, 0xA2738F42, 0xB0C620AC, 0x087A47C9,
+ 0xA032AF3E, 0x188EC85B, 0x0A3B67B5, 0xB28700D0,
+ 0x2F503869, 0x97EC5F0C, 0x8559F0E2, 0x3DE59787,
+ 0x658687D1, 0xDD3AE0B4, 0xCF8F4F5A, 0x7733283F,
+ 0xEAE41086, 0x525877E3, 0x40EDD80D, 0xF851BF68,
+ 0xF02BF8A1, 0x48979FC4, 0x5A22302A, 0xE29E574F,
+ 0x7F496FF6, 0xC7F50893, 0xD540A77D, 0x6DFCC018,
+ 0x359FD04E, 0x8D23B72B, 0x9F9618C5, 0x272A7FA0,
+ 0xBAFD4719, 0x0241207C, 0x10F48F92, 0xA848E8F7,
+ 0x9B14583D, 0x23A83F58, 0x311D90B6, 0x89A1F7D3,
+ 0x1476CF6A, 0xACCAA80F, 0xBE7F07E1, 0x06C36084,
+ 0x5EA070D2, 0xE61C17B7, 0xF4A9B859, 0x4C15DF3C,
+ 0xD1C2E785, 0x697E80E0, 0x7BCB2F0E, 0xC377486B,
+ 0xCB0D0FA2, 0x73B168C7, 0x6104C729, 0xD9B8A04C,
+ 0x446F98F5, 0xFCD3FF90, 0xEE66507E, 0x56DA371B,
+ 0x0EB9274D, 0xB6054028, 0xA4B0EFC6, 0x1C0C88A3,
+ 0x81DBB01A, 0x3967D77F, 0x2BD27891, 0x936E1FF4,
+ 0x3B26F703, 0x839A9066, 0x912F3F88, 0x299358ED,
+ 0xB4446054, 0x0CF80731, 0x1E4DA8DF, 0xA6F1CFBA,
+ 0xFE92DFEC, 0x462EB889, 0x549B1767, 0xEC277002,
+ 0x71F048BB, 0xC94C2FDE, 0xDBF98030, 0x6345E755,
+ 0x6B3FA09C, 0xD383C7F9, 0xC1366817, 0x798A0F72,
+ 0xE45D37CB, 0x5CE150AE, 0x4E54FF40, 0xF6E89825,
+ 0xAE8B8873, 0x1637EF16, 0x048240F8, 0xBC3E279D,
+ 0x21E91F24, 0x99557841, 0x8BE0D7AF, 0x335CB0CA,
+ 0xED59B63B, 0x55E5D15E, 0x47507EB0, 0xFFEC19D5,
+ 0x623B216C, 0xDA874609, 0xC832E9E7, 0x708E8E82,
+ 0x28ED9ED4, 0x9051F9B1, 0x82E4565F, 0x3A58313A,
+ 0xA78F0983, 0x1F336EE6, 0x0D86C108, 0xB53AA66D,
+ 0xBD40E1A4, 0x05FC86C1, 0x1749292F, 0xAFF54E4A,
+ 0x322276F3, 0x8A9E1196, 0x982BBE78, 0x2097D91D,
+ 0x78F4C94B, 0xC048AE2E, 0xD2FD01C0, 0x6A4166A5,
+ 0xF7965E1C, 0x4F2A3979, 0x5D9F9697, 0xE523F1F2,
+ 0x4D6B1905, 0xF5D77E60, 0xE762D18E, 0x5FDEB6EB,
+ 0xC2098E52, 0x7AB5E937, 0x680046D9, 0xD0BC21BC,
+ 0x88DF31EA, 0x3063568F, 0x22D6F961, 0x9A6A9E04,
+ 0x07BDA6BD, 0xBF01C1D8, 0xADB46E36, 0x15080953,
+ 0x1D724E9A, 0xA5CE29FF, 0xB77B8611, 0x0FC7E174,
+ 0x9210D9CD, 0x2AACBEA8, 0x38191146, 0x80A57623,
+ 0xD8C66675, 0x607A0110, 0x72CFAEFE, 0xCA73C99B,
+ 0x57A4F122, 0xEF189647, 0xFDAD39A9, 0x45115ECC,
+ 0x764DEE06, 0xCEF18963, 0xDC44268D, 0x64F841E8,
+ 0xF92F7951, 0x41931E34, 0x5326B1DA, 0xEB9AD6BF,
+ 0xB3F9C6E9, 0x0B45A18C, 0x19F00E62, 0xA14C6907,
+ 0x3C9B51BE, 0x842736DB, 0x96929935, 0x2E2EFE50,
+ 0x2654B999, 0x9EE8DEFC, 0x8C5D7112, 0x34E11677,
+ 0xA9362ECE, 0x118A49AB, 0x033FE645, 0xBB838120,
+ 0xE3E09176, 0x5B5CF613, 0x49E959FD, 0xF1553E98,
+ 0x6C820621, 0xD43E6144, 0xC68BCEAA, 0x7E37A9CF,
+ 0xD67F4138, 0x6EC3265D, 0x7C7689B3, 0xC4CAEED6,
+ 0x591DD66F, 0xE1A1B10A, 0xF3141EE4, 0x4BA87981,
+ 0x13CB69D7, 0xAB770EB2, 0xB9C2A15C, 0x017EC639,
+ 0x9CA9FE80, 0x241599E5, 0x36A0360B, 0x8E1C516E,
+ 0x866616A7, 0x3EDA71C2, 0x2C6FDE2C, 0x94D3B949,
+ 0x090481F0, 0xB1B8E695, 0xA30D497B, 0x1BB12E1E,
+ 0x43D23E48, 0xFB6E592D, 0xE9DBF6C3, 0x516791A6,
+ 0xCCB0A91F, 0x740CCE7A, 0x66B96194, 0xDE0506F1,
/* T8_4 */
- 0x00000000, 0x3D6029B0, 0x7AC05360, 0x47A07AD0,
- 0xF580A6C0, 0xC8E08F70, 0x8F40F5A0, 0xB220DC10,
- 0x30704BC1, 0x0D106271, 0x4AB018A1, 0x77D03111,
- 0xC5F0ED01, 0xF890C4B1, 0xBF30BE61, 0x825097D1,
- 0x60E09782, 0x5D80BE32, 0x1A20C4E2, 0x2740ED52,
- 0x95603142, 0xA80018F2, 0xEFA06222, 0xD2C04B92,
- 0x5090DC43, 0x6DF0F5F3, 0x2A508F23, 0x1730A693,
- 0xA5107A83, 0x98705333, 0xDFD029E3, 0xE2B00053,
- 0xC1C12F04, 0xFCA106B4, 0xBB017C64, 0x866155D4,
- 0x344189C4, 0x0921A074, 0x4E81DAA4, 0x73E1F314,
- 0xF1B164C5, 0xCCD14D75, 0x8B7137A5, 0xB6111E15,
- 0x0431C205, 0x3951EBB5, 0x7EF19165, 0x4391B8D5,
- 0xA121B886, 0x9C419136, 0xDBE1EBE6, 0xE681C256,
- 0x54A11E46, 0x69C137F6, 0x2E614D26, 0x13016496,
- 0x9151F347, 0xAC31DAF7, 0xEB91A027, 0xD6F18997,
- 0x64D15587, 0x59B17C37, 0x1E1106E7, 0x23712F57,
- 0x58F35849, 0x659371F9, 0x22330B29, 0x1F532299,
- 0xAD73FE89, 0x9013D739, 0xD7B3ADE9, 0xEAD38459,
- 0x68831388, 0x55E33A38, 0x124340E8, 0x2F236958,
- 0x9D03B548, 0xA0639CF8, 0xE7C3E628, 0xDAA3CF98,
- 0x3813CFCB, 0x0573E67B, 0x42D39CAB, 0x7FB3B51B,
- 0xCD93690B, 0xF0F340BB, 0xB7533A6B, 0x8A3313DB,
- 0x0863840A, 0x3503ADBA, 0x72A3D76A, 0x4FC3FEDA,
- 0xFDE322CA, 0xC0830B7A, 0x872371AA, 0xBA43581A,
- 0x9932774D, 0xA4525EFD, 0xE3F2242D, 0xDE920D9D,
- 0x6CB2D18D, 0x51D2F83D, 0x167282ED, 0x2B12AB5D,
- 0xA9423C8C, 0x9422153C, 0xD3826FEC, 0xEEE2465C,
- 0x5CC29A4C, 0x61A2B3FC, 0x2602C92C, 0x1B62E09C,
- 0xF9D2E0CF, 0xC4B2C97F, 0x8312B3AF, 0xBE729A1F,
- 0x0C52460F, 0x31326FBF, 0x7692156F, 0x4BF23CDF,
- 0xC9A2AB0E, 0xF4C282BE, 0xB362F86E, 0x8E02D1DE,
- 0x3C220DCE, 0x0142247E, 0x46E25EAE, 0x7B82771E,
- 0xB1E6B092, 0x8C869922, 0xCB26E3F2, 0xF646CA42,
- 0x44661652, 0x79063FE2, 0x3EA64532, 0x03C66C82,
- 0x8196FB53, 0xBCF6D2E3, 0xFB56A833, 0xC6368183,
- 0x74165D93, 0x49767423, 0x0ED60EF3, 0x33B62743,
- 0xD1062710, 0xEC660EA0, 0xABC67470, 0x96A65DC0,
- 0x248681D0, 0x19E6A860, 0x5E46D2B0, 0x6326FB00,
- 0xE1766CD1, 0xDC164561, 0x9BB63FB1, 0xA6D61601,
- 0x14F6CA11, 0x2996E3A1, 0x6E369971, 0x5356B0C1,
- 0x70279F96, 0x4D47B626, 0x0AE7CCF6, 0x3787E546,
- 0x85A73956, 0xB8C710E6, 0xFF676A36, 0xC2074386,
- 0x4057D457, 0x7D37FDE7, 0x3A978737, 0x07F7AE87,
- 0xB5D77297, 0x88B75B27, 0xCF1721F7, 0xF2770847,
- 0x10C70814, 0x2DA721A4, 0x6A075B74, 0x576772C4,
- 0xE547AED4, 0xD8278764, 0x9F87FDB4, 0xA2E7D404,
- 0x20B743D5, 0x1DD76A65, 0x5A7710B5, 0x67173905,
- 0xD537E515, 0xE857CCA5, 0xAFF7B675, 0x92979FC5,
- 0xE915E8DB, 0xD475C16B, 0x93D5BBBB, 0xAEB5920B,
- 0x1C954E1B, 0x21F567AB, 0x66551D7B, 0x5B3534CB,
- 0xD965A31A, 0xE4058AAA, 0xA3A5F07A, 0x9EC5D9CA,
- 0x2CE505DA, 0x11852C6A, 0x562556BA, 0x6B457F0A,
- 0x89F57F59, 0xB49556E9, 0xF3352C39, 0xCE550589,
- 0x7C75D999, 0x4115F029, 0x06B58AF9, 0x3BD5A349,
- 0xB9853498, 0x84E51D28, 0xC34567F8, 0xFE254E48,
- 0x4C059258, 0x7165BBE8, 0x36C5C138, 0x0BA5E888,
- 0x28D4C7DF, 0x15B4EE6F, 0x521494BF, 0x6F74BD0F,
- 0xDD54611F, 0xE03448AF, 0xA794327F, 0x9AF41BCF,
- 0x18A48C1E, 0x25C4A5AE, 0x6264DF7E, 0x5F04F6CE,
- 0xED242ADE, 0xD044036E, 0x97E479BE, 0xAA84500E,
- 0x4834505D, 0x755479ED, 0x32F4033D, 0x0F942A8D,
- 0xBDB4F69D, 0x80D4DF2D, 0xC774A5FD, 0xFA148C4D,
- 0x78441B9C, 0x4524322C, 0x028448FC, 0x3FE4614C,
- 0x8DC4BD5C, 0xB0A494EC, 0xF704EE3C, 0xCA64C78C,
+ 0x00000000, 0x3D6029B0, 0x7AC05360, 0x47A07AD0,
+ 0xF580A6C0, 0xC8E08F70, 0x8F40F5A0, 0xB220DC10,
+ 0x30704BC1, 0x0D106271, 0x4AB018A1, 0x77D03111,
+ 0xC5F0ED01, 0xF890C4B1, 0xBF30BE61, 0x825097D1,
+ 0x60E09782, 0x5D80BE32, 0x1A20C4E2, 0x2740ED52,
+ 0x95603142, 0xA80018F2, 0xEFA06222, 0xD2C04B92,
+ 0x5090DC43, 0x6DF0F5F3, 0x2A508F23, 0x1730A693,
+ 0xA5107A83, 0x98705333, 0xDFD029E3, 0xE2B00053,
+ 0xC1C12F04, 0xFCA106B4, 0xBB017C64, 0x866155D4,
+ 0x344189C4, 0x0921A074, 0x4E81DAA4, 0x73E1F314,
+ 0xF1B164C5, 0xCCD14D75, 0x8B7137A5, 0xB6111E15,
+ 0x0431C205, 0x3951EBB5, 0x7EF19165, 0x4391B8D5,
+ 0xA121B886, 0x9C419136, 0xDBE1EBE6, 0xE681C256,
+ 0x54A11E46, 0x69C137F6, 0x2E614D26, 0x13016496,
+ 0x9151F347, 0xAC31DAF7, 0xEB91A027, 0xD6F18997,
+ 0x64D15587, 0x59B17C37, 0x1E1106E7, 0x23712F57,
+ 0x58F35849, 0x659371F9, 0x22330B29, 0x1F532299,
+ 0xAD73FE89, 0x9013D739, 0xD7B3ADE9, 0xEAD38459,
+ 0x68831388, 0x55E33A38, 0x124340E8, 0x2F236958,
+ 0x9D03B548, 0xA0639CF8, 0xE7C3E628, 0xDAA3CF98,
+ 0x3813CFCB, 0x0573E67B, 0x42D39CAB, 0x7FB3B51B,
+ 0xCD93690B, 0xF0F340BB, 0xB7533A6B, 0x8A3313DB,
+ 0x0863840A, 0x3503ADBA, 0x72A3D76A, 0x4FC3FEDA,
+ 0xFDE322CA, 0xC0830B7A, 0x872371AA, 0xBA43581A,
+ 0x9932774D, 0xA4525EFD, 0xE3F2242D, 0xDE920D9D,
+ 0x6CB2D18D, 0x51D2F83D, 0x167282ED, 0x2B12AB5D,
+ 0xA9423C8C, 0x9422153C, 0xD3826FEC, 0xEEE2465C,
+ 0x5CC29A4C, 0x61A2B3FC, 0x2602C92C, 0x1B62E09C,
+ 0xF9D2E0CF, 0xC4B2C97F, 0x8312B3AF, 0xBE729A1F,
+ 0x0C52460F, 0x31326FBF, 0x7692156F, 0x4BF23CDF,
+ 0xC9A2AB0E, 0xF4C282BE, 0xB362F86E, 0x8E02D1DE,
+ 0x3C220DCE, 0x0142247E, 0x46E25EAE, 0x7B82771E,
+ 0xB1E6B092, 0x8C869922, 0xCB26E3F2, 0xF646CA42,
+ 0x44661652, 0x79063FE2, 0x3EA64532, 0x03C66C82,
+ 0x8196FB53, 0xBCF6D2E3, 0xFB56A833, 0xC6368183,
+ 0x74165D93, 0x49767423, 0x0ED60EF3, 0x33B62743,
+ 0xD1062710, 0xEC660EA0, 0xABC67470, 0x96A65DC0,
+ 0x248681D0, 0x19E6A860, 0x5E46D2B0, 0x6326FB00,
+ 0xE1766CD1, 0xDC164561, 0x9BB63FB1, 0xA6D61601,
+ 0x14F6CA11, 0x2996E3A1, 0x6E369971, 0x5356B0C1,
+ 0x70279F96, 0x4D47B626, 0x0AE7CCF6, 0x3787E546,
+ 0x85A73956, 0xB8C710E6, 0xFF676A36, 0xC2074386,
+ 0x4057D457, 0x7D37FDE7, 0x3A978737, 0x07F7AE87,
+ 0xB5D77297, 0x88B75B27, 0xCF1721F7, 0xF2770847,
+ 0x10C70814, 0x2DA721A4, 0x6A075B74, 0x576772C4,
+ 0xE547AED4, 0xD8278764, 0x9F87FDB4, 0xA2E7D404,
+ 0x20B743D5, 0x1DD76A65, 0x5A7710B5, 0x67173905,
+ 0xD537E515, 0xE857CCA5, 0xAFF7B675, 0x92979FC5,
+ 0xE915E8DB, 0xD475C16B, 0x93D5BBBB, 0xAEB5920B,
+ 0x1C954E1B, 0x21F567AB, 0x66551D7B, 0x5B3534CB,
+ 0xD965A31A, 0xE4058AAA, 0xA3A5F07A, 0x9EC5D9CA,
+ 0x2CE505DA, 0x11852C6A, 0x562556BA, 0x6B457F0A,
+ 0x89F57F59, 0xB49556E9, 0xF3352C39, 0xCE550589,
+ 0x7C75D999, 0x4115F029, 0x06B58AF9, 0x3BD5A349,
+ 0xB9853498, 0x84E51D28, 0xC34567F8, 0xFE254E48,
+ 0x4C059258, 0x7165BBE8, 0x36C5C138, 0x0BA5E888,
+ 0x28D4C7DF, 0x15B4EE6F, 0x521494BF, 0x6F74BD0F,
+ 0xDD54611F, 0xE03448AF, 0xA794327F, 0x9AF41BCF,
+ 0x18A48C1E, 0x25C4A5AE, 0x6264DF7E, 0x5F04F6CE,
+ 0xED242ADE, 0xD044036E, 0x97E479BE, 0xAA84500E,
+ 0x4834505D, 0x755479ED, 0x32F4033D, 0x0F942A8D,
+ 0xBDB4F69D, 0x80D4DF2D, 0xC774A5FD, 0xFA148C4D,
+ 0x78441B9C, 0x4524322C, 0x028448FC, 0x3FE4614C,
+ 0x8DC4BD5C, 0xB0A494EC, 0xF704EE3C, 0xCA64C78C,
/* T8_5 */
- 0x00000000, 0xCB5CD3A5, 0x4DC8A10B, 0x869472AE,
- 0x9B914216, 0x50CD91B3, 0xD659E31D, 0x1D0530B8,
- 0xEC53826D, 0x270F51C8, 0xA19B2366, 0x6AC7F0C3,
- 0x77C2C07B, 0xBC9E13DE, 0x3A0A6170, 0xF156B2D5,
- 0x03D6029B, 0xC88AD13E, 0x4E1EA390, 0x85427035,
- 0x9847408D, 0x531B9328, 0xD58FE186, 0x1ED33223,
- 0xEF8580F6, 0x24D95353, 0xA24D21FD, 0x6911F258,
- 0x7414C2E0, 0xBF481145, 0x39DC63EB, 0xF280B04E,
- 0x07AC0536, 0xCCF0D693, 0x4A64A43D, 0x81387798,
- 0x9C3D4720, 0x57619485, 0xD1F5E62B, 0x1AA9358E,
- 0xEBFF875B, 0x20A354FE, 0xA6372650, 0x6D6BF5F5,
- 0x706EC54D, 0xBB3216E8, 0x3DA66446, 0xF6FAB7E3,
- 0x047A07AD, 0xCF26D408, 0x49B2A6A6, 0x82EE7503,
- 0x9FEB45BB, 0x54B7961E, 0xD223E4B0, 0x197F3715,
- 0xE82985C0, 0x23755665, 0xA5E124CB, 0x6EBDF76E,
- 0x73B8C7D6, 0xB8E41473, 0x3E7066DD, 0xF52CB578,
- 0x0F580A6C, 0xC404D9C9, 0x4290AB67, 0x89CC78C2,
- 0x94C9487A, 0x5F959BDF, 0xD901E971, 0x125D3AD4,
- 0xE30B8801, 0x28575BA4, 0xAEC3290A, 0x659FFAAF,
- 0x789ACA17, 0xB3C619B2, 0x35526B1C, 0xFE0EB8B9,
- 0x0C8E08F7, 0xC7D2DB52, 0x4146A9FC, 0x8A1A7A59,
- 0x971F4AE1, 0x5C439944, 0xDAD7EBEA, 0x118B384F,
- 0xE0DD8A9A, 0x2B81593F, 0xAD152B91, 0x6649F834,
- 0x7B4CC88C, 0xB0101B29, 0x36846987, 0xFDD8BA22,
- 0x08F40F5A, 0xC3A8DCFF, 0x453CAE51, 0x8E607DF4,
- 0x93654D4C, 0x58399EE9, 0xDEADEC47, 0x15F13FE2,
- 0xE4A78D37, 0x2FFB5E92, 0xA96F2C3C, 0x6233FF99,
- 0x7F36CF21, 0xB46A1C84, 0x32FE6E2A, 0xF9A2BD8F,
- 0x0B220DC1, 0xC07EDE64, 0x46EAACCA, 0x8DB67F6F,
- 0x90B34FD7, 0x5BEF9C72, 0xDD7BEEDC, 0x16273D79,
- 0xE7718FAC, 0x2C2D5C09, 0xAAB92EA7, 0x61E5FD02,
- 0x7CE0CDBA, 0xB7BC1E1F, 0x31286CB1, 0xFA74BF14,
- 0x1EB014D8, 0xD5ECC77D, 0x5378B5D3, 0x98246676,
- 0x852156CE, 0x4E7D856B, 0xC8E9F7C5, 0x03B52460,
- 0xF2E396B5, 0x39BF4510, 0xBF2B37BE, 0x7477E41B,
- 0x6972D4A3, 0xA22E0706, 0x24BA75A8, 0xEFE6A60D,
- 0x1D661643, 0xD63AC5E6, 0x50AEB748, 0x9BF264ED,
- 0x86F75455, 0x4DAB87F0, 0xCB3FF55E, 0x006326FB,
- 0xF135942E, 0x3A69478B, 0xBCFD3525, 0x77A1E680,
- 0x6AA4D638, 0xA1F8059D, 0x276C7733, 0xEC30A496,
- 0x191C11EE, 0xD240C24B, 0x54D4B0E5, 0x9F886340,
- 0x828D53F8, 0x49D1805D, 0xCF45F2F3, 0x04192156,
- 0xF54F9383, 0x3E134026, 0xB8873288, 0x73DBE12D,
- 0x6EDED195, 0xA5820230, 0x2316709E, 0xE84AA33B,
- 0x1ACA1375, 0xD196C0D0, 0x5702B27E, 0x9C5E61DB,
- 0x815B5163, 0x4A0782C6, 0xCC93F068, 0x07CF23CD,
- 0xF6999118, 0x3DC542BD, 0xBB513013, 0x700DE3B6,
- 0x6D08D30E, 0xA65400AB, 0x20C07205, 0xEB9CA1A0,
- 0x11E81EB4, 0xDAB4CD11, 0x5C20BFBF, 0x977C6C1A,
- 0x8A795CA2, 0x41258F07, 0xC7B1FDA9, 0x0CED2E0C,
- 0xFDBB9CD9, 0x36E74F7C, 0xB0733DD2, 0x7B2FEE77,
- 0x662ADECF, 0xAD760D6A, 0x2BE27FC4, 0xE0BEAC61,
- 0x123E1C2F, 0xD962CF8A, 0x5FF6BD24, 0x94AA6E81,
- 0x89AF5E39, 0x42F38D9C, 0xC467FF32, 0x0F3B2C97,
- 0xFE6D9E42, 0x35314DE7, 0xB3A53F49, 0x78F9ECEC,
- 0x65FCDC54, 0xAEA00FF1, 0x28347D5F, 0xE368AEFA,
- 0x16441B82, 0xDD18C827, 0x5B8CBA89, 0x90D0692C,
- 0x8DD55994, 0x46898A31, 0xC01DF89F, 0x0B412B3A,
- 0xFA1799EF, 0x314B4A4A, 0xB7DF38E4, 0x7C83EB41,
- 0x6186DBF9, 0xAADA085C, 0x2C4E7AF2, 0xE712A957,
- 0x15921919, 0xDECECABC, 0x585AB812, 0x93066BB7,
- 0x8E035B0F, 0x455F88AA, 0xC3CBFA04, 0x089729A1,
- 0xF9C19B74, 0x329D48D1, 0xB4093A7F, 0x7F55E9DA,
- 0x6250D962, 0xA90C0AC7, 0x2F987869, 0xE4C4ABCC,
+ 0x00000000, 0xCB5CD3A5, 0x4DC8A10B, 0x869472AE,
+ 0x9B914216, 0x50CD91B3, 0xD659E31D, 0x1D0530B8,
+ 0xEC53826D, 0x270F51C8, 0xA19B2366, 0x6AC7F0C3,
+ 0x77C2C07B, 0xBC9E13DE, 0x3A0A6170, 0xF156B2D5,
+ 0x03D6029B, 0xC88AD13E, 0x4E1EA390, 0x85427035,
+ 0x9847408D, 0x531B9328, 0xD58FE186, 0x1ED33223,
+ 0xEF8580F6, 0x24D95353, 0xA24D21FD, 0x6911F258,
+ 0x7414C2E0, 0xBF481145, 0x39DC63EB, 0xF280B04E,
+ 0x07AC0536, 0xCCF0D693, 0x4A64A43D, 0x81387798,
+ 0x9C3D4720, 0x57619485, 0xD1F5E62B, 0x1AA9358E,
+ 0xEBFF875B, 0x20A354FE, 0xA6372650, 0x6D6BF5F5,
+ 0x706EC54D, 0xBB3216E8, 0x3DA66446, 0xF6FAB7E3,
+ 0x047A07AD, 0xCF26D408, 0x49B2A6A6, 0x82EE7503,
+ 0x9FEB45BB, 0x54B7961E, 0xD223E4B0, 0x197F3715,
+ 0xE82985C0, 0x23755665, 0xA5E124CB, 0x6EBDF76E,
+ 0x73B8C7D6, 0xB8E41473, 0x3E7066DD, 0xF52CB578,
+ 0x0F580A6C, 0xC404D9C9, 0x4290AB67, 0x89CC78C2,
+ 0x94C9487A, 0x5F959BDF, 0xD901E971, 0x125D3AD4,
+ 0xE30B8801, 0x28575BA4, 0xAEC3290A, 0x659FFAAF,
+ 0x789ACA17, 0xB3C619B2, 0x35526B1C, 0xFE0EB8B9,
+ 0x0C8E08F7, 0xC7D2DB52, 0x4146A9FC, 0x8A1A7A59,
+ 0x971F4AE1, 0x5C439944, 0xDAD7EBEA, 0x118B384F,
+ 0xE0DD8A9A, 0x2B81593F, 0xAD152B91, 0x6649F834,
+ 0x7B4CC88C, 0xB0101B29, 0x36846987, 0xFDD8BA22,
+ 0x08F40F5A, 0xC3A8DCFF, 0x453CAE51, 0x8E607DF4,
+ 0x93654D4C, 0x58399EE9, 0xDEADEC47, 0x15F13FE2,
+ 0xE4A78D37, 0x2FFB5E92, 0xA96F2C3C, 0x6233FF99,
+ 0x7F36CF21, 0xB46A1C84, 0x32FE6E2A, 0xF9A2BD8F,
+ 0x0B220DC1, 0xC07EDE64, 0x46EAACCA, 0x8DB67F6F,
+ 0x90B34FD7, 0x5BEF9C72, 0xDD7BEEDC, 0x16273D79,
+ 0xE7718FAC, 0x2C2D5C09, 0xAAB92EA7, 0x61E5FD02,
+ 0x7CE0CDBA, 0xB7BC1E1F, 0x31286CB1, 0xFA74BF14,
+ 0x1EB014D8, 0xD5ECC77D, 0x5378B5D3, 0x98246676,
+ 0x852156CE, 0x4E7D856B, 0xC8E9F7C5, 0x03B52460,
+ 0xF2E396B5, 0x39BF4510, 0xBF2B37BE, 0x7477E41B,
+ 0x6972D4A3, 0xA22E0706, 0x24BA75A8, 0xEFE6A60D,
+ 0x1D661643, 0xD63AC5E6, 0x50AEB748, 0x9BF264ED,
+ 0x86F75455, 0x4DAB87F0, 0xCB3FF55E, 0x006326FB,
+ 0xF135942E, 0x3A69478B, 0xBCFD3525, 0x77A1E680,
+ 0x6AA4D638, 0xA1F8059D, 0x276C7733, 0xEC30A496,
+ 0x191C11EE, 0xD240C24B, 0x54D4B0E5, 0x9F886340,
+ 0x828D53F8, 0x49D1805D, 0xCF45F2F3, 0x04192156,
+ 0xF54F9383, 0x3E134026, 0xB8873288, 0x73DBE12D,
+ 0x6EDED195, 0xA5820230, 0x2316709E, 0xE84AA33B,
+ 0x1ACA1375, 0xD196C0D0, 0x5702B27E, 0x9C5E61DB,
+ 0x815B5163, 0x4A0782C6, 0xCC93F068, 0x07CF23CD,
+ 0xF6999118, 0x3DC542BD, 0xBB513013, 0x700DE3B6,
+ 0x6D08D30E, 0xA65400AB, 0x20C07205, 0xEB9CA1A0,
+ 0x11E81EB4, 0xDAB4CD11, 0x5C20BFBF, 0x977C6C1A,
+ 0x8A795CA2, 0x41258F07, 0xC7B1FDA9, 0x0CED2E0C,
+ 0xFDBB9CD9, 0x36E74F7C, 0xB0733DD2, 0x7B2FEE77,
+ 0x662ADECF, 0xAD760D6A, 0x2BE27FC4, 0xE0BEAC61,
+ 0x123E1C2F, 0xD962CF8A, 0x5FF6BD24, 0x94AA6E81,
+ 0x89AF5E39, 0x42F38D9C, 0xC467FF32, 0x0F3B2C97,
+ 0xFE6D9E42, 0x35314DE7, 0xB3A53F49, 0x78F9ECEC,
+ 0x65FCDC54, 0xAEA00FF1, 0x28347D5F, 0xE368AEFA,
+ 0x16441B82, 0xDD18C827, 0x5B8CBA89, 0x90D0692C,
+ 0x8DD55994, 0x46898A31, 0xC01DF89F, 0x0B412B3A,
+ 0xFA1799EF, 0x314B4A4A, 0xB7DF38E4, 0x7C83EB41,
+ 0x6186DBF9, 0xAADA085C, 0x2C4E7AF2, 0xE712A957,
+ 0x15921919, 0xDECECABC, 0x585AB812, 0x93066BB7,
+ 0x8E035B0F, 0x455F88AA, 0xC3CBFA04, 0x089729A1,
+ 0xF9C19B74, 0x329D48D1, 0xB4093A7F, 0x7F55E9DA,
+ 0x6250D962, 0xA90C0AC7, 0x2F987869, 0xE4C4ABCC,
/* T8_6 */
- 0x00000000, 0xA6770BB4, 0x979F1129, 0x31E81A9D,
- 0xF44F2413, 0x52382FA7, 0x63D0353A, 0xC5A73E8E,
- 0x33EF4E67, 0x959845D3, 0xA4705F4E, 0x020754FA,
- 0xC7A06A74, 0x61D761C0, 0x503F7B5D, 0xF64870E9,
- 0x67DE9CCE, 0xC1A9977A, 0xF0418DE7, 0x56368653,
- 0x9391B8DD, 0x35E6B369, 0x040EA9F4, 0xA279A240,
- 0x5431D2A9, 0xF246D91D, 0xC3AEC380, 0x65D9C834,
- 0xA07EF6BA, 0x0609FD0E, 0x37E1E793, 0x9196EC27,
- 0xCFBD399C, 0x69CA3228, 0x582228B5, 0xFE552301,
- 0x3BF21D8F, 0x9D85163B, 0xAC6D0CA6, 0x0A1A0712,
- 0xFC5277FB, 0x5A257C4F, 0x6BCD66D2, 0xCDBA6D66,
- 0x081D53E8, 0xAE6A585C, 0x9F8242C1, 0x39F54975,
- 0xA863A552, 0x0E14AEE6, 0x3FFCB47B, 0x998BBFCF,
- 0x5C2C8141, 0xFA5B8AF5, 0xCBB39068, 0x6DC49BDC,
- 0x9B8CEB35, 0x3DFBE081, 0x0C13FA1C, 0xAA64F1A8,
- 0x6FC3CF26, 0xC9B4C492, 0xF85CDE0F, 0x5E2BD5BB,
- 0x440B7579, 0xE27C7ECD, 0xD3946450, 0x75E36FE4,
- 0xB044516A, 0x16335ADE, 0x27DB4043, 0x81AC4BF7,
- 0x77E43B1E, 0xD19330AA, 0xE07B2A37, 0x460C2183,
- 0x83AB1F0D, 0x25DC14B9, 0x14340E24, 0xB2430590,
- 0x23D5E9B7, 0x85A2E203, 0xB44AF89E, 0x123DF32A,
- 0xD79ACDA4, 0x71EDC610, 0x4005DC8D, 0xE672D739,
- 0x103AA7D0, 0xB64DAC64, 0x87A5B6F9, 0x21D2BD4D,
- 0xE47583C3, 0x42028877, 0x73EA92EA, 0xD59D995E,
- 0x8BB64CE5, 0x2DC14751, 0x1C295DCC, 0xBA5E5678,
- 0x7FF968F6, 0xD98E6342, 0xE86679DF, 0x4E11726B,
- 0xB8590282, 0x1E2E0936, 0x2FC613AB, 0x89B1181F,
- 0x4C162691, 0xEA612D25, 0xDB8937B8, 0x7DFE3C0C,
- 0xEC68D02B, 0x4A1FDB9F, 0x7BF7C102, 0xDD80CAB6,
- 0x1827F438, 0xBE50FF8C, 0x8FB8E511, 0x29CFEEA5,
- 0xDF879E4C, 0x79F095F8, 0x48188F65, 0xEE6F84D1,
- 0x2BC8BA5F, 0x8DBFB1EB, 0xBC57AB76, 0x1A20A0C2,
- 0x8816EAF2, 0x2E61E146, 0x1F89FBDB, 0xB9FEF06F,
- 0x7C59CEE1, 0xDA2EC555, 0xEBC6DFC8, 0x4DB1D47C,
- 0xBBF9A495, 0x1D8EAF21, 0x2C66B5BC, 0x8A11BE08,
- 0x4FB68086, 0xE9C18B32, 0xD82991AF, 0x7E5E9A1B,
- 0xEFC8763C, 0x49BF7D88, 0x78576715, 0xDE206CA1,
- 0x1B87522F, 0xBDF0599B, 0x8C184306, 0x2A6F48B2,
- 0xDC27385B, 0x7A5033EF, 0x4BB82972, 0xEDCF22C6,
- 0x28681C48, 0x8E1F17FC, 0xBFF70D61, 0x198006D5,
- 0x47ABD36E, 0xE1DCD8DA, 0xD034C247, 0x7643C9F3,
- 0xB3E4F77D, 0x1593FCC9, 0x247BE654, 0x820CEDE0,
- 0x74449D09, 0xD23396BD, 0xE3DB8C20, 0x45AC8794,
- 0x800BB91A, 0x267CB2AE, 0x1794A833, 0xB1E3A387,
- 0x20754FA0, 0x86024414, 0xB7EA5E89, 0x119D553D,
- 0xD43A6BB3, 0x724D6007, 0x43A57A9A, 0xE5D2712E,
- 0x139A01C7, 0xB5ED0A73, 0x840510EE, 0x22721B5A,
- 0xE7D525D4, 0x41A22E60, 0x704A34FD, 0xD63D3F49,
- 0xCC1D9F8B, 0x6A6A943F, 0x5B828EA2, 0xFDF58516,
- 0x3852BB98, 0x9E25B02C, 0xAFCDAAB1, 0x09BAA105,
- 0xFFF2D1EC, 0x5985DA58, 0x686DC0C5, 0xCE1ACB71,
- 0x0BBDF5FF, 0xADCAFE4B, 0x9C22E4D6, 0x3A55EF62,
- 0xABC30345, 0x0DB408F1, 0x3C5C126C, 0x9A2B19D8,
- 0x5F8C2756, 0xF9FB2CE2, 0xC813367F, 0x6E643DCB,
- 0x982C4D22, 0x3E5B4696, 0x0FB35C0B, 0xA9C457BF,
- 0x6C636931, 0xCA146285, 0xFBFC7818, 0x5D8B73AC,
- 0x03A0A617, 0xA5D7ADA3, 0x943FB73E, 0x3248BC8A,
- 0xF7EF8204, 0x519889B0, 0x6070932D, 0xC6079899,
- 0x304FE870, 0x9638E3C4, 0xA7D0F959, 0x01A7F2ED,
- 0xC400CC63, 0x6277C7D7, 0x539FDD4A, 0xF5E8D6FE,
- 0x647E3AD9, 0xC209316D, 0xF3E12BF0, 0x55962044,
- 0x90311ECA, 0x3646157E, 0x07AE0FE3, 0xA1D90457,
- 0x579174BE, 0xF1E67F0A, 0xC00E6597, 0x66796E23,
- 0xA3DE50AD, 0x05A95B19, 0x34414184, 0x92364A30,
+ 0x00000000, 0xA6770BB4, 0x979F1129, 0x31E81A9D,
+ 0xF44F2413, 0x52382FA7, 0x63D0353A, 0xC5A73E8E,
+ 0x33EF4E67, 0x959845D3, 0xA4705F4E, 0x020754FA,
+ 0xC7A06A74, 0x61D761C0, 0x503F7B5D, 0xF64870E9,
+ 0x67DE9CCE, 0xC1A9977A, 0xF0418DE7, 0x56368653,
+ 0x9391B8DD, 0x35E6B369, 0x040EA9F4, 0xA279A240,
+ 0x5431D2A9, 0xF246D91D, 0xC3AEC380, 0x65D9C834,
+ 0xA07EF6BA, 0x0609FD0E, 0x37E1E793, 0x9196EC27,
+ 0xCFBD399C, 0x69CA3228, 0x582228B5, 0xFE552301,
+ 0x3BF21D8F, 0x9D85163B, 0xAC6D0CA6, 0x0A1A0712,
+ 0xFC5277FB, 0x5A257C4F, 0x6BCD66D2, 0xCDBA6D66,
+ 0x081D53E8, 0xAE6A585C, 0x9F8242C1, 0x39F54975,
+ 0xA863A552, 0x0E14AEE6, 0x3FFCB47B, 0x998BBFCF,
+ 0x5C2C8141, 0xFA5B8AF5, 0xCBB39068, 0x6DC49BDC,
+ 0x9B8CEB35, 0x3DFBE081, 0x0C13FA1C, 0xAA64F1A8,
+ 0x6FC3CF26, 0xC9B4C492, 0xF85CDE0F, 0x5E2BD5BB,
+ 0x440B7579, 0xE27C7ECD, 0xD3946450, 0x75E36FE4,
+ 0xB044516A, 0x16335ADE, 0x27DB4043, 0x81AC4BF7,
+ 0x77E43B1E, 0xD19330AA, 0xE07B2A37, 0x460C2183,
+ 0x83AB1F0D, 0x25DC14B9, 0x14340E24, 0xB2430590,
+ 0x23D5E9B7, 0x85A2E203, 0xB44AF89E, 0x123DF32A,
+ 0xD79ACDA4, 0x71EDC610, 0x4005DC8D, 0xE672D739,
+ 0x103AA7D0, 0xB64DAC64, 0x87A5B6F9, 0x21D2BD4D,
+ 0xE47583C3, 0x42028877, 0x73EA92EA, 0xD59D995E,
+ 0x8BB64CE5, 0x2DC14751, 0x1C295DCC, 0xBA5E5678,
+ 0x7FF968F6, 0xD98E6342, 0xE86679DF, 0x4E11726B,
+ 0xB8590282, 0x1E2E0936, 0x2FC613AB, 0x89B1181F,
+ 0x4C162691, 0xEA612D25, 0xDB8937B8, 0x7DFE3C0C,
+ 0xEC68D02B, 0x4A1FDB9F, 0x7BF7C102, 0xDD80CAB6,
+ 0x1827F438, 0xBE50FF8C, 0x8FB8E511, 0x29CFEEA5,
+ 0xDF879E4C, 0x79F095F8, 0x48188F65, 0xEE6F84D1,
+ 0x2BC8BA5F, 0x8DBFB1EB, 0xBC57AB76, 0x1A20A0C2,
+ 0x8816EAF2, 0x2E61E146, 0x1F89FBDB, 0xB9FEF06F,
+ 0x7C59CEE1, 0xDA2EC555, 0xEBC6DFC8, 0x4DB1D47C,
+ 0xBBF9A495, 0x1D8EAF21, 0x2C66B5BC, 0x8A11BE08,
+ 0x4FB68086, 0xE9C18B32, 0xD82991AF, 0x7E5E9A1B,
+ 0xEFC8763C, 0x49BF7D88, 0x78576715, 0xDE206CA1,
+ 0x1B87522F, 0xBDF0599B, 0x8C184306, 0x2A6F48B2,
+ 0xDC27385B, 0x7A5033EF, 0x4BB82972, 0xEDCF22C6,
+ 0x28681C48, 0x8E1F17FC, 0xBFF70D61, 0x198006D5,
+ 0x47ABD36E, 0xE1DCD8DA, 0xD034C247, 0x7643C9F3,
+ 0xB3E4F77D, 0x1593FCC9, 0x247BE654, 0x820CEDE0,
+ 0x74449D09, 0xD23396BD, 0xE3DB8C20, 0x45AC8794,
+ 0x800BB91A, 0x267CB2AE, 0x1794A833, 0xB1E3A387,
+ 0x20754FA0, 0x86024414, 0xB7EA5E89, 0x119D553D,
+ 0xD43A6BB3, 0x724D6007, 0x43A57A9A, 0xE5D2712E,
+ 0x139A01C7, 0xB5ED0A73, 0x840510EE, 0x22721B5A,
+ 0xE7D525D4, 0x41A22E60, 0x704A34FD, 0xD63D3F49,
+ 0xCC1D9F8B, 0x6A6A943F, 0x5B828EA2, 0xFDF58516,
+ 0x3852BB98, 0x9E25B02C, 0xAFCDAAB1, 0x09BAA105,
+ 0xFFF2D1EC, 0x5985DA58, 0x686DC0C5, 0xCE1ACB71,
+ 0x0BBDF5FF, 0xADCAFE4B, 0x9C22E4D6, 0x3A55EF62,
+ 0xABC30345, 0x0DB408F1, 0x3C5C126C, 0x9A2B19D8,
+ 0x5F8C2756, 0xF9FB2CE2, 0xC813367F, 0x6E643DCB,
+ 0x982C4D22, 0x3E5B4696, 0x0FB35C0B, 0xA9C457BF,
+ 0x6C636931, 0xCA146285, 0xFBFC7818, 0x5D8B73AC,
+ 0x03A0A617, 0xA5D7ADA3, 0x943FB73E, 0x3248BC8A,
+ 0xF7EF8204, 0x519889B0, 0x6070932D, 0xC6079899,
+ 0x304FE870, 0x9638E3C4, 0xA7D0F959, 0x01A7F2ED,
+ 0xC400CC63, 0x6277C7D7, 0x539FDD4A, 0xF5E8D6FE,
+ 0x647E3AD9, 0xC209316D, 0xF3E12BF0, 0x55962044,
+ 0x90311ECA, 0x3646157E, 0x07AE0FE3, 0xA1D90457,
+ 0x579174BE, 0xF1E67F0A, 0xC00E6597, 0x66796E23,
+ 0xA3DE50AD, 0x05A95B19, 0x34414184, 0x92364A30,
/* T8_7 */
- 0x00000000, 0xCCAA009E, 0x4225077D, 0x8E8F07E3,
- 0x844A0EFA, 0x48E00E64, 0xC66F0987, 0x0AC50919,
- 0xD3E51BB5, 0x1F4F1B2B, 0x91C01CC8, 0x5D6A1C56,
- 0x57AF154F, 0x9B0515D1, 0x158A1232, 0xD92012AC,
- 0x7CBB312B, 0xB01131B5, 0x3E9E3656, 0xF23436C8,
- 0xF8F13FD1, 0x345B3F4F, 0xBAD438AC, 0x767E3832,
- 0xAF5E2A9E, 0x63F42A00, 0xED7B2DE3, 0x21D12D7D,
- 0x2B142464, 0xE7BE24FA, 0x69312319, 0xA59B2387,
- 0xF9766256, 0x35DC62C8, 0xBB53652B, 0x77F965B5,
- 0x7D3C6CAC, 0xB1966C32, 0x3F196BD1, 0xF3B36B4F,
- 0x2A9379E3, 0xE639797D, 0x68B67E9E, 0xA41C7E00,
- 0xAED97719, 0x62737787, 0xECFC7064, 0x205670FA,
- 0x85CD537D, 0x496753E3, 0xC7E85400, 0x0B42549E,
- 0x01875D87, 0xCD2D5D19, 0x43A25AFA, 0x8F085A64,
- 0x562848C8, 0x9A824856, 0x140D4FB5, 0xD8A74F2B,
- 0xD2624632, 0x1EC846AC, 0x9047414F, 0x5CED41D1,
- 0x299DC2ED, 0xE537C273, 0x6BB8C590, 0xA712C50E,
- 0xADD7CC17, 0x617DCC89, 0xEFF2CB6A, 0x2358CBF4,
- 0xFA78D958, 0x36D2D9C6, 0xB85DDE25, 0x74F7DEBB,
- 0x7E32D7A2, 0xB298D73C, 0x3C17D0DF, 0xF0BDD041,
- 0x5526F3C6, 0x998CF358, 0x1703F4BB, 0xDBA9F425,
- 0xD16CFD3C, 0x1DC6FDA2, 0x9349FA41, 0x5FE3FADF,
- 0x86C3E873, 0x4A69E8ED, 0xC4E6EF0E, 0x084CEF90,
- 0x0289E689, 0xCE23E617, 0x40ACE1F4, 0x8C06E16A,
- 0xD0EBA0BB, 0x1C41A025, 0x92CEA7C6, 0x5E64A758,
- 0x54A1AE41, 0x980BAEDF, 0x1684A93C, 0xDA2EA9A2,
- 0x030EBB0E, 0xCFA4BB90, 0x412BBC73, 0x8D81BCED,
- 0x8744B5F4, 0x4BEEB56A, 0xC561B289, 0x09CBB217,
- 0xAC509190, 0x60FA910E, 0xEE7596ED, 0x22DF9673,
- 0x281A9F6A, 0xE4B09FF4, 0x6A3F9817, 0xA6959889,
- 0x7FB58A25, 0xB31F8ABB, 0x3D908D58, 0xF13A8DC6,
- 0xFBFF84DF, 0x37558441, 0xB9DA83A2, 0x7570833C,
- 0x533B85DA, 0x9F918544, 0x111E82A7, 0xDDB48239,
- 0xD7718B20, 0x1BDB8BBE, 0x95548C5D, 0x59FE8CC3,
- 0x80DE9E6F, 0x4C749EF1, 0xC2FB9912, 0x0E51998C,
- 0x04949095, 0xC83E900B, 0x46B197E8, 0x8A1B9776,
- 0x2F80B4F1, 0xE32AB46F, 0x6DA5B38C, 0xA10FB312,
- 0xABCABA0B, 0x6760BA95, 0xE9EFBD76, 0x2545BDE8,
- 0xFC65AF44, 0x30CFAFDA, 0xBE40A839, 0x72EAA8A7,
- 0x782FA1BE, 0xB485A120, 0x3A0AA6C3, 0xF6A0A65D,
- 0xAA4DE78C, 0x66E7E712, 0xE868E0F1, 0x24C2E06F,
- 0x2E07E976, 0xE2ADE9E8, 0x6C22EE0B, 0xA088EE95,
- 0x79A8FC39, 0xB502FCA7, 0x3B8DFB44, 0xF727FBDA,
- 0xFDE2F2C3, 0x3148F25D, 0xBFC7F5BE, 0x736DF520,
- 0xD6F6D6A7, 0x1A5CD639, 0x94D3D1DA, 0x5879D144,
- 0x52BCD85D, 0x9E16D8C3, 0x1099DF20, 0xDC33DFBE,
- 0x0513CD12, 0xC9B9CD8C, 0x4736CA6F, 0x8B9CCAF1,
- 0x8159C3E8, 0x4DF3C376, 0xC37CC495, 0x0FD6C40B,
- 0x7AA64737, 0xB60C47A9, 0x3883404A, 0xF42940D4,
- 0xFEEC49CD, 0x32464953, 0xBCC94EB0, 0x70634E2E,
- 0xA9435C82, 0x65E95C1C, 0xEB665BFF, 0x27CC5B61,
- 0x2D095278, 0xE1A352E6, 0x6F2C5505, 0xA386559B,
- 0x061D761C, 0xCAB77682, 0x44387161, 0x889271FF,
- 0x825778E6, 0x4EFD7878, 0xC0727F9B, 0x0CD87F05,
- 0xD5F86DA9, 0x19526D37, 0x97DD6AD4, 0x5B776A4A,
- 0x51B26353, 0x9D1863CD, 0x1397642E, 0xDF3D64B0,
- 0x83D02561, 0x4F7A25FF, 0xC1F5221C, 0x0D5F2282,
- 0x079A2B9B, 0xCB302B05, 0x45BF2CE6, 0x89152C78,
- 0x50353ED4, 0x9C9F3E4A, 0x121039A9, 0xDEBA3937,
- 0xD47F302E, 0x18D530B0, 0x965A3753, 0x5AF037CD,
- 0xFF6B144A, 0x33C114D4, 0xBD4E1337, 0x71E413A9,
- 0x7B211AB0, 0xB78B1A2E, 0x39041DCD, 0xF5AE1D53,
- 0x2C8E0FFF, 0xE0240F61, 0x6EAB0882, 0xA201081C,
- 0xA8C40105, 0x646E019B, 0xEAE10678, 0x264B06E6
+ 0x00000000, 0xCCAA009E, 0x4225077D, 0x8E8F07E3,
+ 0x844A0EFA, 0x48E00E64, 0xC66F0987, 0x0AC50919,
+ 0xD3E51BB5, 0x1F4F1B2B, 0x91C01CC8, 0x5D6A1C56,
+ 0x57AF154F, 0x9B0515D1, 0x158A1232, 0xD92012AC,
+ 0x7CBB312B, 0xB01131B5, 0x3E9E3656, 0xF23436C8,
+ 0xF8F13FD1, 0x345B3F4F, 0xBAD438AC, 0x767E3832,
+ 0xAF5E2A9E, 0x63F42A00, 0xED7B2DE3, 0x21D12D7D,
+ 0x2B142464, 0xE7BE24FA, 0x69312319, 0xA59B2387,
+ 0xF9766256, 0x35DC62C8, 0xBB53652B, 0x77F965B5,
+ 0x7D3C6CAC, 0xB1966C32, 0x3F196BD1, 0xF3B36B4F,
+ 0x2A9379E3, 0xE639797D, 0x68B67E9E, 0xA41C7E00,
+ 0xAED97719, 0x62737787, 0xECFC7064, 0x205670FA,
+ 0x85CD537D, 0x496753E3, 0xC7E85400, 0x0B42549E,
+ 0x01875D87, 0xCD2D5D19, 0x43A25AFA, 0x8F085A64,
+ 0x562848C8, 0x9A824856, 0x140D4FB5, 0xD8A74F2B,
+ 0xD2624632, 0x1EC846AC, 0x9047414F, 0x5CED41D1,
+ 0x299DC2ED, 0xE537C273, 0x6BB8C590, 0xA712C50E,
+ 0xADD7CC17, 0x617DCC89, 0xEFF2CB6A, 0x2358CBF4,
+ 0xFA78D958, 0x36D2D9C6, 0xB85DDE25, 0x74F7DEBB,
+ 0x7E32D7A2, 0xB298D73C, 0x3C17D0DF, 0xF0BDD041,
+ 0x5526F3C6, 0x998CF358, 0x1703F4BB, 0xDBA9F425,
+ 0xD16CFD3C, 0x1DC6FDA2, 0x9349FA41, 0x5FE3FADF,
+ 0x86C3E873, 0x4A69E8ED, 0xC4E6EF0E, 0x084CEF90,
+ 0x0289E689, 0xCE23E617, 0x40ACE1F4, 0x8C06E16A,
+ 0xD0EBA0BB, 0x1C41A025, 0x92CEA7C6, 0x5E64A758,
+ 0x54A1AE41, 0x980BAEDF, 0x1684A93C, 0xDA2EA9A2,
+ 0x030EBB0E, 0xCFA4BB90, 0x412BBC73, 0x8D81BCED,
+ 0x8744B5F4, 0x4BEEB56A, 0xC561B289, 0x09CBB217,
+ 0xAC509190, 0x60FA910E, 0xEE7596ED, 0x22DF9673,
+ 0x281A9F6A, 0xE4B09FF4, 0x6A3F9817, 0xA6959889,
+ 0x7FB58A25, 0xB31F8ABB, 0x3D908D58, 0xF13A8DC6,
+ 0xFBFF84DF, 0x37558441, 0xB9DA83A2, 0x7570833C,
+ 0x533B85DA, 0x9F918544, 0x111E82A7, 0xDDB48239,
+ 0xD7718B20, 0x1BDB8BBE, 0x95548C5D, 0x59FE8CC3,
+ 0x80DE9E6F, 0x4C749EF1, 0xC2FB9912, 0x0E51998C,
+ 0x04949095, 0xC83E900B, 0x46B197E8, 0x8A1B9776,
+ 0x2F80B4F1, 0xE32AB46F, 0x6DA5B38C, 0xA10FB312,
+ 0xABCABA0B, 0x6760BA95, 0xE9EFBD76, 0x2545BDE8,
+ 0xFC65AF44, 0x30CFAFDA, 0xBE40A839, 0x72EAA8A7,
+ 0x782FA1BE, 0xB485A120, 0x3A0AA6C3, 0xF6A0A65D,
+ 0xAA4DE78C, 0x66E7E712, 0xE868E0F1, 0x24C2E06F,
+ 0x2E07E976, 0xE2ADE9E8, 0x6C22EE0B, 0xA088EE95,
+ 0x79A8FC39, 0xB502FCA7, 0x3B8DFB44, 0xF727FBDA,
+ 0xFDE2F2C3, 0x3148F25D, 0xBFC7F5BE, 0x736DF520,
+ 0xD6F6D6A7, 0x1A5CD639, 0x94D3D1DA, 0x5879D144,
+ 0x52BCD85D, 0x9E16D8C3, 0x1099DF20, 0xDC33DFBE,
+ 0x0513CD12, 0xC9B9CD8C, 0x4736CA6F, 0x8B9CCAF1,
+ 0x8159C3E8, 0x4DF3C376, 0xC37CC495, 0x0FD6C40B,
+ 0x7AA64737, 0xB60C47A9, 0x3883404A, 0xF42940D4,
+ 0xFEEC49CD, 0x32464953, 0xBCC94EB0, 0x70634E2E,
+ 0xA9435C82, 0x65E95C1C, 0xEB665BFF, 0x27CC5B61,
+ 0x2D095278, 0xE1A352E6, 0x6F2C5505, 0xA386559B,
+ 0x061D761C, 0xCAB77682, 0x44387161, 0x889271FF,
+ 0x825778E6, 0x4EFD7878, 0xC0727F9B, 0x0CD87F05,
+ 0xD5F86DA9, 0x19526D37, 0x97DD6AD4, 0x5B776A4A,
+ 0x51B26353, 0x9D1863CD, 0x1397642E, 0xDF3D64B0,
+ 0x83D02561, 0x4F7A25FF, 0xC1F5221C, 0x0D5F2282,
+ 0x079A2B9B, 0xCB302B05, 0x45BF2CE6, 0x89152C78,
+ 0x50353ED4, 0x9C9F3E4A, 0x121039A9, 0xDEBA3937,
+ 0xD47F302E, 0x18D530B0, 0x965A3753, 0x5AF037CD,
+ 0xFF6B144A, 0x33C114D4, 0xBD4E1337, 0x71E413A9,
+ 0x7B211AB0, 0xB78B1A2E, 0x39041DCD, 0xF5AE1D53,
+ 0x2C8E0FFF, 0xE0240F61, 0x6EAB0882, 0xA201081C,
+ 0xA8C40105, 0x646E019B, 0xEAE10678, 0x264B06E6
};
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/TxRecordSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/TxRecordSerializer.java
index 1fa1fad..3a326cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/TxRecordSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/TxRecordSerializer.java
@@ -257,6 +257,6 @@ public class TxRecordSerializer {
* @throws IgniteCheckedException In case of fail.
*/
public int size(MvccTxRecord rec) throws IgniteCheckedException {
- return size((TxRecord)rec) + MVCC_VERSION_SIZE;
+ return size((TxRecord)rec) + MVCC_VERSION_SIZE;
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index ced4e4a..0dbcac6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -1663,8 +1663,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
fut = resMap.get(qryInfo.requestId());
if (fut == null) {
- resMap.put(qryInfo.requestId(), fut =
- new GridFutureAdapter<>());
+ resMap.put(qryInfo.requestId(), fut = new GridFutureAdapter<>());
exec = true;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
index 8d419fa..8846b81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
@@ -478,7 +478,7 @@ public interface IgniteInternalTx {
* @return Current value for the key within transaction.
* @throws GridCacheFilterFailedException If filter failed and failFast is {@code true}.
*/
- @Nullable public GridTuple<CacheObject> peek(
+ @Nullable public GridTuple<CacheObject> peek(
GridCacheContext ctx,
boolean failFast,
KeyCacheObject key) throws GridCacheFilterFailedException;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index b5c20c9..024e5e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -298,11 +298,12 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
new ConcurrentHashMap<>();
/** Timeout operations. */
- private final Map<String, GridTimeoutProcessor.CancelableTask> timeoutOperations =
- new HashMap<String, GridTimeoutProcessor.CancelableTask>() {{
- put(IGNITE_LONG_OPERATIONS_DUMP_TIMEOUT, null);
- put(IGNITE_DUMP_TX_COLLISIONS_INTERVAL, null);
- }};
+ private final Map<String, GridTimeoutProcessor.CancelableTask> timeoutOperations = new HashMap<>();
+
+ {
+ timeoutOperations.put(IGNITE_LONG_OPERATIONS_DUMP_TIMEOUT, null);
+ timeoutOperations.put(IGNITE_DUMP_TX_COLLISIONS_INTERVAL, null);
+ }
/** Key collisions info holder. */
private volatile KeyCollisionsHolder keyCollisionsInfo;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index a57dd5c..f96c2ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -510,10 +510,10 @@ public class GridClusterStateProcessor extends GridProcessorAdapter implements I
);
distributedBaselineConfiguration.listenAutoAdjustEnabled((name, oldVal, newVal) -> {
- if (newVal != null && newVal) {
- long topVer = ctx.discovery().topologyVersion();
- baselineTopologyUpdater.triggerBaselineUpdate(topVer);
- }
+ if (newVal != null && newVal) {
+ long topVer = ctx.discovery().topologyVersion();
+ baselineTopologyUpdater.triggerBaselineUpdate(topVer);
+ }
});
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 660786b..3ddab1a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -809,7 +809,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
final int remaps,
ClusterNode remapNode,
AffinityTopologyVersion remapTopVer
- ) {
+ ) {
try {
assert entries != null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index 25b4b40..c932f6a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -212,7 +212,7 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<Clie
", resp=" + resp.status() + ']');
}
- GridNioFuture<?> fut = ses.send(parser.encode(resp));
+ GridNioFuture<?> fut = ses.send(parser.encode(resp));
fut.listen(f -> {
if (f.error() == null)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index d6869aa..d82d610 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
@@ -408,7 +408,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
}
}
- return null;
+ return null;
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index 6493a02..ff6cf73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -709,7 +709,7 @@ public class PlatformCallbackGateway {
try {
return PlatformCallbackUtils.inLongOutLong(envPtr,
PlatformCallbackOp.MessagingFilterCreate, memPtr);
- }
+ }
finally {
leave();
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java
index a030fc1..6d7943b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java
@@ -38,7 +38,7 @@ public class ClientCacheGetAllRequest extends ClientCacheKeysRequest {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public ClientResponse process(ClientConnectionContext ctx) {
- Map val = cache(ctx).getAll(keys());
+ Map val = cache(ctx).getAll(keys());
return new ClientCacheGetAllResponse(requestId(), val);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java
index fda6a54..65c65f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java
@@ -69,8 +69,8 @@ public class ClientCacheQueryContinuousRequest extends ClientCacheRequest {
qry = new ContinuousQuery();
qry.setPageSize(pageSize)
- .setTimeInterval(timeInterval)
- .setIncludeExpired(includeExpired);
+ .setTimeInterval(timeInterval)
+ .setIncludeExpired(includeExpired);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java
index 199e7dc..0aca91b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java
@@ -1155,22 +1155,22 @@ public class PoolProcessor extends GridProcessorAdapter {
boolean allowCoreThreadTimeOut,
long keepAliveTime
) {
- return ctx.security().enabled()
- ? new SecurityAwareStripedThreadPoolExecutor(
- ctx.security(),
- concurrentLvl,
- igniteInstanceName,
- threadNamePrefix,
- eHnd,
- allowCoreThreadTimeOut,
- keepAliveTime)
- : new IgniteStripedThreadPoolExecutor(
- concurrentLvl,
- igniteInstanceName,
- threadNamePrefix,
- eHnd,
- allowCoreThreadTimeOut,
- keepAliveTime);
+ return ctx.security().enabled()
+ ? new SecurityAwareStripedThreadPoolExecutor(
+ ctx.security(),
+ concurrentLvl,
+ igniteInstanceName,
+ threadNamePrefix,
+ eHnd,
+ allowCoreThreadTimeOut,
+ keepAliveTime)
+ : new IgniteStripedThreadPoolExecutor(
+ concurrentLvl,
+ igniteInstanceName,
+ threadNamePrefix,
+ eHnd,
+ allowCoreThreadTimeOut,
+ keepAliveTime);
}
/** Creates instance {@link StripedExecutor} with a notion of whether {@link IgniteSecurity} is enabled. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 3caa7a5..c81af82 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -905,12 +905,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
for (SchemaAbstractDiscoveryMessage msg: activeProposals.values()) {
if (msg.operation() instanceof SchemaAddQueryEntityOperation) {
- SchemaAddQueryEntityOperation op = (SchemaAddQueryEntityOperation)msg.operation();
+ SchemaAddQueryEntityOperation op = (SchemaAddQueryEntityOperation)msg.operation();
- if (op.cacheName().equals(cacheInfo.name())) {
- proceed = true;
+ if (op.cacheName().equals(cacheInfo.name())) {
+ proceed = true;
- break;
+ break;
}
}
}
@@ -1219,7 +1219,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
GridCacheContextInfo<?, ?> cacheInfo,
Collection<QueryEntity> entities,
boolean escape
- ) throws IgniteCheckedException {
+ ) throws IgniteCheckedException {
Collection<QueryTypeCandidate> cands = new ArrayList<>();
List<Class<?>> mustDeserializeClss = new ArrayList<>();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/SqlClientContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/SqlClientContext.java
index 1c44307..7a5b928 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/SqlClientContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/SqlClientContext.java
@@ -115,7 +115,7 @@ public class SqlClientContext implements AutoCloseable {
boolean collocated, boolean replicatedOnly, boolean lazy, boolean skipReducerOnUpdate,
@Nullable Boolean dataPageScanEnabled,
@Nullable Integer updateBatchSize
- ) {
+ ) {
this.ctx = ctx;
this.orderedBatchWorkerFactory = orderedBatchWorkerFactory;
this.distributedJoins = distributedJoins;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 4a30e76..82ecf77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -1103,7 +1103,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
/** {@inheritDoc} */
@Override public Collection<GridCacheSqlMetadata> execute() {
try {
- if (future == null) {
+ if (future == null) {
if (!ignite.cluster().active())
return Collections.emptyList();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index 0663559..5dbf768 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -308,10 +308,10 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter {
}
if (e.getValue() != null) {
- if (e.getValue().getClass().isEnum() || e.getValue() instanceof InetAddress)
- e.setValue(e.getValue().toString());
- else if (e.getValue().getClass().isArray() && !ATTR_IGNITE_FEATURES.equals(e.getKey()))
- i.remove();
+ if (e.getValue().getClass().isEnum() || e.getValue() instanceof InetAddress)
+ e.setValue(e.getValue().toString());
+ else if (e.getValue().getClass().isArray() && !ATTR_IGNITE_FEATURES.equals(e.getKey()))
+ i.remove();
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 4055d6c..b2f18b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -1272,8 +1272,8 @@ public class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObjec
jobRes.resetResponse();
if (!resCache) {
- // Store result back in map before sending.
- this.jobRes.put(res.getJobId(), jobRes);
+ // Store result back in map before sending.
+ this.jobRes.put(res.getJobId(), jobRes);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 8a68acc..c90638c 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -4278,7 +4278,7 @@ public abstract class IgniteUtils {
rsrc.close();
}
catch (Exception suppressed) {
- e.addSuppressed(suppressed);
+ e.addSuppressed(suppressed);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index cb34b28..e62efe2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -128,7 +128,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> {
Object state0 = state;
if (state0 == null || // It is DONE state
- (state0.getClass() != Node.class && // It is not INIT state
+ (state0.getClass() != Node.class && // It is not INIT state
state0.getClass() != ErrorWrapper.class && // It is not FAILED
state0 != CANCELLED)) // It is not CANCELLED
return (R)state0;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
index bceb4c9..7105f7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java
@@ -66,6 +66,6 @@ public class IpcEndpointFactory {
* @throws IgniteCheckedException If connection failed.
*/
private static IpcEndpoint connectTcpEndpoint(String host, int port) throws IgniteCheckedException {
- return new IpcClientTcpEndpoint(host, port);
+ return new IpcClientTcpEndpoint(host, port);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
index d7aa835..7022af2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java
@@ -332,7 +332,7 @@ public class GridUnsafePartitionedMap implements GridOffHeapPartitionedMap {
/** {@inheritDoc} */
@Override public <T> GridCloseableIterator<T> iterator(final CX2<T2<Long, Integer>, T2<Long, Integer>, T> c,
int part) {
- return mapFor(part).iterator(c);
+ return mapFor(part).iterator(c);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index b337b7f..9ff5d64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -1833,31 +1833,7 @@ public class GridToStringBuilder {
else if (!f.isAnnotationPresent(GridToStringExclude.class) &&
!type.isAnnotationPresent(GridToStringExclude.class)
) {
- if (
- // Include only private non-static
- Modifier.isPrivate(f.getModifiers()) && !Modifier.isStatic(f.getModifiers()) &&
-
- // No direct objects & serializable.
- Object.class != type &&
- Serializable.class != type &&
- Externalizable.class != type &&
-
- // No arrays.
- !type.isArray() &&
-
- // Exclude collections, IO, etc.
- !EventListener.class.isAssignableFrom(type) &&
- !Map.class.isAssignableFrom(type) &&
- !Collection.class.isAssignableFrom(type) &&
- !InputStream.class.isAssignableFrom(type) &&
- !OutputStream.class.isAssignableFrom(type) &&
- !Thread.class.isAssignableFrom(type) &&
- !Runnable.class.isAssignableFrom(type) &&
- !Lock.class.isAssignableFrom(type) &&
- !ReadWriteLock.class.isAssignableFrom(type) &&
- !Condition.class.isAssignableFrom(type)
- )
- add = true;
+ add = addField(f, type);
}
if (add) {
@@ -1880,6 +1856,31 @@ public class GridToStringBuilder {
return cd;
}
+ /** @return {@code True} if field should be added. */
+ private static boolean addField(Field f, Class<?> type) {
+ // Include only private non-static
+ return Modifier.isPrivate(f.getModifiers()) && !Modifier.isStatic(f.getModifiers()) &&
+ // No direct objects & serializable.
+ Object.class != type &&
+ Serializable.class != type &&
+ Externalizable.class != type &&
+
+ // No arrays.
+ !type.isArray() &&
+
+ // Exclude collections, IO, etc.
+ !EventListener.class.isAssignableFrom(type) &&
+ !Map.class.isAssignableFrom(type) &&
+ !Collection.class.isAssignableFrom(type) &&
+ !InputStream.class.isAssignableFrom(type) &&
+ !OutputStream.class.isAssignableFrom(type) &&
+ !Thread.class.isAssignableFrom(type) &&
+ !Runnable.class.isAssignableFrom(type) &&
+ !Lock.class.isAssignableFrom(type) &&
+ !ReadWriteLock.class.isAssignableFrom(type) &&
+ !Condition.class.isAssignableFrom(type);
+ }
+
/**
* Returns sorted and compacted string representation of given {@code col}.
* Two nearby numbers with difference at most 1 are compacted to one continuous segment.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitions.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitions.java
index 505d98e..99feb23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitions.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitions.java
@@ -54,7 +54,7 @@ public class VisorCachePartitions extends VisorDataTransferObject {
* @param cnt Number of primary keys in partition.
*/
public void addPrimary(int partId, long cnt) {
- primary.put(partId, cnt);
+ primary.put(partId, cnt);
}
/**
@@ -64,7 +64,7 @@ public class VisorCachePartitions extends VisorDataTransferObject {
* @param cnt Number of backup keys in partition.
*/
public void addBackup(int partId, long cnt) {
- backup.put(partId, cnt);
+ backup.put(partId, cnt);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
index 464671f..18597f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
@@ -188,10 +188,10 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure implements IgniteCall
}
}
- /**
- * @param grpIds Group ids to generate list of partitions for.
- */
- private List<T2<CacheGroupContext, GridDhtLocalPartition>> calcListOfPartitions(Set<Integer> grpIds) {
+ /**
+ * @param grpIds Group ids to generate list of partitions for.
+ */
+ private List<T2<CacheGroupContext, GridDhtLocalPartition>> calcListOfPartitions(Set<Integer> grpIds) {
List<T2<CacheGroupContext, GridDhtLocalPartition>> partArgs = new ArrayList<>();
for (Integer grpId : grpIds) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java
index 7914da1..7f87252 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java
@@ -288,7 +288,7 @@ public class VisorConsistencyRepairTask extends AbstractConsistencyTask<VisorCon
assert evt instanceof CacheConsistencyViolationEvent;
if (!evt.getCacheName().equals(cacheName))
- return true; // Skipping other caches results, which are generated by concurrent executions.
+ return true; // Skipping other caches results, which are generated by concurrent executions.
evts.add(evt);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterChangeTagTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterChangeTagTask.java
index f854963..00e9dea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterChangeTagTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterChangeTagTask.java
@@ -58,8 +58,10 @@ public class VisorClusterChangeTagTask extends VisorOneNodeTask<VisorClusterChan
}
/** {@inheritDoc} */
- @Override protected VisorClusterChangeTagTaskResult run(@Nullable VisorClusterChangeTagTaskArg arg) throws IgniteException {
- return update(arg.newTag());
+ @Override protected VisorClusterChangeTagTaskResult run(
+ @Nullable VisorClusterChangeTagTaskArg arg
+ ) throws IgniteException {
+ return update(arg.newTag());
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java
index b305174..d5f834f 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java
@@ -318,18 +318,18 @@ public interface ClusterMetricsMXBean extends ClusterMetrics {
@MXBeanParameter(name = "attrName", description = "Attribute name.") String attrName
);
- /**
- * @param attrName Attribute name.
- * @param attrVal Attribute value.
- * @param includeSrvs Include server nodes.
- * @param includeClients Include client nodes.
- * @return Node IDs with the given attribute value.
- */
- @MXBeanDescription("Get node IDs with the given attribute value.")
- public Set<UUID> nodeIdsForAttribute(
- @MXBeanParameter(name = "attrName", description = "Attribute name.") String attrName,
- @MXBeanParameter(name = "attrValue", description = "Attribute value.") String attrVal,
- @MXBeanParameter(name = "includeSrvs", description = "Include server nodes.") boolean includeSrvs,
- @MXBeanParameter(name = "includeClients", description = "Include client nodes.") boolean includeClients
- );
+ /**
+ * @param attrName Attribute name.
+ * @param attrVal Attribute value.
+ * @param includeSrvs Include server nodes.
+ * @param includeClients Include client nodes.
+ * @return Node IDs with the given attribute value.
+ */
+ @MXBeanDescription("Get node IDs with the given attribute value.")
+ public Set<UUID> nodeIdsForAttribute(
+ @MXBeanParameter(name = "attrName", description = "Attribute name.") String attrName,
+ @MXBeanParameter(name = "attrValue", description = "Attribute value.") String attrVal,
+ @MXBeanParameter(name = "includeSrvs", description = "Include server nodes.") boolean includeSrvs,
+ @MXBeanParameter(name = "includeClients", description = "Include client nodes.") boolean includeClients
+ );
}
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index bd69fce..e1c3e2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -194,12 +194,10 @@ public interface IgniteMXBean {
*
* @param rebalanceEnabled If {@code true} then set rebalance to enabled state.
*/
- @MXBeanParametersDescriptions(
- {
- "Enable cache partitions rebalance on node.",
- "Disable cache partitions rebalance on node."
- }
- )
+ @MXBeanParametersDescriptions({
+ "Enable cache partitions rebalance on node.",
+ "Disable cache partitions rebalance on node."
+ })
public void rebalanceEnabled(boolean rebalanceEnabled);
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index dafbc33..1ad7925 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -405,8 +405,11 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
* @param <T> Type of the MBean
* @throws IgniteSpiException If registration failed.
*/
- protected final <T extends IgniteSpiManagementMBean> void registerMBean(String igniteInstanceName, T impl, Class<T> mbeanItf
- ) throws IgniteSpiException {
+ protected final <T extends IgniteSpiManagementMBean> void registerMBean(
+ String igniteInstanceName,
+ T impl,
+ Class<T> mbeanItf
+ ) throws IgniteSpiException {
if (ignite == null || U.IGNITE_MBEANS_DISABLED)
return;
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index 0c9f9b1..adc00a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -571,7 +571,7 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
if (log.isDebugEnabled()) {
log.debug("Failed to create checkpoint table as it may already exist (will try again): " +
- tblName);
+ tblName);
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index b02a935..d37a4cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -455,7 +455,7 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi
*
* @return Node attributes to enable job stealing for.
*/
- public Map<String, ? extends Serializable> getStealingAttributes() {
+ public Map<String, ? extends Serializable> getStealingAttributes() {
return stealAttrs;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionClientPool.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionClientPool.java
index 0d2c851..226ab21 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionClientPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionClientPool.java
@@ -386,7 +386,7 @@ public class ConnectionClientPool {
? cfg.failureDetectionTimeout()
: cfg.connectionTimeout();
- fut.get(failTimeout);
+ fut.get(failTimeout);
}
catch (Throwable triggerException) {
if (forcibleNodeKillEnabled
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java
index 81c917b..f9e7fef 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java
@@ -377,8 +377,8 @@ public class InboundConnectionHandler extends GridNioServerListenerAdapter<Messa
GridNioMessageTracker tracker = ses.meta(TRACKER_META);
if (tracker == null) {
- GridNioMessageTracker old = ses.addMeta(TRACKER_META, tracker =
- new GridNioMessageTracker(ses, cfg.messageQueueLimit()));
+ GridNioMessageTracker old = ses.addMeta(TRACKER_META,
+ tracker = new GridNioMessageTracker(ses, cfg.messageQueueLimit()));
assert old == null;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java
index 64fdec5..ccb5cc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java
@@ -666,7 +666,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
*/
@IgniteSpiConfiguration(optional = true)
public TcpCommunicationSpi setSocketSendBuffer(int sockSndBuf) {
-cfg.socketSendBuffer(sockSndBuf);
+ cfg.socketSendBuffer(sockSndBuf);
return (TcpCommunicationSpi)this;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMBean.java
index 069fdad..5a9ff8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMBean.java
@@ -82,11 +82,11 @@ public interface DiscoverySpiMBean {
@MXBeanDescription("Local node formatted as a string.")
public String getLocalNodeFormatted();
- /**
- * Exclude node from discovery.
- *
- * @param nodeId Node id string.
- */
- @MXBeanDescription("Exclude node from cluster.")
- public void excludeNode(String nodeId);
+ /**
+ * Exclude node from discovery.
+ *
+ * @param nodeId Node id string.
+ */
+ @MXBeanDescription("Exclude node from cluster.")
+ public void excludeNode(String nodeId);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 26fb50a..b59d68b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -2148,8 +2148,8 @@ class ClientImpl extends TcpDiscoveryImpl {
final int joinCnt0 = joinCnt;
executorService.schedule(() -> {
- queue.add(new JoinTimeout(joinCnt0));
- }, spi.joinTimeout, MILLISECONDS);
+ queue.add(new JoinTimeout(joinCnt0));
+ }, spi.joinTimeout, MILLISECONDS);
}
sockReader.setSocket(joinRes.get1(), locNode.clientRouterNodeId());
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 4cdff95..8fb0925 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -1839,7 +1839,7 @@ class ServerImpl extends TcpDiscoveryImpl {
UUID destNodeId,
@Nullable Collection<PendingMessage> msgs,
@Nullable IgniteUuid discardCustomMsgId
- ) {
+ ) {
assert destNodeId != null;
if (msg instanceof TcpDiscoveryNodeAddedMessage) {
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java
index 2cbc289..2e85890 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.cache;
import java.util.Arrays;
-import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
@@ -39,6 +38,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static java.util.Objects.requireNonNull;
+
/**
*
*/
@@ -144,13 +145,11 @@ public class RebalanceAfterResettingLostPartitionTest extends GridCommonAbstract
// Returning first node to the cluster.
IgniteEx g0 = startGrid(0);
- assertTrue(Objects.requireNonNull(
- grid(0).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
+ assertTrue(requireNonNull(grid(0).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
p -> p.state() == GridDhtPartitionState.LOST));
// Verify that partition loss is detected.
- assertTrue(Objects.requireNonNull(
- grid(1).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
+ assertTrue(requireNonNull(grid(1).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
p -> p.state() == GridDhtPartitionState.LOST));
// Reset lost partitions and wait for PME.
@@ -158,13 +157,11 @@ public class RebalanceAfterResettingLostPartitionTest extends GridCommonAbstract
awaitPartitionMapExchange();
- assertTrue(Objects.requireNonNull(
- grid(0).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
+ assertTrue(requireNonNull(grid(0).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
p -> p.state() == GridDhtPartitionState.OWNING));
// Verify that partitions are in owning state.
- assertTrue(Objects.requireNonNull(
- grid(1).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
+ assertTrue(requireNonNull(grid(1).cachex(CACHE_NAME)).context().topology().localPartitions().stream().allMatch(
p -> p.state() == GridDhtPartitionState.OWNING));
// Verify that data was successfully rebalanced.
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
index 53f2a40..b95f97d 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
@@ -243,7 +243,7 @@ public abstract class AffinityFunctionBackupFilterAbstractSelfTest extends GridC
/** Different affinityBackupFilters have different goals */
protected int expectedNodesForEachPartition() {
- return backups + 1;
+ return backups + 1;
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
index 2c1ddbf..91f18d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
@@ -48,6 +48,6 @@ public class ClusterNodeAttributeAffinityBackupFilterSelfTest extends AffinityFu
/** {@inheritDoc} */
@Override protected int expectedNodesForEachPartition() {
- return 3;
+ return 3;
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
index da4990f..a5fbe82 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
@@ -99,9 +99,9 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes
*/
private void checkLoad(boolean async) throws Exception {
IgniteCache<String, Integer> cache = jcache(0)
- .withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, TIME_TO_LIVE)));
+ .withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, TIME_TO_LIVE)));
- List<Integer> keys = new ArrayList<>();
+ List<Integer> keys = new ArrayList<>();
keys.add(primaryKey(jcache(0)));
keys.add(primaryKey(jcache(1)));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
index 0093dbf..5e2aff1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
@@ -607,8 +607,10 @@ public abstract class ClusterGroupAbstractTest extends GridCommonAbstractTest im
long threshold = System.currentTimeMillis() + WAIT_TIMEOUT;
- do synchronized (mux) {
- mux.wait(sleep);
+ do {
+ synchronized (mux) {
+ mux.wait(sleep);
+ }
}
while (fut != null && !fut.isDone() && !fut.isCancelled() && threshold > System.currentTimeMillis());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCacheHashMapPutAllWarningsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCacheHashMapPutAllWarningsTest.java
index 9b59bd5..e92a633 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCacheHashMapPutAllWarningsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCacheHashMapPutAllWarningsTest.java
@@ -78,9 +78,9 @@ public class GridCacheHashMapPutAllWarningsTest extends GridCommonAbstractTest {
testLog = new ListeningTestLogger(false, log());
testLog.registerListener((s) -> {
- if (s.contains("deadlock"))
- messages.add(s);
- });
+ if (s.contains("deadlock"))
+ messages.add(s);
+ });
Ignite ignite = startGrid(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
index bb50268..73e53bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
@@ -157,8 +157,8 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest {
return Collections.singletonMap(new ComputeJobAdapter(locNodeId) {
/** */
- @IgniteInstanceResource
- private Ignite ignite;
+ @IgniteInstanceResource
+ private Ignite ignite;
/** {@inheritDoc} */
@SuppressWarnings("NakedNotify")
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
index 0a82b57..018dbcd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
@@ -77,7 +77,7 @@ public class GridListenActorSelfTest extends GridCommonAbstractTest {
// Flood it.
for (int i = 0; i < 100; i++)
- grid().message().send(null, "TEST"); // This message should be lost...
+ grid().message().send(null, "TEST"); // This message should be lost...
Thread.sleep(2000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
index 89cc01a..5f9d9bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
@@ -219,5 +219,5 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
return !Thread.currentThread().isInterrupted() ? 0 : 1;
}
- }
+ }
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectLockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectLockTest.java
index a44ca34..9a1697b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectLockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectLockTest.java
@@ -164,15 +164,14 @@ public class IgniteClientReconnectLockTest extends IgniteClientReconnectAbstract
startGrid(1);
GridTestUtils.assertThrowsWithCause(() -> {
- try {
- lock.lock();
- }
- catch (IgniteClientDisconnectedException e) {
- e.reconnectFuture().get();
-
- lock.lock();
- }
- },
- CacheStoppedException.class);
+ try {
+ lock.lock();
+ }
+ catch (IgniteClientDisconnectedException e) {
+ e.reconnectFuture().get();
+
+ lock.lock();
+ }
+ }, CacheStoppedException.class);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
index 31839eb..fb89b41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
@@ -230,76 +230,78 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstract
* @param byName If {@code true} than executes task by class name.
* @throws Exception If test failed.
*/
- private void execImplicitDeployLocally(boolean byCls, boolean byTask, boolean byName) throws Exception {
- final IgniteEx ignite = startGrids(1);
+ private void execImplicitDeployLocally(boolean byCls, boolean byTask, boolean byName) throws Exception {
+ final IgniteEx ignite = startGrids(1);
- final IgniteEx client = startClientGrid(1);
+ final IgniteEx client = startClientGrid(1);
- try {
- // First task class loader.
- ClassLoader ldr1 = new GridTestClassLoader(
- Collections.singletonMap("testResource", "1"),
- getClass().getClassLoader(),
- GridDeploymentResourceTestTask.class.getName(),
- GridDeploymentResourceTestJob.class.getName()
- );
+ try {
+ // First task class loader.
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
- // Second task class loader
- ClassLoader ldr2 = new GridTestClassLoader(
- Collections.singletonMap("testResource", "2"),
- getClass().getClassLoader(),
- GridDeploymentResourceTestTask.class.getName(),
- GridDeploymentResourceTestJob.class.getName()
- );
+ // Second task class loader
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
- // The same name but different classes/ class loaders.
- Class<? extends ComputeTask<String, Integer>> taskCls1 = (Class<? extends ComputeTask<String, Integer>>)
- ldr1.loadClass(GridDeploymentResourceTestTask.class.getName());
+ // The same name but different classes/ class loaders.
+ Class<? extends ComputeTask<String, Integer>> taskCls1 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr1.loadClass(GridDeploymentResourceTestTask.class.getName());
- Class<? extends ComputeTask<String, Integer>> taskCls2 = (Class<? extends ComputeTask<String, Integer>>)
- ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+ Class<? extends ComputeTask<String, Integer>> taskCls2 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
- if (byCls) {
- IgniteInternalFuture f1 = runAsyncByClass(ignite, client, taskCls1, 1);
+ if (byCls) {
+ IgniteInternalFuture f1 = runAsyncByClass(ignite, client, taskCls1, 1);
- IgniteInternalFuture f2 = runAsyncByClass(ignite, client, taskCls2, 2);
+ IgniteInternalFuture f2 = runAsyncByClass(ignite, client, taskCls2, 2);
- f1.get(); f2.get();
- }
+ f1.get();
+ f2.get();
+ }
- if (byTask) {
- final ComputeTask<String, Integer> tc1 = taskCls1.newInstance();
- final ComputeTask<String, Integer> tc2 = taskCls2.newInstance();
+ if (byTask) {
+ final ComputeTask<String, Integer> tc1 = taskCls1.newInstance();
+ final ComputeTask<String, Integer> tc2 = taskCls2.newInstance();
- IgniteInternalFuture f1 = runAsyncByInstance(ignite, client, tc1, 1);
+ IgniteInternalFuture f1 = runAsyncByInstance(ignite, client, tc1, 1);
- IgniteInternalFuture f2 = runAsyncByInstance(ignite, client, tc2, 2);
+ IgniteInternalFuture f2 = runAsyncByInstance(ignite, client, tc2, 2);
- f1.get(); f2.get();
- }
+ f1.get();
+ f2.get();
+ }
- if (byName) {
- ignite.compute().localDeployTask(taskCls1, ldr1);
+ if (byName) {
+ ignite.compute().localDeployTask(taskCls1, ldr1);
- Integer res1 = ignite.compute().execute(taskCls1.getName(), null);
+ Integer res1 = ignite.compute().execute(taskCls1.getName(), null);
- assert res1 != null;
+ assert res1 != null;
- assert res1 == 1 : "Invalid res1: " + res1;
+ assert res1 == 1 : "Invalid res1: " + res1;
- ignite.compute().localDeployTask(taskCls2, ldr2);
+ ignite.compute().localDeployTask(taskCls2, ldr2);
- Integer res2 = ignite.compute().execute(taskCls2.getName(), null);
+ Integer res2 = ignite.compute().execute(taskCls2.getName(), null);
- assert res2 != null;
+ assert res2 != null;
- assert res2 == 2 : "Invalid res2: " + res2;
- }
- }
- finally {
- stopAllGrids();
- }
- }
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
/**
* @param byCls If {@code true} than executes task by Class.
@@ -308,62 +310,62 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstract
* @throws Exception If test failed.
*/
private void execExplicitDeployP2P(boolean byCls, boolean byTask, boolean byName) throws Exception {
- try {
- IgniteEx ignite = startGrids(2);
-
- ClassLoader ldr1 = new GridTestClassLoader(
- Collections.singletonMap("testResource", "1"),
- getClass().getClassLoader(),
- GridDeploymentResourceTestTask.class.getName(),
- GridDeploymentResourceTestJob.class.getName()
- );
-
- ClassLoader ldr2 = new GridTestClassLoader(
- Collections.singletonMap("testResource", "2"),
- getClass().getClassLoader(),
- GridDeploymentResourceTestTask.class.getName(),
- GridDeploymentResourceTestJob.class.getName()
- );
-
- Class<? extends ComputeTask<String, Integer>> taskCls = (Class<? extends ComputeTask<String, Integer>>)
- ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
-
- if (byCls) {
- ignite.compute().localDeployTask(taskCls, ldr1);
-
- // Even though the task is deployed with resource class loader,
- // when we execute it, it will be redeployed with task class-loader.
- Integer res = ignite.compute().execute(taskCls, null);
-
- assert res != null;
- assert res == 2 : "Invalid response: " + res;
- }
-
- if (byTask) {
- ignite.compute().localDeployTask(taskCls, ldr1);
-
- // Even though the task is deployed with resource class loader,
- // when we execute it, it will be redeployed with task class-loader.
- Integer res = ignite.compute().execute(taskCls.newInstance(), null);
-
- assert res != null;
- assert res == 2 : "Invalid response: " + res;
- }
-
- if (byName) {
- ignite.compute().localDeployTask(taskCls, ldr1);
-
- // Even though the task is deployed with resource class loader,
- // when we execute it, it will be redeployed with task class-loader.
- Integer res = ignite.compute().execute(taskCls.getName(), null);
-
- assert res != null;
- assert res == 1 : "Invalid response: " + res;
- }
- }
- finally {
- stopAllGrids();
- }
+ try {
+ IgniteEx ignite = startGrids(2);
+
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ Class<? extends ComputeTask<String, Integer>> taskCls = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ if (byCls) {
+ ignite.compute().localDeployTask(taskCls, ldr1);
+
+ // Even though the task is deployed with resource class loader,
+ // when we execute it, it will be redeployed with task class-loader.
+ Integer res = ignite.compute().execute(taskCls, null);
+
+ assert res != null;
+ assert res == 2 : "Invalid response: " + res;
+ }
+
+ if (byTask) {
+ ignite.compute().localDeployTask(taskCls, ldr1);
+
+ // Even though the task is deployed with resource class loader,
+ // when we execute it, it will be redeployed with task class-loader.
+ Integer res = ignite.compute().execute(taskCls.newInstance(), null);
+
+ assert res != null;
+ assert res == 2 : "Invalid response: " + res;
+ }
+
+ if (byName) {
+ ignite.compute().localDeployTask(taskCls, ldr1);
+
+ // Even though the task is deployed with resource class loader,
+ // when we execute it, it will be redeployed with task class-loader.
+ Integer res = ignite.compute().execute(taskCls.getName(), null);
+
+ assert res != null;
+ assert res == 1 : "Invalid response: " + res;
+ }
+ }
+ finally {
+ stopAllGrids();
+ }
}
/**
@@ -372,69 +374,71 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstract
* @param byName If {@code true} than executes task by class name.
* @throws Exception If test failed.
*/
- private void execImplicitDeployP2P(boolean byCls, boolean byTask, boolean byName) throws Exception {
- try {
- IgniteEx ignite = startGrids(1);
+ private void execImplicitDeployP2P(boolean byCls, boolean byTask, boolean byName) throws Exception {
+ try {
+ IgniteEx ignite = startGrids(1);
- final IgniteEx client = startClientGrid(1);
+ final IgniteEx client = startClientGrid(1);
- ClassLoader ldr1 = new GridTestClassLoader(
- Collections.singletonMap("testResource", "1"),
- getClass().getClassLoader(),
- GridDeploymentResourceTestTask.class.getName(),
- GridDeploymentResourceTestJob.class.getName()
- );
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
- ClassLoader ldr2 = new GridTestClassLoader(
- Collections.singletonMap("testResource", "2"),
- getClass().getClassLoader(),
- GridDeploymentResourceTestTask.class.getName(),
- GridDeploymentResourceTestJob.class.getName()
- );
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
- Class<? extends ComputeTask<String, Integer>> taskCls1 = (Class<? extends ComputeTask<String, Integer>>)
- ldr1.loadClass(GridDeploymentResourceTestTask.class.getName());
+ Class<? extends ComputeTask<String, Integer>> taskCls1 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr1.loadClass(GridDeploymentResourceTestTask.class.getName());
- Class<? extends ComputeTask<String, Integer>> taskCls2 = (Class<? extends ComputeTask<String, Integer>>)
- ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+ Class<? extends ComputeTask<String, Integer>> taskCls2 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
- if (byCls) {
- IgniteInternalFuture f1 = runAsyncByClass(ignite, client, taskCls1, 1);
+ if (byCls) {
+ IgniteInternalFuture f1 = runAsyncByClass(ignite, client, taskCls1, 1);
- IgniteInternalFuture f2 = runAsyncByClass(ignite, client, taskCls2, 2);
+ IgniteInternalFuture f2 = runAsyncByClass(ignite, client, taskCls2, 2);
- f1.get(); f2.get();
- }
+ f1.get();
+ f2.get();
+ }
- if (byTask) {
- final ComputeTask<String, Integer> tc1 = taskCls1.newInstance();
- final ComputeTask<String, Integer> tc2 = taskCls2.newInstance();
+ if (byTask) {
+ final ComputeTask<String, Integer> tc1 = taskCls1.newInstance();
+ final ComputeTask<String, Integer> tc2 = taskCls2.newInstance();
- IgniteInternalFuture f1 = runAsyncByInstance(ignite, client, tc1, 1);
+ IgniteInternalFuture f1 = runAsyncByInstance(ignite, client, tc1, 1);
- IgniteInternalFuture f2 = runAsyncByInstance(ignite, client, tc2, 2);
+ IgniteInternalFuture f2 = runAsyncByInstance(ignite, client, tc2, 2);
- f1.get(); f2.get();
- }
+ f1.get();
+ f2.get();
+ }
- if (byName) {
- ignite.compute().localDeployTask(taskCls1, ldr1);
- Integer res1 = ignite.compute().execute(taskCls1.getName(), null);
+ if (byName) {
+ ignite.compute().localDeployTask(taskCls1, ldr1);
+ Integer res1 = ignite.compute().execute(taskCls1.getName(), null);
- assert res1 != null;
- assertEquals("Invalid res1: ", 1, (int)res1);
+ assert res1 != null;
+ assertEquals("Invalid res1: ", 1, (int)res1);
- ignite.compute().localDeployTask(taskCls2, ldr2);
- Integer res2 = ignite.compute().execute(taskCls2.getName(), null);
+ ignite.compute().localDeployTask(taskCls2, ldr2);
+ Integer res2 = ignite.compute().execute(taskCls2.getName(), null);
- assert res2 != null;
- assertEquals("Invalid res2: ", 2, (int)res2);
- }
- }
- finally {
- stopAllGrids();
- }
- }
+ assert res2 != null;
+ assertEquals("Invalid res2: ", 2, (int)res2);
+ }
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
/**
* We use custom name to avoid auto-deployment in the same VM.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
index d2a6019..4b07339 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
@@ -109,5 +109,5 @@ public class MemoryLeaksOnRestartNodeTest extends GridCommonAbstractTest {
// Remove dump if successful.
dumpFile.delete();
- }
+ }
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
index b493050..452f3f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
@@ -164,11 +164,13 @@ public class BinaryObjectToStringTest extends AbstractBinaryArraysTest {
"public void readExternal(java.io.ObjectInput in) throws java.io.IOException { x = in.readInt(); }",
aClass));
- ClassLoader extClsLdr = new ClassLoader() {{
- byte[] bytecode = aClass.toBytecode();
+ ClassLoader extClsLdr = new ClassLoader() {
+ {
+ byte[] bytecode = aClass.toBytecode();
- defineClass("ExternalTestClass1", bytecode, 0, bytecode.length);
- }};
+ defineClass("ExternalTestClass1", bytecode, 0, bytecode.length);
+ }
+ };
Class<?> extClass = extClsLdr.loadClass("ExternalTestClass1");
@@ -193,11 +195,13 @@ public class BinaryObjectToStringTest extends AbstractBinaryArraysTest {
"private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { x = in.readInt(); }",
aClass));
- ClassLoader extClsLdr = new ClassLoader() {{
- byte[] bytecode = aClass.toBytecode();
+ ClassLoader extClsLdr = new ClassLoader() {
+ {
+ byte[] bytecode = aClass.toBytecode();
- defineClass("ExternalTestClass2", bytecode, 0, bytecode.length);
- }};
+ defineClass("ExternalTestClass2", bytecode, 0, bytecode.length);
+ }
+ };
Class<?> extClass = extClsLdr.loadClass("ExternalTestClass2");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java b/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
index 3513c02..b0934e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
@@ -353,19 +353,17 @@ public class IgniteClusterIdTagTest extends GridCommonAbstractTest {
AtomicBoolean evtFired = new AtomicBoolean(false);
- ig.events().localListen((evt) ->
- {
- evtFired.set(true);
+ ig.events().localListen((evt) -> {
+ evtFired.set(true);
- ClusterTagUpdatedEvent tagUpdatedEvt = (ClusterTagUpdatedEvent)evt;
+ ClusterTagUpdatedEvent tagUpdatedEvt = (ClusterTagUpdatedEvent)evt;
- clusterIdFromEvent.set(tagUpdatedEvt.clusterId());
- oldTagFromEvent.set(tagUpdatedEvt.previousTag());
- newTagFromEvent.set(tagUpdatedEvt.newTag());
+ clusterIdFromEvent.set(tagUpdatedEvt.clusterId());
+ oldTagFromEvent.set(tagUpdatedEvt.previousTag());
+ newTagFromEvent.set(tagUpdatedEvt.newTag());
- return true;
- },
- EventType.EVT_CLUSTER_TAG_UPDATED);
+ return true;
+ }, EventType.EVT_CLUSTER_TAG_UPDATED);
ig.cluster().tag(CUSTOM_TAG_0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
index 4ad4040..6a6f862 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
@@ -104,9 +104,9 @@ public class IgniteMessageFactoryImplTest {
@SuppressWarnings("ResultOfObjectAllocationIgnored")
public void testRegisterTheSameType() {
MessageFactory[] factories = {
- new TestMessageFactoryPovider(),
- new TestMessageFactory(),
- new TestMessageFactoryPoviderWithTheSameDirectType()
+ new TestMessageFactoryPovider(),
+ new TestMessageFactory(),
+ new TestMessageFactoryPoviderWithTheSameDirectType()
};
new IgniteMessageFactoryImpl(factories);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
index 498385c..438dc47 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -72,14 +73,16 @@ public class GridAffinityAssignmentV2Test {
private ClusterNode clusterNode6 = node(metrics, ver, "6");
/** */
- private List<ClusterNode> clusterNodes = new ArrayList<ClusterNode>() {{
- add(clusterNode1);
- add(clusterNode2);
- add(clusterNode3);
- add(clusterNode4);
- add(clusterNode5);
- add(clusterNode6);
- }};
+ private List<ClusterNode> clusterNodes = new ArrayList<>();
+
+ {
+ clusterNodes.add(clusterNode1);
+ clusterNodes.add(clusterNode2);
+ clusterNodes.add(clusterNode3);
+ clusterNodes.add(clusterNode4);
+ clusterNodes.add(clusterNode5);
+ clusterNodes.add(clusterNode6);
+ }
/**
* Test GridAffinityAssignment logic when backup threshold is not reached.
@@ -88,47 +91,21 @@ public class GridAffinityAssignmentV2Test {
public void testPrimaryBackupPartitions() {
GridAffinityAssignment gridAffinityAssignment = new GridAffinityAssignment(
new AffinityTopologyVersion(1, 0),
- new ArrayList<List<ClusterNode>>() {{
- add(new ArrayList<ClusterNode>() {{
- add(clusterNode1);
- add(clusterNode2);
- add(clusterNode3);
- add(clusterNode4);
- }});
- add(new ArrayList<ClusterNode>() {{
- add(clusterNode1);
- add(clusterNode2);
- add(clusterNode3);
- add(clusterNode4);
- }});
- add(new ArrayList<ClusterNode>() {{
- add(clusterNode5);
- add(clusterNode6);
- }});
- }},
+ Arrays.asList(
+ Arrays.asList(clusterNode1, clusterNode2, clusterNode3, clusterNode4),
+ Arrays.asList(clusterNode1, clusterNode2, clusterNode3, clusterNode4),
+ Arrays.asList(clusterNode5, clusterNode6)
+ ),
new ArrayList<>()
);
GridAffinityAssignmentV2 gridAffinityAssignment2 = new GridAffinityAssignmentV2(
new AffinityTopologyVersion(1, 0),
- new ArrayList<List<ClusterNode>>() {{
- add(new ArrayList<ClusterNode>() {{
- add(clusterNode1);
- add(clusterNode2);
- add(clusterNode3);
- add(clusterNode4);
- }});
- add(new ArrayList<ClusterNode>() {{
- add(clusterNode1);
- add(clusterNode2);
- add(clusterNode3);
- add(clusterNode4);
- }});
- add(new ArrayList<ClusterNode>() {{
- add(clusterNode5);
- add(clusterNode6);
- }});
- }},
+ Arrays.asList(
+ Arrays.asList(clusterNode1, clusterNode2, clusterNode3, clusterNode4),
+ Arrays.asList(clusterNode1, clusterNode2, clusterNode3, clusterNode4),
+ Arrays.asList(clusterNode5, clusterNode6)
+ ),
new ArrayList<>()
);
@@ -172,10 +149,7 @@ public class GridAffinityAssignmentV2Test {
/** */
private void assertPartitions(AffinityAssignment gridAffinityAssignment) {
- List<Integer> parts = new ArrayList<Integer>() {{
- add(0);
- add(1);
- }};
+ List<Integer> parts = Arrays.asList(0, 1);
assertTrue(gridAffinityAssignment.primaryPartitions(clusterNode1.id()).containsAll(parts));
assertFalse(gridAffinityAssignment.primaryPartitions(clusterNode1.id()).contains(2));
@@ -216,9 +190,7 @@ public class GridAffinityAssignmentV2Test {
GridAffinityAssignment gridAffinityAssignment = new GridAffinityAssignment(
new AffinityTopologyVersion(1, 0),
- new ArrayList<List<ClusterNode>>() {{
- add(nodes);
- }},
+ Collections.singletonList(nodes),
new ArrayList<>()
);
@@ -238,9 +210,7 @@ public class GridAffinityAssignmentV2Test {
GridAffinityAssignmentV2 gridAffinityAssignment2 = new GridAffinityAssignmentV2(
new AffinityTopologyVersion(1, 0),
- new ArrayList<List<ClusterNode>>() {{
- add(nodes);
- }},
+ Collections.singletonList(nodes),
new ArrayList<>()
);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
index 31d2844..92de580 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
@@ -204,11 +204,11 @@ public class AuthenticationConfigurationClusterTest extends GridCommonAbstractTe
@Test
public void testBothAuthenticationAndSecurityPluginConfiguration() {
GridTestUtils.assertThrowsAnyCause(log, () -> {
- startGrid(configuration(0, true, false)
- .setPluginProviders(new TestSecurityPluginProvider("login", "", ALLOW_ALL, false)));
+ startGrid(configuration(0, true, false)
+ .setPluginProviders(new TestSecurityPluginProvider("login", "", ALLOW_ALL, false)));
- return null;
- },
+ return null;
+ },
IgniteCheckedException.class,
"Invalid security configuration: both authentication is enabled and external security plugin is provided.");
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
index f0c3fe6..0912718 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
@@ -208,9 +208,9 @@ public class AuthenticationProcessorNodeRestartTest extends GridCommonAbstractTe
try {
while (!restartFut.isDone()) {
- SecurityContext secCtx = authenticate(grid(CLI_NODE), user, "passwd_" + user);
+ SecurityContext secCtx = authenticate(grid(CLI_NODE), user, "passwd_" + user);
- assertNotNull(secCtx);
+ assertNotNull(secCtx);
}
}
catch (ClusterTopologyCheckedException ignored) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
index a74e58c..533ac89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
@@ -229,7 +229,7 @@ public class AuthenticationProcessorSelfTest extends GridCommonAbstractTest {
return null;
}
}, IgniteAccessControlException.class,
- "User management operations initiated on behalf of the Ignite node are not expected.");
+ "User management operations initiated on behalf of the Ignite node are not expected.");
}
}
}
@@ -652,7 +652,7 @@ public class AuthenticationProcessorSelfTest extends GridCommonAbstractTest {
return new AutoCloseable() {
@Override public void close() throws Exception {
- oldSecCtxs.forEach(OperationSecurityContext::close);
+ oldSecCtxs.forEach(OperationSecurityContext::close);
}
};
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
index b05ab2c..da214ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
@@ -264,7 +264,7 @@ public class CacheNearReaderUpdateTest extends GridCommonAbstractTest {
if (getNode.configuration().isClientMode() ||
cache.getConfiguration(CacheConfiguration.class).getNearConfiguration() != null)
- assertNotNull(getNode.cache(cacheName).localPeek(key));
+ assertNotNull(getNode.cache(cacheName).localPeek(key));
}
checkValue(key, val, cacheName);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java
index 5292de5..0f9fe2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java
@@ -447,11 +447,11 @@ public class CacheNoAffinityExchangeTest extends GridCommonAbstractTest {
Ignite client = startClientGrid(2);
assertTrue(GridTestUtils.waitForCondition(() -> {
- AffinityTopologyVersion topVer0 = grid(0).context().discovery().topologyVersionEx();
- AffinityTopologyVersion topVer1 = grid(1).context().discovery().topologyVersionEx();
+ AffinityTopologyVersion topVer0 = grid(0).context().discovery().topologyVersionEx();
+ AffinityTopologyVersion topVer1 = grid(1).context().discovery().topologyVersionEx();
- return topVer0.topologyVersion() == 3 && topVer1.topologyVersion() == 2;
- }, 10_000));
+ return topVer0.topologyVersion() == 3 && topVer1.topologyVersion() == 2;
+ }, 10_000));
final IgniteCache<Integer, Integer> txCache = client.cache(PARTITIONED_TX_CLIENT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
index 892779f..75bc291 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
@@ -179,10 +179,9 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs
* @throws Exception If failed.
*/
protected void testStoreUpdate(IgniteCache<Object, Object> cache,
- Object key,
- @Nullable TransactionConcurrency tc)
- throws Exception
- {
+ Object key,
+ @Nullable TransactionConcurrency tc
+ ) throws Exception {
boolean storeOnPrimary = atomicityMode() == ATOMIC || locStore || writeBehind;
assertTrue(writeMap.isEmpty());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
index 2c527a5..efbab86 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
@@ -61,10 +61,10 @@ public class CacheValidatorMetricsTest extends GridCommonAbstractTest implements
.setCacheMode(CacheMode.REPLICATED)
.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setTopologyValidator(new TopologyValidator() {
- @Override public boolean validate(Collection<ClusterNode> nodes) {
- return nodes.size() == 2;
- }
- });
+ @Override public boolean validate(Collection<ClusterNode> nodes) {
+ return nodes.size() == 2;
+ }
+ });
cfg.setCacheConfiguration(cCfg1, cCfg2);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
index dfdb96d..50aa359 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
@@ -159,10 +159,10 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
for (int i = 0; i < NODES_CNT; i++) {
final int iter = i;
- final Set<String> keys = new LinkedHashSet<String>() {{
- for (int i = 0; i < cnt; i++)
- add("key-" + iter + "-" + i);
- }};
+ final Set<String> keys = new LinkedHashSet<>();
+
+ for (int j = 0; j < cnt; j++)
+ keys.add("key-" + iter + "-" + j);
IgniteEx grid = grid(i);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
index b63fc95..f112857 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
@@ -88,7 +88,7 @@ public class GridCacheAtomicEntryProcessorDeploymentSelfTest extends GridCommonA
* @return Entry Processor.
*/
protected String getEntryProcessor() {
- return GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) != null ?
+ return GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) != null ?
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) :
"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index d53ce58..8f882d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -100,7 +100,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
/** Filter to include only worker nodes. */
private static final IgnitePredicate<ClusterNode> workerNodesFilter = new PN() {
@Override public boolean apply(ClusterNode n) {
- return "worker".equals(n.attribute("segment"));
+ return "worker".equals(n.attribute("segment"));
}
};
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java
index 3a90933..503ece2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java
@@ -158,8 +158,8 @@ public class GridCacheQuerySqlFieldInlineSizeSelfTest extends GridCommonAbstract
*
*/
static class TestValueNegativeInlineSize {
- /** */
- @QuerySqlField(index = true, inlineSize = -10)
- String val;
- }
+ /** */
+ @QuerySqlField(index = true, inlineSize = -10)
+ String val;
+ }
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index d4f3053..fab9be9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -290,11 +290,11 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
public void testPutRemoveConsistencyMultithreaded() throws Exception {
Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-627", nearEnabled());
- for (int i = 0; i < SF.applyLB(10, 2); i++) {
- log.info("Iteration: " + i);
+ for (int i = 0; i < SF.applyLB(10, 2); i++) {
+ log.info("Iteration: " + i);
- putRemoveConsistencyMultithreaded();
- }
+ putRemoveConsistencyMultithreaded();
+ }
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 1367d64..58b1fe9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -3229,10 +3229,10 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
@Override public void run() throws Exception {
IgniteCache<String, Object> cache = ignite(0).cache(cacheName());
- Map<String, Object> map = new HashMap<String, Object>() {{
- for (int i = 0; i < CNT; i++)
- put("key" + i, value(i));
- }};
+ Map<String, Object> map = new HashMap<>();
+
+ for (int i = 0; i < CNT; i++)
+ map.put("key" + i, value(i));
for (Map.Entry<String, Object> e : map.entrySet()) {
final String key = e.getKey();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java
index 1bf47cc..eb28062 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java
@@ -564,7 +564,7 @@ public class IgniteClientCacheStartFailoverTest extends GridCommonAbstractTest {
cache.putAll(map);
}
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < 3; i++) {
CacheConfiguration<Object, Object> ccfg = cacheConfiguration("mvcc-" + i, TRANSACTIONAL_SNAPSHOT, i);
IgniteCache<Object, Object> cache = node.createCache(ccfg);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WithKeepBinaryCacheFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WithKeepBinaryCacheFullApiTest.java
index 275c343..0c186d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WithKeepBinaryCacheFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WithKeepBinaryCacheFullApiTest.java
@@ -130,10 +130,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
runInAllTxModes(new TestRunnable() {
@Override public void run() throws Exception {
@@ -186,10 +186,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
runInAllTxModes(new TestRunnable() {
@Override public void run() throws Exception {
@@ -242,10 +242,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
runInAllTxModes(new TestRunnable() {
@Override public void run() throws Exception {
@@ -265,13 +265,13 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
runInAllTxModes(new TestRunnable() {
@Override public void run() throws Exception {
- Map keyValMap = new LinkedHashMap() {{
- for (Object key : keys) {
- Object val = value(valueOf(key));
+ Map keyValMap = new LinkedHashMap();
+
+ for (Object key : keys) {
+ Object val = value(valueOf(key));
- put(key, val);
- }
- }};
+ keyValMap.put(key, val);
+ }
cache.putAll(keyValMap);
@@ -310,10 +310,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
runInAllTxModes(new TestRunnable() {
@Override public void run() throws Exception {
@@ -336,13 +336,13 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
runInAllTxModes(new TestRunnable() {
@Override public void run() throws Exception {
- Map keyValMap = new LinkedHashMap() {{
- for (Object key : keys) {
- Object val = value(valueOf(key));
+ Map keyValMap = new LinkedHashMap();
+
+ for (Object key : keys) {
+ Object val = value(valueOf(key));
- put(key, val);
- }
- }};
+ keyValMap.put(key, val);
+ }
cache.putAllAsync(keyValMap).get();
@@ -384,10 +384,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
for (final Object key : keys) {
Object res = cache.invoke(key, NOOP_ENTRY_PROC);
@@ -471,10 +471,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
try (Transaction tx = testedGrid().transactions().txStart(conc, isolation)) {
for (final Object key : keys) {
@@ -570,10 +570,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
for (final Object key : keys) {
Object res = cache.invokeAsync(key, NOOP_ENTRY_PROC).get();
@@ -655,10 +655,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
try (Transaction tx = testedGrid().transactions().txStart(conc, isolation)) {
for (final Object key : keys) {
@@ -759,10 +759,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
Map<Object, EntryProcessorResult<Object>> resMap = cache.invokeAll(keys, NOOP_ENTRY_PROC);
@@ -832,10 +832,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
try (Transaction tx = testedGrid().transactions().txStart(conc, isol)) {
Map<Object, EntryProcessorResult<Object>> resMap = cache.invokeAll(keys, NOOP_ENTRY_PROC);
@@ -944,10 +944,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
Map<Object, EntryProcessorResult<Object>> resMap =
(Map<Object, EntryProcessorResult<Object>>)cache.invokeAllAsync(keys, NOOP_ENTRY_PROC).get();
@@ -1021,10 +1021,10 @@ public class WithKeepBinaryCacheFullApiTest extends IgniteCacheConfigVariationsA
@Override public void run() throws Exception {
final IgniteCache cache = jcache().withKeepBinary();
- final Set keys = new LinkedHashSet() {{
- for (int i = 0; i < CNT; i++)
- add(key(i));
- }};
+ final Set keys = new LinkedHashSet();
+
+ for (int i = 0; i < CNT; i++)
+ keys.add(key(i));
Map<Object, EntryProcessorResult<Object>> resMap;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java
index e181a86..7a8193f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java
@@ -105,11 +105,11 @@ public class BinaryMetadataRemoveTest extends GridCommonAbstractTest {
public void testRemoveNotExistentType() {
for (Ignite testNode : G.allGrids()) {
GridTestUtils.assertThrows(log, () -> {
- ((IgniteEx)testNode).context().cacheObjects().removeType(
- ((IgniteEx)testNode).context().cacheObjects().typeId("NotExistentType"));
+ ((IgniteEx)testNode).context().cacheObjects().removeType(
+ ((IgniteEx)testNode).context().cacheObjects().typeId("NotExistentType"));
- return null;
- },
+ return null;
+ },
IgniteException.class, "Failed to remove metadata, type not found");
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index c4ebc18..148e2fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -113,9 +113,11 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
List<BinaryTypeConfiguration> binTypes = new ArrayList<>();
- binTypes.add(new BinaryTypeConfiguration() {{
- setTypeName("ArrayHashedKey");
- }});
+ BinaryTypeConfiguration type = new BinaryTypeConfiguration();
+
+ type.setTypeName("ArrayHashedKey");
+
+ binTypes.add(type);
BinaryConfiguration binCfg = new BinaryConfiguration();
binCfg.setTypeConfigurations(binTypes);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java
index 70ad0ba..d7bde45 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java
@@ -158,27 +158,29 @@ public class IgniteExchangeLatchManagerDiscoHistoryTest extends GridCommonAbstra
@Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteException {
if (evt == LifecycleEventType.BEFORE_NODE_START) {
// The goal is registering PartitionsExchangeAware listener before the discovery manager is started.
- ignite.context().internalSubscriptionProcessor()
- .registerDistributedMetastorageListener(new DistributedMetastorageLifecycleListener() {
- @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) {
- ignite.context().cache().context().exchange()
- .registerExchangeAwareComponent(new PartitionsExchangeAware() {
- /** {@inheritDoc} */
- @Override public void onInitBeforeTopologyLock(GridDhtPartitionsExchangeFuture fut) {
- try {
- // Let's start nodes.
- startSrvsLatch.countDown();
-
- // Blocks the initial exchange and waits for other nodes.
- exchangeLatch.await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
- }
- catch (Exception e) {
- err.compareAndSet(null, e);
- }
+ DistributedMetastorageLifecycleListener lsnr = new DistributedMetastorageLifecycleListener() {
+ @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) {
+ ignite.context().cache().context().exchange()
+ .registerExchangeAwareComponent(new PartitionsExchangeAware() {
+ /** {@inheritDoc} */
+ @Override public void onInitBeforeTopologyLock(
+ GridDhtPartitionsExchangeFuture fut) {
+ try {
+ // Let's start nodes.
+ startSrvsLatch.countDown();
+
+ // Blocks the initial exchange and waits for other nodes.
+ exchangeLatch.await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
}
+ catch (Exception e) {
+ err.compareAndSet(null, e);
+ }
+ }
});
- }
- });
+ }
+ };
+
+ ignite.context().internalSubscriptionProcessor().registerDistributedMetastorageListener(lsnr);
}
}
};
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
index 0f814c6..498e5c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
@@ -157,7 +157,7 @@ public class CacheClientsConcurrentStartTest extends GridCommonAbstractTest {
return false;
}
- });
+ });
}
List<IgniteInternalFuture<?>> futs = new ArrayList<>();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDetectLostPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDetectLostPartitionsTest.java
index d7143d0..f36f08b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDetectLostPartitionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDetectLostPartitionsTest.java
@@ -148,16 +148,14 @@ public class CacheDetectLostPartitionsTest extends GridCommonAbstractTest {
assertFalse(cache.lostPartitions().isEmpty());
GridTestUtils.assertThrows(null, () -> {
- for (int i = 0; i < 1000; i++)
- cache.get(i);
- },
- IgniteException.class, "partition data has been lost");
+ for (int i = 0; i < 1000; i++)
+ cache.get(i);
+ }, IgniteException.class, "partition data has been lost");
GridTestUtils.assertThrows(null, () -> {
- for (int i = 0; i < 1000; i++)
- cache.put(i, i);
- },
- IgniteException.class, "partition data has been lost");
+ for (int i = 0; i < 1000; i++)
+ cache.put(i, i);
+ }, IgniteException.class, "partition data has been lost");
}
/** Filter by consistent id. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java
index 0b71809..d87bbd9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java
@@ -146,22 +146,22 @@ public class CacheRentingStateRepairTest extends GridCommonAbstractTest {
assertTrue("Failed to wait for partition eviction: reservedPart=" + part.id() + ", otherParts=" +
top.localPartitions().stream().map(p -> "[id=" + p.id() + ", state=" + p.state() + ']').collect(Collectors.toList()),
waitForCondition(() -> {
- for (int i = 0; i < parts.size(); i++) {
- if (delayEvictPart == i)
- continue; // Skip reserved partition.
+ for (int i = 0; i < parts.size(); i++) {
+ if (delayEvictPart == i)
+ continue; // Skip reserved partition.
- Integer p = parts.get(i);
+ Integer p = parts.get(i);
- @Nullable GridDhtLocalPartition locPart = top.localPartition(p);
+ @Nullable GridDhtLocalPartition locPart = top.localPartition(p);
- assertNotNull(locPart);
+ assertNotNull(locPart);
- if (locPart.state() != GridDhtPartitionState.EVICTED)
- return false;
- }
+ if (locPart.state() != GridDhtPartitionState.EVICTED)
+ return false;
+ }
- return true;
- }, 5000));
+ return true;
+ }, 5000));
/**
* Force renting state before node stop.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java
index 0de3b86..5eb6a60 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java
@@ -401,17 +401,18 @@ public class GridExchangeFreeSwitchTest extends GridCommonAbstractTest {
catch (Exception e) {
fail("Should not happen [exception=" + e + "]");
}
- for (int i = 0; i < nodes; i++) {
- if (i != nodeToStop0) {
- GridDhtPartitionsExchangeFuture lastFinishedFut =
- grid(i).cachex(cacheName).context().shared().exchange().lastFinishedFuture();
- assertTrue(lastFinishedFut.rebalanced());
+ for (int i = 0; i < nodes; i++) {
+ if (i != nodeToStop0) {
+ GridDhtPartitionsExchangeFuture lastFinishedFut =
+ grid(i).cachex(cacheName).context().shared().exchange().lastFinishedFuture();
- assertTrue(lastFinishedFut.topologyVersion()
- .equals(new AffinityTopologyVersion(nodes + 1, 0)));
- }
+ assertTrue(lastFinishedFut.rebalanced());
+
+ assertTrue(lastFinishedFut.topologyVersion()
+ .equals(new AffinityTopologyVersion(nodes + 1, 0)));
}
+ }
});
IgniteInternalFuture<?> nearThenNearFut = multithreadedAsync(() -> {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 60ad7c7..782ec4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -258,7 +258,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
*/
@Test
public void testPutsMultithreadedRemote() throws Exception {
- checkPutsMultithreaded(false, true, MAX_ITER_CNT);
+ checkPutsMultithreaded(false, true, MAX_ITER_CNT);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index 26d7716..7f0b5d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -260,7 +260,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
List<Integer> parts = partitions(node, nodeType);
info(">>> Partitions for node [nodeId=" + node.localNode().id() + ", parts=" + parts +
- ", type=" + nodeType + ']');
+ ", type=" + nodeType + ']');
final Map<Integer, Integer> keysMap = keysFor(node, parts);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsUpdateCountersAndSizeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsUpdateCountersAndSizeTest.java
index f7b87d1..30154e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsUpdateCountersAndSizeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsUpdateCountersAndSizeTest.java
@@ -193,12 +193,12 @@ public class GridCachePartitionsUpdateCountersAndSizeTest extends GridCommonAbst
/** return true if inconsistent counters.*/
public boolean checkCnt() {
- return cn;
+ return cn;
}
/** return true if inconsistent partition size.*/
public boolean checkSize() {
- return sz;
+ return sz;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
index a060cef..e54931d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -22,6 +22,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
public class GridCacheAtomicOnheapMultiNodeFullApiSelfTest extends GridCacheAtomicOnheapFullApiSelfTest {
/** {@inheritDoc} */
@Override protected int gridCount() {
- return 3;
- }
+ return 3;
+ }
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
index 6e908c5..47de24c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
@@ -276,10 +276,10 @@ public abstract class CacheMvccAbstractFeatureTest extends CacheMvccAbstractTest
/** */
static final Comparator<Cache.Entry<Integer, Person>> ENTRY_CMP =
new Comparator<Cache.Entry<Integer, Person>>() {
- @Override public int compare(Cache.Entry<Integer, Person> o1, Cache.Entry<Integer, Person> o2) {
- return o1.getKey().compareTo(o2.getKey());
- }
- };
+ @Override public int compare(Cache.Entry<Integer, Person> o1, Cache.Entry<Integer, Person> o2) {
+ return o1.getKey().compareTo(o2.getKey());
+ }
+ };
/**
*
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
index c6df0ea..2526953 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
@@ -93,7 +93,7 @@ public class CacheMvccClusterRestartTest extends GridCommonAbstractTest {
*/
@Test
public void testRestart1() throws Exception {
- restart1(3, 3);
+ restart1(3, 3);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
index 5efa12c..c9cd992 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
@@ -42,25 +42,25 @@ public class CacheMvccIteratorWithConcurrentTransactionTest extends CacheMvccAbs
/** Test closure. */
private final IgniteClosure2X<CountDownLatch, CountDownLatch, List<Person>> clo =
new IgniteClosure2X<CountDownLatch, CountDownLatch, List<Person>>() {
- @Override public List<Person> applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
- throws IgniteCheckedException {
- Iterator<Cache.Entry<Integer, Person>> it = cache().iterator();
+ @Override public List<Person> applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
+ throws IgniteCheckedException {
+ Iterator<Cache.Entry<Integer, Person>> it = cache().iterator();
- List<Cache.Entry<Integer, Person>> pres = new ArrayList<>();
+ List<Cache.Entry<Integer, Person>> pres = new ArrayList<>();
- for (int i = 0; i < 50; i++)
- pres.add(it.next());
+ for (int i = 0; i < 50; i++)
+ pres.add(it.next());
- if (startLatch != null)
- startLatch.countDown();
+ if (startLatch != null)
+ startLatch.countDown();
- while (it.hasNext())
- pres.add(it.next());
+ while (it.hasNext())
+ pres.add(it.next());
- if (endLatch2 != null)
- U.await(endLatch2);
+ if (endLatch2 != null)
+ U.await(endLatch2);
- return entriesToPersons(pres);
- }
- };
+ return entriesToPersons(pres);
+ }
+ };
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
index 3674052..2fefb807 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
@@ -43,25 +43,25 @@ public class CacheMvccLocalEntriesWithConcurrentTransactionTest extends CacheMvc
/** Test closure. */
private final IgniteClosure2X<CountDownLatch, CountDownLatch, List<Person>> clo =
new IgniteClosure2X<CountDownLatch, CountDownLatch, List<Person>>() {
- @Override public List<Person> applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
- throws IgniteCheckedException {
- Iterator<Cache.Entry<Integer, Person>> it = cache().localEntries(CachePeekMode.PRIMARY).iterator();
+ @Override public List<Person> applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
+ throws IgniteCheckedException {
+ Iterator<Cache.Entry<Integer, Person>> it = cache().localEntries(CachePeekMode.PRIMARY).iterator();
- List<Cache.Entry<Integer, Person>> pres = new ArrayList<>();
+ List<Cache.Entry<Integer, Person>> pres = new ArrayList<>();
- for (int i = 0; i < 10; i++)
- pres.add(it.next());
+ for (int i = 0; i < 10; i++)
+ pres.add(it.next());
- if (startLatch != null)
- startLatch.countDown();
+ if (startLatch != null)
+ startLatch.countDown();
- while (it.hasNext())
- pres.add(it.next());
+ while (it.hasNext())
+ pres.add(it.next());
- if (endLatch2 != null)
- U.await(endLatch2);
+ if (endLatch2 != null)
+ U.await(endLatch2);
- return entriesToPersons(pres);
- }
- };
+ return entriesToPersons(pres);
+ }
+ };
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java
index b90e3f3..230bd6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java
@@ -45,34 +45,34 @@ public class CacheMvccScanQueryWithConcurrentTransactionTest extends CacheMvccAb
/** Test closure. */
private final IgniteClosure2X<CountDownLatch, CountDownLatch, List<Person>> clo =
new IgniteClosure2X<CountDownLatch, CountDownLatch, List<Person>>() {
- @Override public List<Person> applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
- throws IgniteCheckedException {
- IgniteBiPredicate<Integer, Person> f = new IgniteBiPredicate<Integer, Person>() {
- @Override public boolean apply(Integer k, Person v) {
- return k % 2 == 0;
- }
- };
+ @Override public List<Person> applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
+ throws IgniteCheckedException {
+ IgniteBiPredicate<Integer, Person> f = new IgniteBiPredicate<Integer, Person>() {
+ @Override public boolean apply(Integer k, Person v) {
+ return k % 2 == 0;
+ }
+ };
- try (QueryCursor<Cache.Entry<Integer, Person>> cur = cache().query(new ScanQuery<Integer, Person>()
- .setFilter(f))) {
- Iterator<Cache.Entry<Integer, Person>> it = cur.iterator();
+ try (QueryCursor<Cache.Entry<Integer, Person>> cur = cache().query(new ScanQuery<Integer, Person>()
+ .setFilter(f))) {
+ Iterator<Cache.Entry<Integer, Person>> it = cur.iterator();
- List<Cache.Entry<Integer, Person>> pres = new ArrayList<>();
+ List<Cache.Entry<Integer, Person>> pres = new ArrayList<>();
- for (int i = 0; i < 50; i++)
- pres.add(it.next());
+ for (int i = 0; i < 50; i++)
+ pres.add(it.next());
- if (startLatch != null)
- startLatch.countDown();
+ if (startLatch != null)
+ startLatch.countDown();
- while (it.hasNext())
- pres.add(it.next());
+ while (it.hasNext())
+ pres.add(it.next());
- if (endLatch2 != null)
- U.await(endLatch2);
+ if (endLatch2 != null)
+ U.await(endLatch2);
- return entriesToPersons(pres);
+ return entriesToPersons(pres);
+ }
}
- }
- };
+ };
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java
index 0071e98e..5a51cc3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java
@@ -38,17 +38,17 @@ public class CacheMvccSizeWithConcurrentTransactionTest extends CacheMvccAbstrac
/** Test closure. */
private final IgniteClosure2X<CountDownLatch, CountDownLatch, Integer> clo =
new IgniteClosure2X<CountDownLatch, CountDownLatch, Integer>() {
- @Override public Integer applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
- throws IgniteCheckedException {
- if (startLatch != null)
- startLatch.countDown();
+ @Override public Integer applyx(CountDownLatch startLatch, CountDownLatch endLatch2)
+ throws IgniteCheckedException {
+ if (startLatch != null)
+ startLatch.countDown();
- int res = cache().size();
+ int res = cache().size();
- if (endLatch2 != null)
- U.await(endLatch2);
+ if (endLatch2 != null)
+ U.await(endLatch2);
- return res;
- }
- };
+ return res;
+ }
+ };
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java
index 575d03f..b36bd48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java
@@ -467,7 +467,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
//internal map in BinaryMetadataFileStore with futures awaiting write operations
Map map = GridTestUtils.getFieldValue(
- ig1.context().cacheObjects(), "metadataFileStore", "writer", "preparedTasks");
+ ig1.context().cacheObjects(), "metadataFileStore", "writer", "preparedTasks");
assertTrue(!map.isEmpty());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
index 5af58d1..fb6ea25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
@@ -179,7 +179,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
ig0.active(true);
for (int i = 1; i < 4; i++)
- fillCache(ig0.dataStreamer("cache" + i), CACHE_SIZE, GENERATING_FUNC);
+ fillCache(ig0.dataStreamer("cache" + i), CACHE_SIZE, GENERATING_FUNC);
String ig1Name = grid(1).name();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java
index 2b89232de..69d467e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java
@@ -501,10 +501,12 @@ public class IgnitePdsWithTtlTest extends GridCommonAbstractTest {
*
*/
protected void fillCache(IgniteCache<Integer, byte[]> cache) {
- cache.putAll(new TreeMap<Integer, byte[]>() {{
- for (int i = 0; i < ENTRIES; i++)
- put(i, new byte[1024]);
- }});
+ TreeMap<Integer, byte[]> data = new TreeMap<>();
+
+ for (int i = 0; i < ENTRIES; i++)
+ data.put(i, new byte[1024]);
+
+ cache.putAll(data);
//Touch entries.
for (int i = 0; i < ENTRIES; i++)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
index 548f498..9d03bd2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
@@ -111,13 +111,14 @@ public class IgniteCheckpointDirtyPagesForLowLoadTest extends GridCommonAbstract
for (int g = 0; g < GROUPS; g++) {
for (int c = 0; c < CACHES_IN_GRP; c++) {
- ignite.cache("dummyCache" + c + "." + g)
- .putAll(new TreeMap<Long, Long>() {{
- for (int j = 0; j < PARTS; j++) {
- // to fill each partition cache with at least 1 element
- put((long)j, (long)j);
- }
- }});
+ TreeMap<Long, Long> data = new TreeMap<>();
+
+ for (int j = 0; j < PARTS; j++) {
+ // to fill each partition cache with at least 1 element
+ data.put((long)j, (long)j);
+ }
+
+ ignite.cache("dummyCache" + c + "." + g).putAll(data);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
index 6b69bb0..2731615 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
@@ -85,11 +85,11 @@ public class IgniteWalFlushFailoverTest extends GridCommonAbstractTest {
cfg.setCacheConfiguration(cacheCfg);
DataStorageConfiguration memCfg = new DataStorageConfiguration()
- .setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(2048L * 1024 * 1024).setPersistenceEnabled(true))
- .setWalMode(WALMode.BACKGROUND)
- .setWalBufferSize(1024 * 1024)// Setting WAL Segment size to high values forces flushing by timeout.
- .setWalSegmentSize(flushByTimeout ? 2 * 1024 * 1024 : 512 * 1024);
+ .setDefaultDataRegionConfiguration(
+ new DataRegionConfiguration().setMaxSize(2048L * 1024 * 1024).setPersistenceEnabled(true))
+ .setWalMode(WALMode.BACKGROUND)
+ .setWalBufferSize(1024 * 1024)// Setting WAL Segment size to high values forces flushing by timeout.
+ .setWalSegmentSize(flushByTimeout ? 2 * 1024 * 1024 : 512 * 1024);
cfg.setDataStorageConfiguration(memCfg);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index f99c1cf..2b281ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -1693,7 +1693,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
}
}
- break;
+ break;
case TX_RECORD:
// Fallthrough
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java
index 6bc5713..5956bad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java
@@ -87,21 +87,21 @@ public class RobinHoodBackwardShiftHashMapTest {
public void testSimplestPutGet() throws Exception {
int cnt = 100;
withMap(map -> {
- for (int i = 0; i < cnt; i++) {
- int grpId = i + 1;
- int val = grpId * grpId;
+ for (int i = 0; i < cnt; i++) {
+ int grpId = i + 1;
+ int val = grpId * grpId;
- assertSizeChanged("Unique put should be successful " + grpId,
- map, () -> map.put(grpId, 1, val, 1));
- assertEquals(val, map.get(grpId, 1, 0, -1, -2));
+ assertSizeChanged("Unique put should be successful " + grpId,
+ map, () -> map.put(grpId, 1, val, 1));
+ assertEquals(val, map.get(grpId, 1, 0, -1, -2));
- assertSizeNotChanged("Duplicate put for " + grpId,
- map, () -> map.put(grpId, 1, 1, 1));
- assertEquals(1, map.get(grpId, 1, 0, -1, -2));
- }
+ assertSizeNotChanged("Duplicate put for " + grpId,
+ map, () -> map.put(grpId, 1, 1, 1));
+ assertEquals(1, map.get(grpId, 1, 0, -1, -2));
+ }
- assertEquals(cnt, map.size());
- }, cnt);
+ assertEquals(cnt, map.size());
+ }, cnt);
}
/**
@@ -110,19 +110,19 @@ public class RobinHoodBackwardShiftHashMapTest {
@Test(expected = IgniteOutOfMemoryException.class)
public void testSimplestOverflow() throws Exception {
withMap(map -> {
- for (int i = 0; i < 10; i++) {
- int grpId = i + 1;
- int val = grpId * grpId;
- assertSizeChanged("Unique put should be successful [" + grpId + "]", map, () -> map.put(grpId, 1, val, 1));
+ for (int i = 0; i < 10; i++) {
+ int grpId = i + 1;
+ int val = grpId * grpId;
+ assertSizeChanged("Unique put should be successful [" + grpId + "]", map, () -> map.put(grpId, 1, val, 1));
- assertEquals(val, map.get(grpId, 1, 0, -1, -2));
+ assertEquals(val, map.get(grpId, 1, 0, -1, -2));
- assertSizeNotChanged("Duplicate put for " + grpId, map, () -> map.put(grpId, 1, 1, 1));
- assertEquals(1, map.get(grpId, 1, 0, -1, -2));
- }
+ assertSizeNotChanged("Duplicate put for " + grpId, map, () -> map.put(grpId, 1, 1, 1));
+ assertEquals(1, map.get(grpId, 1, 0, -1, -2));
+ }
- map.put(11, 1, 11, 1);
- }, 10);
+ map.put(11, 1, 11, 1);
+ }, 10);
}
/**
@@ -157,18 +157,18 @@ public class RobinHoodBackwardShiftHashMapTest {
@Test
public void testPutRemoveOnSamePlaces() throws Exception {
withMap(map -> {
- doAddRemove(map);
-
- //fill with 1 space left;
- for (int i = 0; i < 99; i++) {
- int grpId = i + 1;
- int val = grpId * grpId;
- assertSizeChanged("Unique put should be successful " + grpId, map,
- () -> map.put(grpId, 1, val, 1));
- }
+ doAddRemove(map);
- doAddRemove(map);
- }, 100);
+ //fill with 1 space left;
+ for (int i = 0; i < 99; i++) {
+ int grpId = i + 1;
+ int val = grpId * grpId;
+ assertSizeChanged("Unique put should be successful " + grpId, map,
+ () -> map.put(grpId, 1, val, 1));
+ }
+
+ doAddRemove(map);
+ }, 100);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
index 100bcc4..974fc8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
@@ -470,10 +470,10 @@ public class IgniteClusterSnapshotCheckTest extends AbstractSnapshotSelfTest {
IdleVerifyResultV2 idleVerifyRes = ignite.compute().execute(new TestVisorBackupPartitionsTask(),
new VisorIdleVerifyTaskArg(new HashSet<>(singletonList(ccfg.getName())),
- new HashSet<>(),
- false,
- CacheFilterEnum.USER,
- true));
+ new HashSet<>(),
+ false,
+ CacheFilterEnum.USER,
+ true));
IdleVerifyResultV2 snpVerifyRes = ignite.compute().execute(new TestSnapshotPartitionsVerifyTask(),
new SnapshotPartitionsVerifyTaskArg(new HashSet<>(), Collections.singletonMap(ignite.cluster().localNode(),
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotMXBeanTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotMXBeanTest.java
index 22d0ff0..194008b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotMXBeanTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotMXBeanTest.java
@@ -142,11 +142,12 @@ public class IgniteSnapshotMXBeanTest extends AbstractSnapshotSelfTest {
spi.waitForBlocked();
- IgniteInternalFuture<Boolean> interruptFut = GridTestUtils.runAsync(() -> {
+ IgniteInternalFuture<Boolean> interruptFut = GridTestUtils.runAsync(() -> {
try {
return GridTestUtils.waitForCondition(
() -> !"".equals(getMetric("error", mReg0)) && !"".equals(getMetric("error", mReg1)), TIMEOUT);
- } finally {
+ }
+ finally {
spi.stopBlock();
}
});
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
index 81ad5b5..946db4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
@@ -385,13 +385,13 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
assertTrue(!ig2C.active());
assertTrue(!ig3C.active());
- checkExceptionTryUseCache(ig1B);
- checkExceptionTryUseCache(ig2B);
- checkExceptionTryUseCache(ig3B);
+ checkExceptionTryUseCache(ig1B);
+ checkExceptionTryUseCache(ig2B);
+ checkExceptionTryUseCache(ig3B);
- checkExceptionTryUseCache(ig1C);
- checkExceptionTryUseCache(ig2C);
- checkExceptionTryUseCache(ig3C);
+ checkExceptionTryUseCache(ig1C);
+ checkExceptionTryUseCache(ig2C);
+ checkExceptionTryUseCache(ig3C);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java
index 4ccaa27..070a1fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java
@@ -66,7 +66,7 @@ public class IgniteNoParrallelClusterIsAllowedTest extends IgniteChangeGlobalSta
fail();
}
catch (AssertionError er) {
- throw er;
+ throw er;
}
catch (Throwable e) {
while (true) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToActiveCluster.java
index 3ff8a65..268e519 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToActiveCluster.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToActiveCluster.java
@@ -321,8 +321,7 @@ public class JoinActiveNodeToActiveCluster extends AbstractNodeJoinTemplate {
Assert.assertEquals(4, caches.size());
}
}
- }).setEnd(new Runnable() {
- @Override public void run() {
+ }).setEnd(() -> {
for (int i = 0; i < 3; i++) {
IgniteEx ig = grid(name(i));
@@ -343,8 +342,7 @@ public class JoinActiveNodeToActiveCluster extends AbstractNodeJoinTemplate {
Assert.assertEquals(4, caches.size());
}
- }
- });
+ });
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java
index f2fc215..776ab5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java
@@ -234,13 +234,13 @@ public class CacheScanQueryFailoverTest extends GridCommonAbstractTest {
/** Failed filter. */
private static IgniteBiPredicate<Integer, BinaryObject> filter = (key, value) -> {
- throw new Error("Poison pill");
- };
+ throw new Error("Poison pill");
+ };
/** Failed entry transformer. */
private static IgniteClosure<Cache.Entry<Integer, BinaryObject>, Cache.Entry<Integer, BinaryObject>> transformer =
- integerBinaryObjectEntry -> {
- throw new Error("Poison pill");
+ integerBinaryObjectEntry -> {
+ throw new Error("Poison pill");
};
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
index 7d40c47..2afd595 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
@@ -318,7 +318,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest {
/**
*
*/
- static class PersonKey implements Serializable, Comparable<PersonKey> {
+ static class PersonKey implements Serializable, Comparable<PersonKey> {
/** */
private int id;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 18bb025..391a56c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -586,7 +586,7 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
for (CacheEntryEvent<? extends QueryTestKey, ? extends QueryTestValue> e : events)
evts.add(e);
}
- });
+ });
}
else if (qry instanceof ContinuousQueryWithTransformer)
initQueryWithTransformer(
@@ -725,7 +725,7 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
for (CacheEntryEvent<? extends QueryTestKey, ? extends QueryTestValue> e : events)
evts.add(e);
}
- });
+ });
}
else if (qry instanceof ContinuousQueryWithTransformer)
initQueryWithTransformer(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
index 54b1a95..2a2d93a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
@@ -298,7 +298,7 @@ public class CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
@Override public String apply(CacheEntryEvent<? extends Integer, ? extends Employee> evt) {
return null;
}
- }));
+ }));
qry.setRemoteFilterFactory(FactoryBuilder.factoryOf(new CacheEntryEventSerializableFilter<Integer, Employee>() {
@Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Employee> evt) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 1ef5195..acd8c80 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -1284,10 +1284,10 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
}
qry.setRemoteFilter(evt -> {
- FILTERED.put(evt.getKey(), evt.getValue());
+ FILTERED.put(evt.getKey(), evt.getValue());
- return bypassFilter;
- });
+ return bypassFilter;
+ });
try (QueryCursor<Cache.Entry<Integer, Integer>> qryCursor = grid(0).cache(DEFAULT_CACHE_NAME).query(qry)) {
checkLsnrAndFilterResults(setLocLsnr, bypassFilter, listened);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
index 49d588f..52cbafa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
@@ -191,7 +191,7 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst
*/
private static class CacheEventFilter implements CacheEntryEventFilter<Object, Object>, Serializable {
/** {@inheritDoc} */
- @Override public boolean evaluate(CacheEntryEvent<?, ?> evt) {
+ @Override public boolean evaluate(CacheEntryEvent<?, ?> evt) {
events.add(evt);
return false;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
index c8c86a6..4736648 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
@@ -69,7 +69,7 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr
*/
@Test
public void testNoUnsubscribe() throws Exception {
- checkNoUnsubscribe(false);
+ checkNoUnsubscribe(false);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
index 8e8a674..571502c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
@@ -69,49 +69,42 @@ public class DepthFirstSearchTest {
public void testNoCycle() throws Exception {
assertNull(findCycle(Collections.<GridCacheVersion, Set<GridCacheVersion>>emptyMap(), T1));
- HashMap<GridCacheVersion, Set<GridCacheVersion>> wfg;
+ HashMap<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<>();
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, null);
- }};
+ wfg.put(T1, null);
assertAllNull(wfg);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, null);
- put(T2, null);
- }};
+ wfg.clear();
+ wfg.put(T1, null);
+ wfg.put(T2, null);
assertAllNull(wfg);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T3, Collections.singleton(T4));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T3, Collections.singleton(T4));
assertAllNull(wfg);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
- put(T2, new HashSet<GridCacheVersion>() {{ add(T3); }});
- put(T4, new HashSet<GridCacheVersion>() {{ add(T1); add(T3); }});
- }};
+ wfg.clear();
+ wfg.put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
+ wfg.put(T2, new HashSet<GridCacheVersion>() {{ add(T3); }});
+ wfg.put(T4, new HashSet<GridCacheVersion>() {{ add(T1); add(T3); }});
assertAllNull(wfg);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
- put(T2, new HashSet<GridCacheVersion>() {{ add(T3); }});
- put(T4, new HashSet<GridCacheVersion>() {{ add(T1); add(T2); add(T3); }});
- }};
+ wfg.clear();
+ wfg.put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
+ wfg.put(T2, new HashSet<GridCacheVersion>() {{ add(T3); }});
+ wfg.put(T4, new HashSet<GridCacheVersion>() {{ add(T1); add(T2); add(T3); }});
assertAllNull(wfg);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
- put(T3, new HashSet<GridCacheVersion>() {{ add(T4); }});
- put(T4, new HashSet<GridCacheVersion>() {{ add(T1); }});
- }};
+ wfg.clear();
+ wfg.put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
+ wfg.put(T3, new HashSet<GridCacheVersion>() {{ add(T4); }});
+ wfg.put(T4, new HashSet<GridCacheVersion>() {{ add(T1); }});
assertAllNull(wfg);
}
@@ -121,43 +114,40 @@ public class DepthFirstSearchTest {
*/
@Test
public void testFindCycle2() throws Exception {
- Map<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, Collections.singleton(T1));
- }};
+ Map<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<>();
+
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, Collections.singleton(T1));
assertEquals(F.asList(T2, T1, T2), findCycle(wfg, T1));
assertEquals(F.asList(T1, T2, T1), findCycle(wfg, T2));
assertAllNull(wfg, T1, T2);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, Collections.singleton(T3));
- put(T3, asLinkedHashSet(T2, T4));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, Collections.singleton(T3));
+ wfg.put(T3, asLinkedHashSet(T2, T4));
assertEquals(F.asList(T3, T2, T3), findCycle(wfg, T1));
assertEquals(F.asList(T3, T2, T3), findCycle(wfg, T2));
assertEquals(F.asList(T2, T3, T2), findCycle(wfg, T3));
assertAllNull(wfg, T1, T2, T3);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, asLinkedHashSet(T3, T1));
- put(T3, Collections.singleton(T2));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, asLinkedHashSet(T3, T1));
+ wfg.put(T3, Collections.singleton(T2));
assertEquals(F.asList(T2, T1, T2), findCycle(wfg, T1));
assertEquals(F.asList(T1, T2, T1), findCycle(wfg, T2));
assertEquals(F.asList(T2, T3, T2), findCycle(wfg, T3));
assertAllNull(wfg, T1, T2, T3);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, asLinkedHashSet(T1, T3));
- put(T3, Collections.singleton(T4));
- put(T4, Collections.singleton(T3));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, asLinkedHashSet(T1, T3));
+ wfg.put(T3, Collections.singleton(T4));
+ wfg.put(T4, Collections.singleton(T3));
assertEquals(F.asList(T2, T1, T2), findCycle(wfg, T1));
assertEquals(F.asList(T4, T3, T4), findCycle(wfg, T2));
@@ -165,14 +155,13 @@ public class DepthFirstSearchTest {
assertEquals(F.asList(T3, T4, T3), findCycle(wfg, T4));
assertAllNull(wfg, T1, T2, T3, T4);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, Collections.singleton(T3));
- put(T3, Collections.singleton(T4));
- put(T4, Collections.singleton(T5));
- put(T5, Collections.singleton(T6));
- put(T6, Collections.singleton(T5));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, Collections.singleton(T3));
+ wfg.put(T3, Collections.singleton(T4));
+ wfg.put(T4, Collections.singleton(T5));
+ wfg.put(T5, Collections.singleton(T6));
+ wfg.put(T6, Collections.singleton(T5));
assertEquals(F.asList(T6, T5, T6), findCycle(wfg, T1));
assertEquals(F.asList(T6, T5, T6), findCycle(wfg, T2));
@@ -187,23 +176,22 @@ public class DepthFirstSearchTest {
*/
@Test
public void testFindCycle3() throws Exception {
- Map<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, Collections.singleton(T3));
- put(T3, Collections.singleton(T1));
- }};
+ Map<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<>();
+
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, Collections.singleton(T3));
+ wfg.put(T3, Collections.singleton(T1));
assertEquals(F.asList(T3, T2, T1, T3), findCycle(wfg, T1));
assertEquals(F.asList(T1, T3, T2, T1), findCycle(wfg, T2));
assertEquals(F.asList(T2, T1, T3, T2), findCycle(wfg, T3));
assertAllNull(wfg, T1, T2, T3);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, Collections.singleton(T3));
- put(T3, Collections.singleton(T4));
- put(T4, asLinkedHashSet(T2, T5));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, Collections.singleton(T3));
+ wfg.put(T3, Collections.singleton(T4));
+ wfg.put(T4, asLinkedHashSet(T2, T5));
assertEquals(F.asList(T4, T3, T2, T4), findCycle(wfg, T1));
assertEquals(F.asList(T4, T3, T2, T4), findCycle(wfg, T2));
@@ -211,28 +199,25 @@ public class DepthFirstSearchTest {
assertEquals(F.asList(T3, T2, T4, T3), findCycle(wfg, T4));
assertAllNull(wfg, T1, T2, T3, T4);
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, asLinkedHashSet(T3, T4));
- put(T3, Collections.singleton(T1));
- put(T4, Collections.singleton(T5));
- put(T5, Collections.singleton(T6));
- put(T6, Collections.singleton(T4));
-
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, asLinkedHashSet(T3, T4));
+ wfg.put(T3, Collections.singleton(T1));
+ wfg.put(T4, Collections.singleton(T5));
+ wfg.put(T5, Collections.singleton(T6));
+ wfg.put(T6, Collections.singleton(T4));
assertEquals(F.asList(T6, T5, T4, T6), findCycle(wfg, T1));
assertEquals(F.asList(T6, T5, T4, T6), findCycle(wfg, T2));
assertEquals(F.asList(T2, T1, T3, T2), findCycle(wfg, T3));
- wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, Collections.singleton(T3));
- put(T3, Collections.singleton(T4));
- put(T4, Collections.singleton(T5));
- put(T5, Collections.singleton(T6));
- put(T6, Collections.singleton(T4));
- }};
+ wfg.clear();
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, Collections.singleton(T3));
+ wfg.put(T3, Collections.singleton(T4));
+ wfg.put(T4, Collections.singleton(T5));
+ wfg.put(T5, Collections.singleton(T6));
+ wfg.put(T6, Collections.singleton(T4));
assertEquals(F.asList(T6, T5, T4, T6), findCycle(wfg, T1));
assertEquals(F.asList(T6, T5, T4, T6), findCycle(wfg, T2));
@@ -248,13 +233,13 @@ public class DepthFirstSearchTest {
*/
@Test
public void testFindCycle4() throws Exception {
- Map<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
- put(T1, Collections.singleton(T2));
- put(T2, asLinkedHashSet(T3, T4));
- put(T3, Collections.singleton(T4));
- put(T4, Collections.singleton(T5));
- put(T6, Collections.singleton(T3));
- }};
+ Map<GridCacheVersion, Set<GridCacheVersion>> wfg = new HashMap<>();
+
+ wfg.put(T1, Collections.singleton(T2));
+ wfg.put(T2, asLinkedHashSet(T3, T4));
+ wfg.put(T3, Collections.singleton(T4));
+ wfg.put(T4, Collections.singleton(T5));
+ wfg.put(T6, Collections.singleton(T3));
assertNull(findCycle(wfg, T1));
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java
index 4591604..2ba8d89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java
@@ -244,8 +244,8 @@ public class WarmUpSelfTest extends GridCommonAbstractTest {
new DataRegionConfiguration().setName("2").setPersistenceEnabled(true)
.setWarmUpConfiguration(new NoOpWarmUpConfiguration())
).setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setName("3").setPersistenceEnabled(true)
- )
+ new DataRegionConfiguration().setName("3").setPersistenceEnabled(true)
+ )
);
startGrid(cfg);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
index c7c775b..73eafe1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
@@ -160,12 +160,14 @@ public class IgniteComputeCustomExecutorSelfTest extends GridCommonAbstractTest
}
}, Collections.singletonList(0));
- comp.apply(new IgniteClosure<Integer, Object>() {
- @Override public Object apply(Integer o) {
- assertTrue(Thread.currentThread().getName().contains(EXEC_NAME0));
- return null;
- }
- }, Collections.singletonList(0),
+ IgniteClosure<Integer, Object> job = new IgniteClosure<Integer, Object>() {
+ @Override public Object apply(Integer o) {
+ assertTrue(Thread.currentThread().getName().contains(EXEC_NAME0));
+ return null;
+ }
+ };
+
+ comp.apply(job, Collections.singletonList(0),
new IgniteReducer<Object, Object>() {
@Override public boolean collect(@Nullable Object o) {
return true;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index b817b0c..865c520 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -1688,7 +1688,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
long maxBound = correctSize + putRmvThreadCnt;
if (DEBUG_PRINT || (iter & 0x3ff) == 0)
- X.println(order + ": size=" + treeSize + "; bounds=[" + minBound + ".." + maxBound
+ X.println(order + ": size=" + treeSize + "; bounds=[" + minBound + ".." + maxBound
+ "]; contents=" + treeContents);
if (treeSize < minBound || treeSize > maxBound) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java
index 9f81791..ea08bd9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java
@@ -81,93 +81,93 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest {
@Test
public void testConvertFunction() throws Exception {
check(
- "CONVERT ( CURDATE(), CHAR )",
- "{ fn CONVERT ( { fn CURDATE() }, SQL_CHAR ) }"
+ "CONVERT ( CURDATE(), CHAR )",
+ "{ fn CONVERT ( { fn CURDATE() }, SQL_CHAR ) }"
);
check(
- "conVerT ( some_expression('one', 'two') , DECIMAL ( 5 , 2 ) )",
- "{ fn conVerT ( some_expression('one', 'two') , SQL_DECIMAL ( 5 , 2 ) ) }"
+ "conVerT ( some_expression('one', 'two') , DECIMAL ( 5 , 2 ) )",
+ "{ fn conVerT ( some_expression('one', 'two') , SQL_DECIMAL ( 5 , 2 ) ) }"
);
check(
- "convert(field,CHAR)",
- "{fn convert(field,sql_char)}"
+ "convert(field,CHAR)",
+ "{fn convert(field,sql_char)}"
);
check(
- "convert(field,BIGINT)",
- "{fn convert(field,sql_bigint)}"
+ "convert(field,BIGINT)",
+ "{fn convert(field,sql_bigint)}"
);
check(
- "convert(field,BINARY)",
- "{fn convert(field,sql_binary)}" // also sql_varbinary,sql_longvarbinary
+ "convert(field,BINARY)",
+ "{fn convert(field,sql_binary)}" // also sql_varbinary,sql_longvarbinary
);
check(
- "convert(field,BIT)",
- "{fn convert(field,sql_bit)}"
+ "convert(field,BIT)",
+ "{fn convert(field,sql_bit)}"
);
check(
- "convert(field,CHAR(100))",
- "{fn convert(field,sql_char(100))}"
+ "convert(field,CHAR(100))",
+ "{fn convert(field,sql_char(100))}"
);
check(
- "convert(field,DECIMAL(5,2))",
- "{fn convert(field,sql_decimal(5,2))}" // also sql_numeric
+ "convert(field,DECIMAL(5,2))",
+ "{fn convert(field,sql_decimal(5,2))}" // also sql_numeric
);
check(
- "convert(field,VARCHAR(100))",
- "{fn convert(field,sql_varchar(100))}" // also sql_longvarchar,sql_wchar,sql_wlongvarchar,sql_wvarchar
+ "convert(field,VARCHAR(100))",
+ "{fn convert(field,sql_varchar(100))}" // also sql_longvarchar,sql_wchar,sql_wlongvarchar,sql_wvarchar
);
check(
- "convert(field,DOUBLE)",
- "{fn convert(field,sql_double)}" // also sql_float
+ "convert(field,DOUBLE)",
+ "{fn convert(field,sql_double)}" // also sql_float
);
check(
- "convert(field,REAL)",
- "{fn convert(field,sql_real)}"
+ "convert(field,REAL)",
+ "{fn convert(field,sql_real)}"
);
check(
- "convert(field,UUID)",
- "{fn convert(field,sql_guid)}"
+ "convert(field,UUID)",
+ "{fn convert(field,sql_guid)}"
);
check(
- "convert(field,SMALLINT)",
- "{fn convert(field,sql_smallint)}"
+ "convert(field,SMALLINT)",
+ "{fn convert(field,sql_smallint)}"
);
check(
- "convert(field,INTEGER)",
- "{fn convert(field,sql_integer)}"
+ "convert(field,INTEGER)",
+ "{fn convert(field,sql_integer)}"
);
check(
- "convert(field,DATE)",
- "{fn convert(field,sql_date)}"
+ "convert(field,DATE)",
+ "{fn convert(field,sql_date)}"
);
check(
- "convert(field,TIME)",
- "{fn convert(field,sql_time)}"
+ "convert(field,TIME)",
+ "{fn convert(field,sql_time)}"
);
check(
- "convert(field,TIMESTAMP)",
- "{fn convert(field,sql_timestamp)}"
+ "convert(field,TIMESTAMP)",
+ "{fn convert(field,sql_timestamp)}"
);
check(
- "convert(field,TINYINT)",
- "{fn convert(field,sql_tinyint)}"
+ "convert(field,TINYINT)",
+ "{fn convert(field,sql_tinyint)}"
);
//invalid odbc type
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSelfTest.java
index f28c2c0..26f0a23 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSelfTest.java
@@ -71,20 +71,20 @@ public class PerformanceStatisticsSelfTest extends AbstractPerformanceStatistics
/** Test entry processor. */
private static final EntryProcessor<Object, Object, Object> ENTRY_PROC =
new EntryProcessor<Object, Object, Object>() {
- @Override public Object process(MutableEntry<Object, Object> entry, Object... arguments)
- throws EntryProcessorException {
- return null;
- }
- };
+ @Override public Object process(MutableEntry<Object, Object> entry, Object... arguments)
+ throws EntryProcessorException {
+ return null;
+ }
+ };
/** Test cache entry processor. */
private static final CacheEntryProcessor<Object, Object, Object> CACHE_ENTRY_PROC =
new CacheEntryProcessor<Object, Object, Object>() {
- @Override public Object process(MutableEntry<Object, Object> entry, Object... arguments)
- throws EntryProcessorException {
- return null;
- }
- };
+ @Override public Object process(MutableEntry<Object, Object> entry, Object... arguments)
+ throws EntryProcessorException {
+ return null;
+ }
+ };
/** Client type to run operations from. */
@Parameterized.Parameter
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/closure/ContinuousQueryRemoteSecurityContextCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/closure/ContinuousQueryRemoteSecurityContextCheckTest.java
index 0e2c1f1..739fcf0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/closure/ContinuousQueryRemoteSecurityContextCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/closure/ContinuousQueryRemoteSecurityContextCheckTest.java
@@ -98,6 +98,6 @@ public class ContinuousQueryRemoteSecurityContextCheckTest extends
* @return Test operation.
*/
private IgniteRunnable operation(Consumer<ContinuousQuery<Integer, Integer>> c) {
- return operation(c, false);
+ return operation(c, false);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentDiscoveryListenerNotificationOrderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentDiscoveryListenerNotificationOrderTest.java
index abd0ca4..7969148 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentDiscoveryListenerNotificationOrderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentDiscoveryListenerNotificationOrderTest.java
@@ -1,104 +1,104 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
- package org.apache.ignite.internal.processors.service;
+package org.apache.ignite.internal.processors.service;
- import java.util.Collection;
- import java.util.EventListener;
- import java.util.List;
- import java.util.concurrent.ConcurrentMap;
- import org.apache.ignite.internal.IgniteEx;
- import org.apache.ignite.internal.events.DiscoveryCustomEvent;
- import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
- import org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager;
- import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
- import org.apache.ignite.internal.util.GridConcurrentLinkedHashSet;
- import org.apache.ignite.testframework.GridTestUtils;
- import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
- import org.junit.Test;
+import java.util.Collection;
+import java.util.EventListener;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
+import org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.util.GridConcurrentLinkedHashSet;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
- /**
- * <b>Tests in the class strongly depend on implementation of {@link GridEventStorageManager} and internal logic of
- * services and PME discovery listeners.</b>
- * <p/>
- * Tests that discovery listener registered by {@link ServiceDeploymentManager} will be notified earlier than discovery
- * listener registered by {@link GridCachePartitionExchangeManager}. It allows service manager capture custom message
- * because it may be nullified in PME process at the end of exchange in {@link GridDhtPartitionsExchangeFuture#onDone()}.
- */
- public class ServiceDeploymentDiscoveryListenerNotificationOrderTest extends GridCommonAbstractTest {
- /**
- * <b>Strongly depends on internal implementation of {@link GridEventStorageManager}.</b>
- * <p/>
- * Tests that discovery listener registered by {@link ServiceDeploymentManager} is in collection of hight priority
- * listeners, at the same time discovery listener registered by {@link GridCachePartitionExchangeManager} is in
- * collection of usual listeners.
- * <p/>
- * This guarantees that service deployment discovery listener will be notified earlier that PME's discovery listener
- * and will be able to capture custom messages which may be nullified in PME process.
- *
- * @throws Exception In case of an error.
- */
- @Test
- public void testServiceDiscoveryListenerNotifiedEarlierThanPME() throws Exception {
- try {
- IgniteEx ignite = startGrid(0);
+/**
+ * <b>Tests in the class strongly depend on implementation of {@link GridEventStorageManager} and internal logic of
+ * services and PME discovery listeners.</b>
+ * <p/>
+ * Tests that discovery listener registered by {@link ServiceDeploymentManager} will be notified earlier than discovery
+ * listener registered by {@link GridCachePartitionExchangeManager}. It allows service manager capture custom message
+ * because it may be nullified in PME process at the end of exchange in {@link GridDhtPartitionsExchangeFuture#onDone()}.
+ */
+public class ServiceDeploymentDiscoveryListenerNotificationOrderTest extends GridCommonAbstractTest {
+ /**
+ * <b>Strongly depends on internal implementation of {@link GridEventStorageManager}.</b>
+ * <p/>
+ * Tests that discovery listener registered by {@link ServiceDeploymentManager} is in collection of hight priority
+ * listeners, at the same time discovery listener registered by {@link GridCachePartitionExchangeManager} is in
+ * collection of usual listeners.
+ * <p/>
+ * This guarantees that service deployment discovery listener will be notified earlier that PME's discovery listener
+ * and will be able to capture custom messages which may be nullified in PME process.
+ *
+ * @throws Exception In case of an error.
+ */
+ @Test
+ public void testServiceDiscoveryListenerNotifiedEarlierThanPME() throws Exception {
+ try {
+ IgniteEx ignite = startGrid(0);
- ConcurrentMap<Integer, Object> lsnrs = GridTestUtils
- .getFieldValue(ignite.context().event(), "lsnrs");
+ ConcurrentMap<Integer, Object> lsnrs = GridTestUtils
+ .getFieldValue(ignite.context().event(), "lsnrs");
- Object customLsnrs = lsnrs.get(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT);
+ Object customLsnrs = lsnrs.get(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT);
- List<EventListener> highPriorityLsnrs = GridTestUtils.getFieldValue(customLsnrs, "highPriorityLsnrs");
+ List<EventListener> highPriorityLsnrs = GridTestUtils.getFieldValue(customLsnrs, "highPriorityLsnrs");
- GridConcurrentLinkedHashSet<EventListener> usualLsnrs = GridTestUtils
- .getFieldValue(customLsnrs, "lsnrs");
+ GridConcurrentLinkedHashSet<EventListener> usualLsnrs = GridTestUtils
+ .getFieldValue(customLsnrs, "lsnrs");
- assertTrue("Failed to find service deployment manager's listener in high priority listeners.",
- containsListener(highPriorityLsnrs, ServiceDeploymentManager.class));
+ assertTrue("Failed to find service deployment manager's listener in high priority listeners.",
+ containsListener(highPriorityLsnrs, ServiceDeploymentManager.class));
- assertFalse("Service deployment manager's listener shoud not be registered in usual listeners.",
- containsListener(usualLsnrs, ServiceDeploymentManager.class));
+ assertFalse("Service deployment manager's listener shoud not be registered in usual listeners.",
+ containsListener(usualLsnrs, ServiceDeploymentManager.class));
- assertTrue("Failed to find PME manager's discovery listener in usual listeners.",
- containsListener(usualLsnrs, GridCachePartitionExchangeManager.class));
+ assertTrue("Failed to find PME manager's discovery listener in usual listeners.",
+ containsListener(usualLsnrs, GridCachePartitionExchangeManager.class));
- assertFalse("PME manager's discovery listener shoud not be registered in high priority listeners.",
- containsListener(highPriorityLsnrs, GridCachePartitionExchangeManager.class));
- }
- finally {
- stopAllGrids();
- }
- }
+ assertFalse("PME manager's discovery listener shoud not be registered in high priority listeners.",
+ containsListener(highPriorityLsnrs, GridCachePartitionExchangeManager.class));
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
- /**
- * @param lsnrs Collection of listeners.
- * @param cls Listener class.
- * @return {@code true} if given collection contains expected listener, otherwise {@code false}.
- */
- private boolean containsListener(Collection<EventListener> lsnrs, Class cls) {
- for (Object wrapper : lsnrs) {
- Object lsnr = GridTestUtils.getFieldValue(wrapper, "lsnr");
+ /**
+ * @param lsnrs Collection of listeners.
+ * @param cls Listener class.
+ * @return {@code true} if given collection contains expected listener, otherwise {@code false}.
+ */
+ private boolean containsListener(Collection<EventListener> lsnrs, Class cls) {
+ for (Object wrapper : lsnrs) {
+ Object lsnr = GridTestUtils.getFieldValue(wrapper, "lsnr");
- // We can't use 'instance of' or other reflection tools to check the type of class, because, service
- // deployment discovery listener is a private non-static class, PME's listener is an anonymous class.
- if (lsnr.getClass().getName().startsWith(cls.getName()))
- return true;
- }
+ // We can't use 'instance of' or other reflection tools to check the type of class, because, service
+ // deployment discovery listener is a private non-static class, PME's listener is an anonymous class.
+ if (lsnr.getClass().getName().startsWith(cls.getName()))
+ return true;
+ }
- return false;
- }
- }
+ return false;
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
index e3aed3e..121ed454 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
@@ -226,24 +226,24 @@ public class BitSetIntSetTest extends GridCommonAbstractTest {
intSet.add(11);
intSet.add(1025);
- assertTrue(intSet.containsAll(new ArrayList<Integer>() {{
- add(1);
- add(10);
- }}));
-
- assertFalse(intSet.containsAll(new ArrayList<Integer>() {{
- add(1);
- add(10);
- add(11);
- add(1025);
- add(1026);
- }}));
-
- assertFalse(intSet.containsAll(new ArrayList<Integer>() {{
- add(1);
- add(10);
- add(12);
- }}));
+ assertTrue(intSet.containsAll(Arrays.asList(
+ 1,
+ 10
+ )));
+
+ assertFalse(intSet.containsAll(Arrays.asList(
+ 1,
+ 10,
+ 11,
+ 1025,
+ 1026
+ )));
+
+ assertFalse(intSet.containsAll(Arrays.asList(
+ 1,
+ 10,
+ 12
+ )));
}
/**
@@ -259,28 +259,28 @@ public class BitSetIntSetTest extends GridCommonAbstractTest {
intSet.add(11);
intSet.add(1025);
- assertFalse(intSet.addAll(new ArrayList<Integer>() {{
- add(1);
- add(10);
- }}));
+ assertFalse(intSet.addAll(Arrays.asList(
+ 1,
+ 10
+ )));
assertEquals(4, intSet.size());
- assertTrue(intSet.addAll(new ArrayList<Integer>() {{
- add(1);
- add(10);
- add(11);
- add(1025);
- add(1026);
- }}));
+ assertTrue(intSet.addAll(Arrays.asList(
+ 1,
+ 10,
+ 11,
+ 1025,
+ 1026
+ )));
assertEquals(5, intSet.size());
try {
- intSet.retainAll(new ArrayList<Integer>() {{
- add(10);
- add(1025);
- }});
+ intSet.retainAll(Arrays.asList(
+ 10,
+ 1025
+ ));
fail("retainAll is not supported");
}
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java
index e209a06..05b19b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java
@@ -86,12 +86,12 @@ public class GridMetadataAwareAdapterLoadTest extends GridCommonAbstractTest {
case -1:
for (int j = 9; j >= 0; j--)
//entry.addMeta(uuids[j], dic[i]);
- entry.addMeta(j, dic[i]);
+ entry.addMeta(j, dic[i]);
break;
case 0:
for (int j = 2; j >= 0; j--)
//entry.addMeta(uuids[j], dic[i]);
- entry.addMeta(j, dic[i]);
+ entry.addMeta(j, dic[i]);
break;
case 1:
//entry.addMeta(uuids[0], dic[i]);
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
index 4cf9e4a..fabf30f 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
@@ -47,8 +47,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
}
/** Write closure. */
- private final CIX1<IgniteCache<Integer, Integer>> writeClos =
- new CIX1<IgniteCache<Integer, Integer>>() {
+ private final CIX1<IgniteCache<Integer, Integer>> writeClos = new CIX1<IgniteCache<Integer, Integer>>() {
@Override public void applyx(IgniteCache<Integer, Integer> cache) {
for (int i = 0; i < operationsPerTx; i++) {
int kv = RAND.nextInt(KEY_RANGE);
@@ -64,8 +63,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
};
/** Read closure. */
- private final CIX1<IgniteCache<Integer, Integer>> readClos =
- new CIX1<IgniteCache<Integer, Integer>>() {
+ private final CIX1<IgniteCache<Integer, Integer>> readClos = new CIX1<IgniteCache<Integer, Integer>>() {
@Override public void applyx(IgniteCache<Integer, Integer> cache) {
for (int i = 0; i < operationsPerTx; i++) {
int k = RAND.nextInt(KEY_RANGE);
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java
index beecf6b..0952c29 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java
@@ -96,13 +96,13 @@ public class GridBoundedConcurrentLinkedHashSetLoadTest {
UUID id = UUID.randomUUID();
try {
- while (!finish.get()) {
- set.add(IgniteUuid.fromUuid(id));
+ while (!finish.get()) {
+ set.add(IgniteUuid.fromUuid(id));
- execCnt.increment();
- }
+ execCnt.increment();
+ }
- return null;
+ return null;
}
catch (Throwable t) {
t.printStackTrace();
diff --git a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
index a75afed..ceecc47 100644
--- a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
@@ -75,31 +75,31 @@ public class SecurityPermissionSetBuilderTest extends GridCommonAbstractTest {
final SecurityPermissionSetBuilder permsBuilder = new SecurityPermissionSetBuilder();
assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- permsBuilder.appendCachePermissions("cache", ADMIN_VIEW);
- return null;
- }
- }, IgniteException.class,
- "you can assign permission only start with [CACHE_], but you try ADMIN_VIEW"
+ @Override public Object call() throws Exception {
+ permsBuilder.appendCachePermissions("cache", ADMIN_VIEW);
+ return null;
+ }
+ }, IgniteException.class,
+ "you can assign permission only start with [CACHE_], but you try ADMIN_VIEW"
);
assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- permsBuilder.appendTaskPermissions("task", CACHE_READ, JOIN_AS_SERVER);
- return null;
- }
- }, IgniteException.class,
- "you can assign permission only start with [TASK_], but you try CACHE_READ"
+ @Override public Object call() throws Exception {
+ permsBuilder.appendTaskPermissions("task", CACHE_READ, JOIN_AS_SERVER);
+ return null;
+ }
+ }, IgniteException.class,
+ "you can assign permission only start with [TASK_], but you try CACHE_READ"
);
assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- permsBuilder.appendSystemPermissions(TASK_EXECUTE, CACHE_PUT);
- return null;
- }
- }, IgniteException.class,
- "you can assign permission only start with [EVENTS_, ADMIN_, CACHE_CREATE, CACHE_DESTROY, " +
- "JOIN_AS_SERVER, CHANGE_STATISTICS, REFRESH_STATISTICS], but you try TASK_EXECUTE"
+ @Override public Object call() throws Exception {
+ permsBuilder.appendSystemPermissions(TASK_EXECUTE, CACHE_PUT);
+ return null;
+ }
+ }, IgniteException.class,
+ "you can assign permission only start with [EVENTS_, ADMIN_, CACHE_CREATE, CACHE_DESTROY, " +
+ "JOIN_AS_SERVER, CHANGE_STATISTICS, REFRESH_STATISTICS], but you try TASK_EXECUTE"
);
assertThrows(log, new Callable<Object>() {
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
index 4affbc1..43f5694 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java
@@ -227,33 +227,33 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra
*/
@Test
public void testDiffAttribute() throws Exception {
- List<CollisionJobContext> waitCtxs = Collections.emptyList();
+ List<CollisionJobContext> waitCtxs = Collections.emptyList();
- Collection<CollisionJobContext> activeCtxs = Collections.emptyList();
+ Collection<CollisionJobContext> activeCtxs = Collections.emptyList();
- GridTestNode rmtNode = (GridTestNode)F.first(getSpiContext().remoteNodes());
+ GridTestNode rmtNode = (GridTestNode)F.first(getSpiContext().remoteNodes());
- rmtNode.setAttribute("useCollision1", true);
+ rmtNode.setAttribute("useCollision1", true);
- getSpiContext().triggerMessage(rmtNode, new JobStealingRequest(1));
+ getSpiContext().triggerMessage(rmtNode, new JobStealingRequest(1));
- // Set up the same attribute and value as for remote node.
- getSpi().setStealingAttributes(F.asMap("useCollision2", true));
+ // Set up the same attribute and value as for remote node.
+ getSpi().setStealingAttributes(F.asMap("useCollision2", true));
- getSpi().onCollision(new GridCollisionTestContext(activeCtxs, waitCtxs));
+ getSpi().onCollision(new GridCollisionTestContext(activeCtxs, waitCtxs));
- // Cleanup
- rmtNode.removeAttribute("useCollision1");
+ // Cleanup
+ rmtNode.removeAttribute("useCollision1");
- // Set up the same attribute and value as for remote node.
- getSpi().setStealingAttributes(Collections.<String, Serializable>emptyMap());
+ // Set up the same attribute and value as for remote node.
+ getSpi().setStealingAttributes(Collections.<String, Serializable>emptyMap());
- // Make sure that no message was sent.
+ // Make sure that no message was sent.
Serializable msg = getSpiContext().removeSentMessage(rmtNode);
- // Message should be sent to remote node because it has the same
- // attributes.
- assert msg == null;
+ // Message should be sent to remote node because it has the same
+ // attributes.
+ assert msg == null;
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
index 247f31a..b6c1491 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
@@ -122,10 +122,10 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
ignite0.context().cache().context().io().addCacheHandler(
0, TestBadMessage.class, new CI2<UUID, GridCacheMessage>() {
- @Override public void apply(UUID nodeId, GridCacheMessage msg) {
- throw new RuntimeException("Test bad message exception");
- }
- });
+ @Override public void apply(UUID nodeId, GridCacheMessage msg) {
+ throw new RuntimeException("Test bad message exception");
+ }
+ });
ignite1.context().cache().context().io().addCacheHandler(
0, TestBadMessage.class, new CI2<UUID, GridCacheMessage>() {
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMultiJvmTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMultiJvmTest.java
index 69d7b40..edae8b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMultiJvmTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMultiJvmTest.java
@@ -213,14 +213,14 @@ public class TcpCommunicationSpiMultiJvmTest extends GridCommonAbstractTest {
AtomicBoolean cacheCreatedAndLoaded = new AtomicBoolean(false);
GridTestUtils.runAsync(() -> {
- IgniteCache<Object, Object> cache = ig.getOrCreateCache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> cache = ig.getOrCreateCache(DEFAULT_CACHE_NAME);
- for (int i = 0; i < 100; i++) {
- cache.put(i, i);
- }
+ for (int i = 0; i < 100; i++) {
+ cache.put(i, i);
+ }
- cacheCreatedAndLoaded.set(true);
- }, "start_cache_thread");
+ cacheCreatedAndLoaded.set(true);
+ }, "start_cache_thread");
return cacheCreatedAndLoaded;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java
index 1ca301d..ef32bdd 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java
@@ -84,12 +84,12 @@ public class FilterDataForClientNodeDiscoveryTest extends GridCommonAbstractTest
grid(i).context().discovery().setCustomEventListener(
MessageForServer.class, new CustomEventListener<MessageForServer>() {
- @Override public void onCustomEvent(AffinityTopologyVersion topVer, ClusterNode snd,
- MessageForServer msg) {
+ @Override public void onCustomEvent(AffinityTopologyVersion topVer, ClusterNode snd,
+ MessageForServer msg) {
- recvMsg[idx0] = true;
- }
- });
+ recvMsg[idx0] = true;
+ }
+ });
}
for (int i = 0; i < 4; ++i) {
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNetworkIssuesTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNetworkIssuesTest.java
index 0db781a..32c1904 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNetworkIssuesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNetworkIssuesTest.java
@@ -185,7 +185,7 @@ public class TcpDiscoveryNetworkIssuesTest extends GridCommonAbstractTest {
illNodeSegmented.set(true);
return false;
- }, EVT_NODE_SEGMENTED);
+ }, EVT_NODE_SEGMENTED);
specialSpi = null;
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java
index df9b6dc..9cfe5c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java
@@ -81,7 +81,7 @@ public class TcpDiscoveryWithWrongServerTest extends GridCommonAbstractTest {
* Starts tcp test thread
* @param workerFactory one of WorkerFactory
*/
- protected void startTcpThread(final WorkerFactory workerFactory, final int port) throws Exception {
+ protected void startTcpThread(final WorkerFactory workerFactory, final int port) throws Exception {
final ServerSocket srvSock = new ServerSocket(port, 10, InetAddress.getByName("127.0.0.1"));
srvSocks.add(srvSock);
@@ -270,7 +270,7 @@ public class TcpDiscoveryWithWrongServerTest extends GridCommonAbstractTest {
return new SocketWorker(clientSock) {
@Override public void action(InputStream input, OutputStream output) throws IOException {
log.error("TEST: No response was sent to " + clientSock.getRemoteSocketAddress());
- }
+ }
};
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerUnmarshalVulnerabilityTest.java b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerUnmarshalVulnerabilityTest.java
index e96076e..34f29b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerUnmarshalVulnerabilityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerUnmarshalVulnerabilityTest.java
@@ -213,7 +213,7 @@ public class SocketStreamerUnmarshalVulnerabilityTest extends GridCommonAbstract
}
}
finally {
- stopAllGrids();
+ stopAllGrids();
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/MessageOrderLogListener.java b/modules/core/src/test/java/org/apache/ignite/testframework/MessageOrderLogListener.java
index e8ea6ef..5669d1f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/MessageOrderLogListener.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/MessageOrderLogListener.java
@@ -38,10 +38,10 @@ public class MessageOrderLogListener extends LogListener {
* @param messages array of messages that will be unified into ordered group.
*/
public MessageOrderLogListener(String... messages) {
- this(new MessageGroup(true) {{
- for (String m : messages)
- add(m);
- }});
+ this.matchesGrp = new MessageGroup(true);
+
+ for (String m : messages)
+ matchesGrp.add(m);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
index d9b8bf2..4296187 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
@@ -124,8 +124,8 @@ public class MvccFeatureChecker {
* @return {@code True} if feature is supported, {@code False} otherwise.
*/
public static boolean isSupported(TransactionConcurrency conc, TransactionIsolation iso) {
- return conc == TransactionConcurrency.PESSIMISTIC &&
- iso == TransactionIsolation.REPEATABLE_READ;
+ return conc == TransactionConcurrency.PESSIMISTIC &&
+ iso == TransactionIsolation.REPEATABLE_READ;
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index cea4f40..615b9ad 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -188,9 +188,8 @@ public abstract class GridAbstractTest extends JUnitAssertAware {
private static final String NULL_NAME = UUID.randomUUID().toString();
/** Ip finder for TCP discovery. */
- public static final TcpDiscoveryIpFinder LOCAL_IP_FINDER = new TcpDiscoveryVmIpFinder(false) {{
+ public static final TcpDiscoveryIpFinder LOCAL_IP_FINDER = new TcpDiscoveryVmIpFinder(false).
setAddresses(Collections.singleton("127.0.0.1:47500..47509"));
- }};
/** Shared static IP finder which is used in configuration at nodes startup <b>for all test methods in class</b>. */
protected static TcpDiscoveryIpFinder sharedStaticIpFinder;
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 6159556..478137a 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -2680,15 +2680,15 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
}
}
- /**
- * Getting WAL manager.
- *
- * @param n Node.
- * @return WAL manger.
- */
- protected static FileWriteAheadLogManager walMgr(IgniteEx n) {
- return (FileWriteAheadLogManager)n.context().cache().context().wal();
- }
+ /**
+ * Getting WAL manager.
+ *
+ * @param n Node.
+ * @return WAL manger.
+ */
+ protected static FileWriteAheadLogManager walMgr(IgniteEx n) {
+ return (FileWriteAheadLogManager)n.context().cache().context().wal();
+ }
/**
* Disable/enable VAL.
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTestSelfTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTestSelfTest.java
index 48a9f3c..5a7e9bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTestSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTestSelfTest.java
@@ -102,70 +102,41 @@ public class GridCommonAbstractTestSelfTest extends GridCommonAbstractTest {
*/
@Test
public void testMapsEqualityChecks() {
- assertEqualsMaps(
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- }},
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(3, 3);
- put(2, 2);
- }});
-
- assertFailed(() -> assertEqualsMaps(
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- }},
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- put(4, 4);
- }}));
-
- assertFailed(() -> assertEqualsMaps(
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- put(null, null);
- }},
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- put(4, 4);
- }}));
-
- assertFailed(() -> assertEqualsMaps(
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- put(null, null);
- }},
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- }}));
-
- assertFailed(() -> assertEqualsMaps(
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- }},
- new HashMap<Integer, Integer>() {{
- put(1, 1);
- put(2, 2);
- put(3, 3);
- put(null, null);
- }}));
+ HashMap<Integer, Integer> map1 = new HashMap<>();
+
+ map1.put(1, 1);
+ map1.put(2, 2);
+ map1.put(3, 3);
+
+ HashMap<Integer, Integer> map2 = new HashMap<>();
+
+ map2.put(1, 1);
+ map2.put(3, 3);
+ map2.put(2, 2);
+
+ assertEqualsMaps(map1, map2);
+
+ HashMap<Integer, Integer> map3 = new HashMap<>();
+
+ map3.put(1, 1);
+ map3.put(2, 2);
+ map3.put(3, 3);
+ map3.put(4, 4);
+
+ assertFailed(() -> assertEqualsMaps(map1, map3));
+
+ HashMap<Integer, Integer> map4 = new HashMap<>();
+
+ map4.put(1, 1);
+ map4.put(2, 2);
+ map4.put(3, 3);
+ map4.put(null, null);
+
+ assertFailed(() -> assertEqualsMaps(map4, map3));
+
+ assertFailed(() -> assertEqualsMaps(map4, map1));
+
+ assertFailed(() -> assertEqualsMaps(map1, map4));
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/wal/record/RecordUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/wal/record/RecordUtils.java
index d633898..4e10182 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/wal/record/RecordUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/wal/record/RecordUtils.java
@@ -173,84 +173,91 @@ import static org.apache.ignite.internal.processors.cache.tree.DataInnerIO.VERSI
* required.
*/
public class RecordUtils {
- /** **/
+ /** */
private static final Map<WALRecord.RecordType, Supplier<WALRecord>> TEST_WAL_RECORD_SUPPLIER =
- new EnumMap<WALRecord.RecordType, Supplier<WALRecord>>(WALRecord.RecordType.class) {{
- put(TX_RECORD, RecordUtils::buildTxRecord);
- put(PAGE_RECORD, RecordUtils::buildPageSnapshot);
- put(DATA_RECORD, RecordUtils::buildDataRecord);
- put(DATA_RECORD_V2, RecordUtils::buildDataRecord);
- put(CHECKPOINT_RECORD, RecordUtils::buildCheckpointRecord);
- put(HEADER_RECORD, RecordUtils::buildHeaderRecord);
- put(INIT_NEW_PAGE_RECORD, RecordUtils::buildInitNewPageRecord);
- put(DATA_PAGE_INSERT_RECORD, RecordUtils::buildDataPageInsertRecord);
- put(DATA_PAGE_INSERT_FRAGMENT_RECORD, RecordUtils::buildDataPageInsertFragmentRecord);
- put(DATA_PAGE_REMOVE_RECORD, RecordUtils::buildDataPageRemoveRecord);
- put(DATA_PAGE_SET_FREE_LIST_PAGE, RecordUtils::buildDataPageSetFreeListPageRecord);
- put(BTREE_META_PAGE_INIT_ROOT, RecordUtils::buildMetaPageInitRootRecord);
- put(BTREE_META_PAGE_ADD_ROOT, RecordUtils::buildMetaPageAddRootRecord);
- put(BTREE_META_PAGE_CUT_ROOT, RecordUtils::buildMetaPageCutRootRecord);
- put(BTREE_INIT_NEW_ROOT, RecordUtils::buildNewRootInitRecord);
- put(BTREE_PAGE_RECYCLE, RecordUtils::buildRecycleRecord);
- put(BTREE_PAGE_INSERT, RecordUtils::buildInsertRecord);
- put(BTREE_FIX_LEFTMOST_CHILD, RecordUtils::buildFixLeftmostChildRecord);
- put(BTREE_FIX_COUNT, RecordUtils::buildFixCountRecord);
- put(BTREE_PAGE_REPLACE, RecordUtils::buildReplaceRecord);
- put(BTREE_PAGE_REMOVE, RecordUtils::buildRemoveRecord);
- put(BTREE_PAGE_INNER_REPLACE, RecordUtils::buildBtreeInnerReplace);
- put(BTREE_FIX_REMOVE_ID, RecordUtils::buildFixRemoveId);
- put(BTREE_FORWARD_PAGE_SPLIT, RecordUtils::buildBtreeForwardPageSplit);
- put(BTREE_EXISTING_PAGE_SPLIT, RecordUtils::buildSplitExistingPageRecord);
- put(BTREE_PAGE_MERGE, RecordUtils::buildBtreeMergeRecord);
- put(PAGES_LIST_SET_NEXT, RecordUtils::buildPagesListSetNextRecord);
- put(PAGES_LIST_SET_PREVIOUS, RecordUtils::buildPagesListSetPreviousRecord);
- put(PAGES_LIST_INIT_NEW_PAGE, RecordUtils::buildPagesListInitNewPageRecord);
- put(PAGES_LIST_ADD_PAGE, RecordUtils::buildPagesListAddPageRecord);
- put(PAGES_LIST_REMOVE_PAGE, RecordUtils::buildPagesListRemovePageRecord);
- put(META_PAGE_INIT, RecordUtils::buildMetaPageInitRecord);
- put(INDEX_META_PAGE_DELTA_RECORD, RecordUtils::buildMetaPageIndexDeltaRecord);
- put(PARTITION_META_PAGE_UPDATE_COUNTERS, RecordUtils::buildMetaPageUpdatePartitionDataRecord);
- put(MEMORY_RECOVERY, RecordUtils::buildMemoryRecoveryRecord);
- put(TRACKING_PAGE_DELTA, RecordUtils::buildTrackingPageDeltaRecord);
- put(TRACKING_PAGE_REPAIR_DELTA, RecordUtils::buildTrackingPageRepairDeltaRecord);
- put(META_PAGE_UPDATE_LAST_SUCCESSFUL_SNAPSHOT_ID, RecordUtils::buildMetaPageUpdateLastSuccessfulSnapshotId);
- put(META_PAGE_UPDATE_LAST_SUCCESSFUL_FULL_SNAPSHOT_ID, RecordUtils::buildMetaPageUpdateLastSuccessfulFullSnapshotId);
- put(META_PAGE_UPDATE_NEXT_SNAPSHOT_ID, RecordUtils::buildMetaPageUpdateNextSnapshotId);
- put(META_PAGE_UPDATE_LAST_ALLOCATED_INDEX, RecordUtils::buildMetaPageUpdateLastAllocatedIndex);
- put(PART_META_UPDATE_STATE, RecordUtils::buildPartitionMetaStateRecord);
- put(PAGE_LIST_META_RESET_COUNT_RECORD, RecordUtils::buildPageListMetaResetCountRecord);
- put(SWITCH_SEGMENT_RECORD, RecordUtils::buildSwitchSegmentRecord);
- put(DATA_PAGE_UPDATE_RECORD, RecordUtils::buildDataPageUpdateRecord);
- put(BTREE_META_PAGE_INIT_ROOT2, RecordUtils::buildMetaPageInitRootInlineRecord);
- put(PARTITION_DESTROY, RecordUtils::buildPartitionDestroyRecord);
- put(SNAPSHOT, RecordUtils::buildSnapshotRecord);
- put(METASTORE_DATA_RECORD, RecordUtils::buildMetastoreDataRecord);
- put(EXCHANGE, RecordUtils::buildExchangeRecord);
- put(RESERVED, RecordUtils::buildReservedRecord);
- put(ROLLBACK_TX_RECORD, RecordUtils::buildRollbackRecord);
- put(PARTITION_META_PAGE_UPDATE_COUNTERS_V2, RecordUtils::buildMetaPageUpdatePartitionDataRecordV2);
- put(PARTITION_META_PAGE_DELTA_RECORD_V3, RecordUtils::buildMetaPageUpdatePartitionDataRecordV3);
- put(PARTITION_META_PAGE_DELTA_RECORD_V4, RecordUtils::buildMetaPageUpdatePartitionDataRecordV4);
- put(MASTER_KEY_CHANGE_RECORD, RecordUtils::buildMasterKeyChangeRecord);
- put(MASTER_KEY_CHANGE_RECORD_V2, RecordUtils::buildMasterKeyChangeRecordV2);
- put(REENCRYPTION_START_RECORD, RecordUtils::buildEncryptionStatusRecord);
- put(ROTATED_ID_PART_RECORD, RecordUtils::buildRotatedIdPartRecord);
- put(MVCC_DATA_PAGE_MARK_UPDATED_RECORD, RecordUtils::buildDataPageMvccMarkUpdatedRecord);
- put(MVCC_DATA_PAGE_TX_STATE_HINT_UPDATED_RECORD, RecordUtils::buildDataPageMvccUpdateTxStateHintRecord);
- put(MVCC_DATA_PAGE_NEW_TX_STATE_HINT_UPDATED_RECORD, RecordUtils::buildDataPageMvccUpdateNewTxStateHintRecord);
- put(ENCRYPTED_RECORD, RecordUtils::buildEncryptedRecord);
- put(ENCRYPTED_DATA_RECORD, RecordUtils::buildEncryptedDataRecord);
- put(ENCRYPTED_RECORD_V2, RecordUtils::buildEncryptedRecordV2);
- put(ENCRYPTED_DATA_RECORD_V2, RecordUtils::buildEncryptedDataRecordV2);
- put(ENCRYPTED_DATA_RECORD_V3, RecordUtils::buildEncryptedDataRecordV3);
- put(MVCC_DATA_RECORD, RecordUtils::buildMvccDataRecord);
- put(MVCC_TX_RECORD, RecordUtils::buildMvccTxRecord);
- put(CONSISTENT_CUT, RecordUtils::buildConsistentCutRecord);
- put(BTREE_META_PAGE_INIT_ROOT_V3, RecordUtils::buildBtreeMetaPageInitRootV3);
- put(OUT_OF_ORDER_UPDATE, RecordUtils::buildOutOfOrderRecord);
- put(INDEX_ROOT_PAGE_RENAME_RECORD, RecordUtils::buildIndexRenameRootPageRecord);
- put(PARTITION_CLEARING_START_RECORD, RecordUtils::buildPartitionClearingStartedRecord);
- }};
+ new EnumMap<>(WALRecord.RecordType.class);
+
+ static {
+ put(TX_RECORD, RecordUtils::buildTxRecord);
+ put(PAGE_RECORD, RecordUtils::buildPageSnapshot);
+ put(DATA_RECORD, RecordUtils::buildDataRecord);
+ put(DATA_RECORD_V2, RecordUtils::buildDataRecord);
+ put(CHECKPOINT_RECORD, RecordUtils::buildCheckpointRecord);
+ put(HEADER_RECORD, RecordUtils::buildHeaderRecord);
+ put(INIT_NEW_PAGE_RECORD, RecordUtils::buildInitNewPageRecord);
+ put(DATA_PAGE_INSERT_RECORD, RecordUtils::buildDataPageInsertRecord);
+ put(DATA_PAGE_INSERT_FRAGMENT_RECORD, RecordUtils::buildDataPageInsertFragmentRecord);
+ put(DATA_PAGE_REMOVE_RECORD, RecordUtils::buildDataPageRemoveRecord);
+ put(DATA_PAGE_SET_FREE_LIST_PAGE, RecordUtils::buildDataPageSetFreeListPageRecord);
+ put(BTREE_META_PAGE_INIT_ROOT, RecordUtils::buildMetaPageInitRootRecord);
+ put(BTREE_META_PAGE_ADD_ROOT, RecordUtils::buildMetaPageAddRootRecord);
+ put(BTREE_META_PAGE_CUT_ROOT, RecordUtils::buildMetaPageCutRootRecord);
+ put(BTREE_INIT_NEW_ROOT, RecordUtils::buildNewRootInitRecord);
+ put(BTREE_PAGE_RECYCLE, RecordUtils::buildRecycleRecord);
+ put(BTREE_PAGE_INSERT, RecordUtils::buildInsertRecord);
+ put(BTREE_FIX_LEFTMOST_CHILD, RecordUtils::buildFixLeftmostChildRecord);
+ put(BTREE_FIX_COUNT, RecordUtils::buildFixCountRecord);
+ put(BTREE_PAGE_REPLACE, RecordUtils::buildReplaceRecord);
+ put(BTREE_PAGE_REMOVE, RecordUtils::buildRemoveRecord);
+ put(BTREE_PAGE_INNER_REPLACE, RecordUtils::buildBtreeInnerReplace);
+ put(BTREE_FIX_REMOVE_ID, RecordUtils::buildFixRemoveId);
+ put(BTREE_FORWARD_PAGE_SPLIT, RecordUtils::buildBtreeForwardPageSplit);
+ put(BTREE_EXISTING_PAGE_SPLIT, RecordUtils::buildSplitExistingPageRecord);
+ put(BTREE_PAGE_MERGE, RecordUtils::buildBtreeMergeRecord);
+ put(PAGES_LIST_SET_NEXT, RecordUtils::buildPagesListSetNextRecord);
+ put(PAGES_LIST_SET_PREVIOUS, RecordUtils::buildPagesListSetPreviousRecord);
+ put(PAGES_LIST_INIT_NEW_PAGE, RecordUtils::buildPagesListInitNewPageRecord);
+ put(PAGES_LIST_ADD_PAGE, RecordUtils::buildPagesListAddPageRecord);
+ put(PAGES_LIST_REMOVE_PAGE, RecordUtils::buildPagesListRemovePageRecord);
+ put(META_PAGE_INIT, RecordUtils::buildMetaPageInitRecord);
+ put(INDEX_META_PAGE_DELTA_RECORD, RecordUtils::buildMetaPageIndexDeltaRecord);
+ put(PARTITION_META_PAGE_UPDATE_COUNTERS, RecordUtils::buildMetaPageUpdatePartitionDataRecord);
+ put(MEMORY_RECOVERY, RecordUtils::buildMemoryRecoveryRecord);
+ put(TRACKING_PAGE_DELTA, RecordUtils::buildTrackingPageDeltaRecord);
+ put(TRACKING_PAGE_REPAIR_DELTA, RecordUtils::buildTrackingPageRepairDeltaRecord);
+ put(META_PAGE_UPDATE_LAST_SUCCESSFUL_SNAPSHOT_ID, RecordUtils::buildMetaPageUpdateLastSuccessfulSnapshotId);
+ put(META_PAGE_UPDATE_LAST_SUCCESSFUL_FULL_SNAPSHOT_ID, RecordUtils::buildMetaPageUpdateLastSuccessfulFullSnapshotId);
+ put(META_PAGE_UPDATE_NEXT_SNAPSHOT_ID, RecordUtils::buildMetaPageUpdateNextSnapshotId);
+ put(META_PAGE_UPDATE_LAST_ALLOCATED_INDEX, RecordUtils::buildMetaPageUpdateLastAllocatedIndex);
+ put(PART_META_UPDATE_STATE, RecordUtils::buildPartitionMetaStateRecord);
+ put(PAGE_LIST_META_RESET_COUNT_RECORD, RecordUtils::buildPageListMetaResetCountRecord);
+ put(SWITCH_SEGMENT_RECORD, RecordUtils::buildSwitchSegmentRecord);
+ put(DATA_PAGE_UPDATE_RECORD, RecordUtils::buildDataPageUpdateRecord);
+ put(BTREE_META_PAGE_INIT_ROOT2, RecordUtils::buildMetaPageInitRootInlineRecord);
+ put(PARTITION_DESTROY, RecordUtils::buildPartitionDestroyRecord);
+ put(SNAPSHOT, RecordUtils::buildSnapshotRecord);
+ put(METASTORE_DATA_RECORD, RecordUtils::buildMetastoreDataRecord);
+ put(EXCHANGE, RecordUtils::buildExchangeRecord);
+ put(RESERVED, RecordUtils::buildReservedRecord);
+ put(ROLLBACK_TX_RECORD, RecordUtils::buildRollbackRecord);
+ put(PARTITION_META_PAGE_UPDATE_COUNTERS_V2, RecordUtils::buildMetaPageUpdatePartitionDataRecordV2);
+ put(PARTITION_META_PAGE_DELTA_RECORD_V3, RecordUtils::buildMetaPageUpdatePartitionDataRecordV3);
+ put(PARTITION_META_PAGE_DELTA_RECORD_V4, RecordUtils::buildMetaPageUpdatePartitionDataRecordV4);
+ put(MASTER_KEY_CHANGE_RECORD, RecordUtils::buildMasterKeyChangeRecord);
+ put(MASTER_KEY_CHANGE_RECORD_V2, RecordUtils::buildMasterKeyChangeRecordV2);
+ put(REENCRYPTION_START_RECORD, RecordUtils::buildEncryptionStatusRecord);
+ put(ROTATED_ID_PART_RECORD, RecordUtils::buildRotatedIdPartRecord);
+ put(MVCC_DATA_PAGE_MARK_UPDATED_RECORD, RecordUtils::buildDataPageMvccMarkUpdatedRecord);
+ put(MVCC_DATA_PAGE_TX_STATE_HINT_UPDATED_RECORD, RecordUtils::buildDataPageMvccUpdateTxStateHintRecord);
+ put(MVCC_DATA_PAGE_NEW_TX_STATE_HINT_UPDATED_RECORD, RecordUtils::buildDataPageMvccUpdateNewTxStateHintRecord);
+ put(ENCRYPTED_RECORD, RecordUtils::buildEncryptedRecord);
+ put(ENCRYPTED_DATA_RECORD, RecordUtils::buildEncryptedDataRecord);
+ put(ENCRYPTED_RECORD_V2, RecordUtils::buildEncryptedRecordV2);
+ put(ENCRYPTED_DATA_RECORD_V2, RecordUtils::buildEncryptedDataRecordV2);
+ put(ENCRYPTED_DATA_RECORD_V3, RecordUtils::buildEncryptedDataRecordV3);
+ put(MVCC_DATA_RECORD, RecordUtils::buildMvccDataRecord);
+ put(MVCC_TX_RECORD, RecordUtils::buildMvccTxRecord);
+ put(CONSISTENT_CUT, RecordUtils::buildConsistentCutRecord);
+ put(BTREE_META_PAGE_INIT_ROOT_V3, RecordUtils::buildBtreeMetaPageInitRootV3);
+ put(OUT_OF_ORDER_UPDATE, RecordUtils::buildOutOfOrderRecord);
+ put(INDEX_ROOT_PAGE_RENAME_RECORD, RecordUtils::buildIndexRenameRootPageRecord);
+ put(PARTITION_CLEARING_START_RECORD, RecordUtils::buildPartitionClearingStartedRecord);
+ }
+
+ /** */
+ private static void put(WALRecord.RecordType type, Supplier<WALRecord> supplier) {
+ TEST_WAL_RECORD_SUPPLIER.put(type, supplier);
+ }
/** **/
public static WALRecord buildWalRecord(WALRecord.RecordType recordType) {
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheIteratorsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheIteratorsSelfTestSuite.java
index 2f6833a..d10c7bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheIteratorsSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheIteratorsSelfTestSuite.java
@@ -41,5 +41,5 @@ public class IgniteCacheIteratorsSelfTestSuite {
GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedIteratorsSelfTest.class, ignoredTests);
return suite;
- }
+ }
}
diff --git a/modules/core/src/test/java/org/apache/ignite/thread/ThreadPoolMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/thread/ThreadPoolMetricsTest.java
index a0e6ea7..5bbf705 100644
--- a/modules/core/src/test/java/org/apache/ignite/thread/ThreadPoolMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/thread/ThreadPoolMetricsTest.java
@@ -74,28 +74,32 @@ public class ThreadPoolMetricsTest extends GridCommonAbstractTest {
);
/** Mapping of the metric group name to the thread pool instance. */
- private static final Map<String, Function<PoolProcessor, ExecutorService>> THREAD_POOL_METRICS =
- new HashMap<String, Function<PoolProcessor, ExecutorService>>() {{
- put(metricName(THREAD_POOLS, "GridUtilityCacheExecutor"), PoolProcessor::utilityCachePool);
- put(metricName(THREAD_POOLS, "GridExecutionExecutor"), PoolProcessor::getExecutorService);
- put(metricName(THREAD_POOLS, "GridServicesExecutor"), PoolProcessor::getServiceExecutorService);
- put(metricName(THREAD_POOLS, "GridSystemExecutor"), PoolProcessor::getSystemExecutorService);
- put(metricName(THREAD_POOLS, "GridClassLoadingExecutor"), PoolProcessor::getPeerClassLoadingExecutorService);
- put(metricName(THREAD_POOLS, "GridManagementExecutor"), PoolProcessor::getManagementExecutorService);
- put(metricName(THREAD_POOLS, "GridAffinityExecutor"), PoolProcessor::getAffinityExecutorService);
- put(metricName(THREAD_POOLS, "GridCallbackExecutor"), PoolProcessor::asyncCallbackPool);
- put(metricName(THREAD_POOLS, "GridQueryExecutor"), PoolProcessor::getQueryExecutorService);
- put(metricName(THREAD_POOLS, "GridSchemaExecutor"), PoolProcessor::getSchemaExecutorService);
- put(metricName(THREAD_POOLS, "GridRebalanceExecutor"), PoolProcessor::getRebalanceExecutorService);
- put(metricName(THREAD_POOLS, "GridRebalanceStripedExecutor"), PoolProcessor::getStripedRebalanceExecutorService);
- put(metricName(THREAD_POOLS, "GridThinClientExecutor"), PoolProcessor::getThinClientExecutorService);
- put(metricName(THREAD_POOLS, "GridDataStreamExecutor"), PoolProcessor::getDataStreamerExecutorService);
- put(metricName(THREAD_POOLS, "StripedExecutor"), PoolProcessor::getStripedExecutorService);
- put(metricName(THREAD_POOLS, "GridRestExecutor"), PoolProcessor::getRestExecutorService);
- put(metricName(THREAD_POOLS, "GridSnapshotExecutor"), PoolProcessor::getSnapshotExecutorService);
- put(metricName(THREAD_POOLS, "GridReencryptionExecutor"), PoolProcessor::getReencryptionExecutorService);
- put(metricName(THREAD_POOLS, CUSTOM_EXEC_NAME), proc -> (ExecutorService)proc.customExecutor(CUSTOM_EXEC_NAME));
- }};
+ private static final Map<String, Function<PoolProcessor, ExecutorService>> THREAD_POOL_METRICS = new HashMap<>();
+
+ static {
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridUtilityCacheExecutor"), PoolProcessor::utilityCachePool);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridExecutionExecutor"), PoolProcessor::getExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridServicesExecutor"), PoolProcessor::getServiceExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridSystemExecutor"), PoolProcessor::getSystemExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridClassLoadingExecutor"), PoolProcessor::getPeerClassLoadingExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridManagementExecutor"), PoolProcessor::getManagementExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridAffinityExecutor"), PoolProcessor::getAffinityExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridCallbackExecutor"), PoolProcessor::asyncCallbackPool);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridQueryExecutor"), PoolProcessor::getQueryExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridSchemaExecutor"), PoolProcessor::getSchemaExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridRebalanceExecutor"), PoolProcessor::getRebalanceExecutorService);
+ THREAD_POOL_METRICS.put(
+ metricName(THREAD_POOLS, "GridRebalanceStripedExecutor"),
+ PoolProcessor::getStripedRebalanceExecutorService
+ );
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridThinClientExecutor"), PoolProcessor::getThinClientExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridDataStreamExecutor"), PoolProcessor::getDataStreamerExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "StripedExecutor"), PoolProcessor::getStripedExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridRestExecutor"), PoolProcessor::getRestExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridSnapshotExecutor"), PoolProcessor::getSnapshotExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, "GridReencryptionExecutor"), PoolProcessor::getReencryptionExecutorService);
+ THREAD_POOL_METRICS.put(metricName(THREAD_POOLS, CUSTOM_EXEC_NAME), proc -> (ExecutorService)proc.customExecutor(CUSTOM_EXEC_NAME));
+ }
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java
index e2db550..5fb68c2 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java
@@ -145,8 +145,8 @@ public class AveragePersonSalaryCallable implements IgniteCallable<Double> {
private void addPersonWithAverageSalary(IgniteCache<Integer, Person> cache, double avgSalary) {
Map<Integer, Person> persons = IntStream.range(from, to).boxed().map(id -> createAveragePerson(avgSalary, to + id))
.collect(Collectors.toMap(Person::getId, Function.identity(), (u, v) -> {
- throw new IllegalStateException(String.format("Duplicate key %s", u));
- }, TreeMap::new));
+ throw new IllegalStateException(String.format("Duplicate key %s", u));
+ }, TreeMap::new));
cache.putAll(persons);
diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index eef441c..6cd6590 100644
--- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -1862,7 +1862,7 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
if (entity1) {
for (Map.Entry<Integer, String> e : idToName.entrySet())
assertEquals(e.getValue(), ((Entity)ses.load(Entity.class, e.getKey())).getName());
- }
+ }
else {
for (Map.Entry<Integer, String> e : idToName.entrySet())
assertEquals(e.getValue(), ((Entity2)ses.load(Entity2.class, e.getKey())).getName());
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2PooledConnection.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2PooledConnection.java
index e10b54b..0db01d7 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2PooledConnection.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2PooledConnection.java
@@ -119,7 +119,7 @@ public class H2PooledConnection implements AutoCloseable {
assert delegate != null;
if (closed.compareAndSet(false, true)) {
- H2Utils.resetSession(this);
+ H2Utils.resetSession(this);
connMgr.recycle(delegate);
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 53c103d..c89555f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1210,9 +1210,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
}
catch (Throwable th) {
- qrySpan.addTag(ERROR, th::getMessage).end();
+ qrySpan.addTag(ERROR, th::getMessage).end();
- throw th;
+ throw th;
}
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/SortedReducer.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/SortedReducer.java
index d1ec262..fc4044d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/SortedReducer.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/SortedReducer.java
@@ -433,7 +433,7 @@ public class SortedReducer extends AbstractReducer {
* @param last Upper bound.
* @param stream Stream of all the rows from remote nodes.
*/
- FetchingCursor(SearchRow first, SearchRow last, Iterator<Row> stream) {
+ FetchingCursor(SearchRow first, SearchRow last, Iterator<Row> stream) {
assert stream != null;
// Initially we will use all the fetched rows, after we will switch to the last block.
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/UnsortedReducer.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/UnsortedReducer.java
index 91f00b6..50db44e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/UnsortedReducer.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/UnsortedReducer.java
@@ -78,7 +78,7 @@ public class UnsortedReducer extends UnsortedBaseReducer {
/**
* @param stream Stream of all the rows from remote nodes.
*/
- FetchingCursor(Iterator<Row> stream) {
+ FetchingCursor(Iterator<Row> stream) {
assert stream != null;
// Initially we will use all the fetched rows, after we will switch to the last block.
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java
index cf80f0c..ffff131 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java
@@ -104,27 +104,27 @@ public class IgniteStatisticsConfigurationManager {
/** Change statistics configuration listener to update particular object statistics. */
private final DistributedMetastorageLifecycleListener distrMetaStoreLsnr =
new DistributedMetastorageLifecycleListener() {
- @Override public void onReadyForWrite(DistributedMetaStorage metastorage) {
- distrMetaStorage = metastorage;
-
- distrMetaStorage.listen(
- (metaKey) -> metaKey.startsWith(STAT_OBJ_PREFIX),
- (k, oldV, newV) -> {
- // Skip invoke on start node (see 'ReadableDistributedMetaStorage#listen' the second case)
- // The update statistics on start node is handled by 'scanAndCheckLocalStatistic' method
- // called on exchange done.
- if (topVer == null)
- return;
-
- mgmtBusyExecutor.execute(() -> {
- StatisticsObjectConfiguration newStatCfg = (StatisticsObjectConfiguration)newV;
-
- updateLocalStatistics(newStatCfg);
- });
- }
- );
- }
- };
+ @Override public void onReadyForWrite(DistributedMetaStorage metastorage) {
+ distrMetaStorage = metastorage;
+
+ distrMetaStorage.listen(
+ (metaKey) -> metaKey.startsWith(STAT_OBJ_PREFIX),
+ (k, oldV, newV) -> {
+ // Skip invoke on start node (see 'ReadableDistributedMetaStorage#listen' the second case)
+ // The update statistics on start node is handled by 'scanAndCheckLocalStatistic' method
+ // called on exchange done.
+ if (topVer == null)
+ return;
+
+ mgmtBusyExecutor.execute(() -> {
+ StatisticsObjectConfiguration newStatCfg = (StatisticsObjectConfiguration)newV;
+
+ updateLocalStatistics(newStatCfg);
+ });
+ }
+ );
+ }
+ };
/**
* Constructor.
@@ -207,7 +207,7 @@ public class IgniteStatisticsConfigurationManager {
*/
@Override public void accept(GridH2Table tbl, List<String> cols) {
assert !F.isEmpty(cols);
- dropStatistics(Collections.singletonList(
+ dropStatistics(Collections.singletonList(
new StatisticsTarget(
tbl.identifier().schema(),
tbl.getName(),
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsManagerImpl.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsManagerImpl.java
index 3678dd8..1ad78b7 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsManagerImpl.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsManagerImpl.java
@@ -443,7 +443,7 @@ public class IgniteStatisticsManagerImpl implements IgniteStatisticsManager {
for (StatisticsKey key : keys) {
StatisticsObjectConfiguration cfg = null;
try {
- cfg = statCfgMgr.config(key);
+ cfg = statCfgMgr.config(key);
}
catch (IgniteCheckedException e) {
// No-op/
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
index 6a2c535..fef1bda 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
@@ -633,9 +633,9 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
long current = 0;
long processedNumber = 0;
- while (it.hasNextX() && !validateCtx.isCancelled()) {
- if (enoughIssues)
- break;
+ while (it.hasNextX() && !validateCtx.isCancelled()) {
+ if (enoughIssues)
+ break;
CacheDataRow row = it.nextX();
@@ -703,24 +703,25 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
ArrayList<Index> indexes = gridH2Tbl.getIndexes();
- for (Index idx : indexes) {
- if (validateCtx.isCancelled())
- break;
+ for (Index idx : indexes) {
+ if (validateCtx.isCancelled())
+ break;
- if (!(idx instanceof H2TreeIndexBase))
- continue;
+ if (!(idx instanceof H2TreeIndexBase))
+ continue;
try {
Cursor cursor = idx.find(session, h2Row, h2Row);
if (cursor == null || !cursor.next())
throw new IgniteCheckedException("Key is present in CacheDataTree, but can't be found in SQL index.");
- } catch (Throwable t) {
+ }
+ catch (Throwable t) {
Object o = CacheObjectUtils.unwrapBinaryIfNeeded(
- grpCtx.cacheObjectContext(), row.key(), true, true);
+ grpCtx.cacheObjectContext(), row.key(), true, true);
IndexValidationIssue is = new IndexValidationIssue(
- o.toString(), cacheCtx.name(), idx.getName(), t);
+ o.toString(), cacheCtx.name(), idx.getName(), t);
log.error("Failed to lookup key: " + is.toString(), t);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java
index 04009e1..d973c39 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java
@@ -102,12 +102,11 @@ public class IndexQueryFailoverTest extends GridCommonAbstractTest {
@Test
public void testQueryWithWrongCriteria() {
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qryNullCriteria = new IndexQuery<Long, Person>(Person.class, qryIdx)
- .setCriteria(lt(null, 12));
+ IndexQuery<Long, Person> qryNullCriteria = new IndexQuery<Long, Person>(Person.class, qryIdx)
+ .setCriteria(lt(null, 12));
- return cache.query(qryNullCriteria);
- },
- NullPointerException.class, "Ouch! Argument cannot be null: field");
+ return cache.query(qryNullCriteria);
+ }, NullPointerException.class, "Ouch! Argument cannot be null: field");
}
/** */
@@ -120,32 +119,29 @@ public class IndexQueryFailoverTest extends GridCommonAbstractTest {
IllegalArgumentException.class, "Ouch! Argument is invalid: valType must not be empty");
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Integer> qry = new IndexQuery<Long, Integer>(Integer.class, qryIdx)
- .setCriteria(lt("id", Integer.MAX_VALUE));
+ IndexQuery<Long, Integer> qry = new IndexQuery<Long, Integer>(Integer.class, qryIdx)
+ .setCriteria(lt("id", Integer.MAX_VALUE));
- return cache.query(qry).getAll();
- },
- IgniteCheckedException.class, "No table found for type: " + Integer.class.getName());
+ return cache.query(qry).getAll();
+ }, IgniteCheckedException.class, "No table found for type: " + Integer.class.getName());
}
/** */
@Test
public void testQueryWrongIndexName() {
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, "")
- .setCriteria(lt("id", Integer.MAX_VALUE));
+ IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, "")
+ .setCriteria(lt("id", Integer.MAX_VALUE));
- return cache.query(qry).getAll();
- },
- IllegalArgumentException.class, "Ouch! Argument is invalid: idxName must not be empty.");
+ return cache.query(qry).getAll();
+ }, IllegalArgumentException.class, "Ouch! Argument is invalid: idxName must not be empty.");
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, "DUMMY")
- .setCriteria(lt("id", Integer.MAX_VALUE));
+ IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, "DUMMY")
+ .setCriteria(lt("id", Integer.MAX_VALUE));
- return cache.query(qry).getAll();
- },
- IgniteCheckedException.class, "No index found for name: DUMMY");
+ return cache.query(qry).getAll();
+ }, IgniteCheckedException.class, "No index found for name: DUMMY");
}
/** */
@@ -154,31 +150,27 @@ public class IndexQueryFailoverTest extends GridCommonAbstractTest {
String errMsg = qryIdx != null ? "Index doesn't match criteria." : "No index found for criteria.";
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
- .setCriteria(lt("dummy", Integer.MAX_VALUE));
+ IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
+ .setCriteria(lt("dummy", Integer.MAX_VALUE));
- return cache.query(qry).getAll();
- },
- IgniteCheckedException.class, errMsg);
+ return cache.query(qry).getAll();
+ }, IgniteCheckedException.class, errMsg);
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
- .setCriteria(
- lt("id", Integer.MAX_VALUE),
- lt("nonExistedField", Integer.MAX_VALUE));
+ IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
+ .setCriteria(
+ lt("id", Integer.MAX_VALUE),
+ lt("nonExistedField", Integer.MAX_VALUE));
- return cache.query(qry).getAll();
- },
- IgniteCheckedException.class, errMsg);
+ return cache.query(qry).getAll();
+ }, IgniteCheckedException.class, errMsg);
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
- .setCriteria(between("id", 432, 40));
+ IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
+ .setCriteria(between("id", 432, 40));
- return cache.query(qry).getAll();
- },
- IgniteCheckedException.class, "Illegal criterion: lower boundary is greater than the upper boundary: " +
- "ID[432; 40]");
+ return cache.query(qry).getAll();
+ }, IgniteCheckedException.class, "Illegal criterion: lower boundary is greater than the upper boundary: ID[432; 40]");
Stream.of(
Arrays.asList(lt("id", 100), gt("id", 101)),
@@ -190,12 +182,11 @@ public class IndexQueryFailoverTest extends GridCommonAbstractTest {
+ " with previous criteria range " + crit.get(0).toString().replace("id", "ID");
GridTestUtils.assertThrowsAnyCause(null, () -> {
- IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
- .setCriteria(crit);
+ IndexQuery<Long, Person> qry = new IndexQuery<Long, Person>(Person.class, qryIdx)
+ .setCriteria(crit);
- return cache.query(qry).getAll();
- },
- IgniteCheckedException.class, msg);
+ return cache.query(qry).getAll();
+ }, IgniteCheckedException.class, msg);
});
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java
index 61d3bd5..a8d65d6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java
@@ -62,9 +62,9 @@ public class IndexQueryWrongIndexTest extends GridCommonAbstractTest {
IndexQuery<Integer, Person> wrongQry = new IndexQuery<Integer, Person>(Person.class, DESC_ID_IDX)
.setCriteria(lt("id", Integer.MAX_VALUE));
- cache.query(wrongQry).getAll();
+ cache.query(wrongQry).getAll();
- return null;
+ return null;
}, CacheException.class, null);
// Wrong fields in query.
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java
index 4f0c6ea..f14b2e2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java
@@ -329,9 +329,10 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest {
IgniteCache<Integer, Payload> binary = ignite.createCache(new CacheConfiguration<Integer, Payload>()
.setName("binary").setQueryEntities(Arrays.asList(
- new QueryEntity().setKeyType("Foo").setKeyFieldName("id")
- .setValueType("Bar").setFields(fields).setTableName("regular"),
- new QueryEntity().setKeyFieldName("id").setValueType("Payload").setFields(fields).setTableName("binary"))));
+ new QueryEntity().setKeyType("Foo").setKeyFieldName("id")
+ .setValueType("Bar").setFields(fields).setTableName("regular"),
+ new QueryEntity().setKeyFieldName("id").setValueType("Payload").setFields(fields).setTableName("binary")
+ )));
binary.put(1, new Payload("foo"));
binary.put(2, new Payload("bar"));
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
index 95711b8..fea49d0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
@@ -119,7 +119,7 @@ public class CacheIteratorScanQueryTest extends GridCommonAbstractTest {
assertEquals(100_000, res.size());
Collections.sort(res, (e1, e2) -> {
- return e1.getKey().compareTo(e2.getKey());
+ return e1.getKey().compareTo(e2.getKey());
});
int exp = 0;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index efd83e7..25ce563 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -377,7 +377,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
TestKey testKey = (TestKey)o;
return key == testKey.key;
- }
+ }
/** {@inheritDoc} */
@Override public int hashCode() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
index 742c21f..d118ac1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
@@ -204,7 +204,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest
*/
@Test
public void testEnumObjectArgument() throws Exception {
- testKeyValQuery(ENUM_CACHE, EnumKey.KEY1, EnumKey.KEY2);
+ testKeyValQuery(ENUM_CACHE, EnumKey.KEY1, EnumKey.KEY2);
}
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
index 8313e74..6e3a8a3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
@@ -20,8 +20,7 @@ package org.apache.ignite.internal.processors.cache;
* Tests that server nodes do not need class definitions to execute queries.
* Used internal class.
*/
-public class
-IgniteBinaryWrappedObjectFieldsQuerySelfTest extends IgniteBinaryObjectFieldsQuerySelfTest {
+public class IgniteBinaryWrappedObjectFieldsQuerySelfTest extends IgniteBinaryObjectFieldsQuerySelfTest {
/** {@inheritDoc} */
@Override protected String getPersonClassName() {
return "org.apache.ignite.tests.p2p.cache.PersonWrapper$Person";
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
index 1f25f23..6237b89 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
@@ -77,14 +77,13 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
BinaryConfiguration binCfg = new BinaryConfiguration();
- binCfg.setTypeConfigurations(Arrays.asList(
- new BinaryTypeConfiguration() {{
- setTypeName(Key.class.getName());
- }},
- new BinaryTypeConfiguration() {{
- setTypeName(Key2.class.getName());
- }}
- ));
+ BinaryTypeConfiguration keyType = new BinaryTypeConfiguration();
+ BinaryTypeConfiguration keyType2 = new BinaryTypeConfiguration();
+
+ keyType.setTypeName(Key.class.getName());
+ keyType2.setTypeName(Key2.class.getName());
+
+ binCfg.setTypeConfigurations(Arrays.asList(keyType, keyType2));
cfg.setBinaryConfiguration(binCfg);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 0b9f842..a3b81a7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -1101,10 +1101,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
public void testScanQuery() throws Exception {
IgniteCache<Integer, String> c1 = jcache(Integer.class, String.class);
- Map<Integer, String> map = new HashMap<Integer, String>() {{
- for (int i = 0; i < 5000; i++)
- put(i, "str" + i);
- }};
+ Map<Integer, String> map = new HashMap<>();
+
+ for (int i = 0; i < 5000; i++)
+ map.put(i, "str" + i);
for (Map.Entry<Integer, String> e : map.entrySet())
c1.put(e.getKey(), e.getValue());
@@ -1184,8 +1184,8 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheConfiguration<Object, Object> conf = new CacheConfiguration<>(cacheConfiguration());
conf.setQueryEntities(Arrays.asList(
- new QueryEntity(Integer.class, ObjectValue.class),
- new QueryEntity(String.class, ObjectValueOther.class)
+ new QueryEntity(Integer.class, ObjectValue.class),
+ new QueryEntity(String.class, ObjectValueOther.class)
));
IgniteCache<Object, Object> c = jcache(ignite(), conf, Object.class, Object.class);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
index 81d58e9..cb7f666 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
@@ -91,10 +91,10 @@ public class IgniteCacheConfigVariationsQueryTest extends IgniteCacheConfigVaria
try {
IgniteCache<Object, Object> cache = jcache();
- Map<Object, Object> map = new HashMap<Object, Object>() {{
- for (int i = 0; i < CNT; i++)
- put(key(i), value(i));
- }};
+ Map<Object, Object> map = new HashMap<>();
+
+ for (int i = 0; i < CNT; i++)
+ map.put(key(i), value(i));
registerEventListeners(map);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryErrorSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryErrorSelfTest.java
index 5ff7321..932fa42 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryErrorSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryErrorSelfTest.java
@@ -227,7 +227,7 @@ public class IgniteCacheSqlQueryErrorSelfTest extends GridCacheAbstractSelfTest
* @param sql SQL command.
*/
private void execute(String sql) {
- jcache().query(new SqlFieldsQuery(sql).setSchema("PUBLIC")).getAll();
+ jcache().query(new SqlFieldsQuery(sql).setSchema("PUBLIC")).getAll();
}
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/QueryJoinWithDifferentNodeFiltersTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/QueryJoinWithDifferentNodeFiltersTest.java
index 5233785..64a7fab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/QueryJoinWithDifferentNodeFiltersTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/QueryJoinWithDifferentNodeFiltersTest.java
@@ -64,7 +64,7 @@ public class QueryJoinWithDifferentNodeFiltersTest extends AbstractIndexingCommo
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)
.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Integer.class, Person.class)
- );
+ );
if (getTestIgniteInstanceName(0).equals(igniteInstanceName) || getTestIgniteInstanceName(1).equals(igniteInstanceName))
cfg.setUserAttributes(F.asMap("DATA", "true"));
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
index 4e2d51a..523488c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
@@ -1078,7 +1078,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest {
return null;
}
}, IgniteSQLException.class,
- "Only cache created with CREATE TABLE may be removed with DROP TABLE [cacheName=cache_idx_2]");
+ "Only cache created with CREATE TABLE may be removed with DROP TABLE [cacheName=cache_idx_2]");
}
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
index 50103a8..171a641 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
@@ -262,11 +262,11 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche
/** */
private static final EntryProcessor<Integer, Integer, Object> ENTRY_PROC =
new EntryProcessor<Integer, Integer, Object>() {
- @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments)
- throws EntryProcessorException {
- return null;
- }
- };
+ @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments)
+ throws EntryProcessorException {
+ return null;
+ }
+ };
/** */
private static final CacheEntryProcessor<Integer, Integer, Object> CACHE_ENTRY_PROC =
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
index 9015d3e..058c17d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
@@ -364,11 +364,11 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest {
/** */
private static final EntryProcessor<Integer, Integer, Object> ENTRY_PROC =
new EntryProcessor<Integer, Integer, Object>() {
- @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments)
- throws EntryProcessorException {
- return null;
- }
- };
+ @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments)
+ throws EntryProcessorException {
+ return null;
+ }
+ };
/** */
private static final CacheEntryProcessor<Integer, Integer, Object> CACHE_ENTRY_PROC =
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesWithReducerAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesWithReducerAbstractTest.java
index dc0f24e..8174eb3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesWithReducerAbstractTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesWithReducerAbstractTest.java
@@ -808,7 +808,7 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
SqlFieldsQuery qry = new SqlFieldsQuery("UPDATE Integer SET _val = 8 WHERE _key = ?").setArgs(1);
try (FieldsQueryCursor<List<?>> cur = cache0.query(qry)) {
- assertEquals(1L, cur.iterator().next().get(0));
+ assertEquals(1L, cur.iterator().next().get(0));
}
qry = new SqlFieldsQuery("UPDATE Integer SET _val = 9 WHERE _key = 2");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccRepeatableReadBulkOpsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccRepeatableReadBulkOpsTest.java
index ed87d68..8b97df1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccRepeatableReadBulkOpsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccRepeatableReadBulkOpsTest.java
@@ -531,11 +531,11 @@ public class MvccRepeatableReadBulkOpsTest extends CacheMvccAbstractTest {
case INVOKE: {
CacheEntryProcessor<Integer, MvccTestAccount, MvccTestAccount> ep =
new GetAndPutEntryProcessor<Integer, MvccTestAccount>() {
- /** {@inheritDoc} */
- @Override MvccTestAccount newValForKey(Integer key) {
- return entries.get(key);
- }
- };
+ /** {@inheritDoc} */
+ @Override MvccTestAccount newValForKey(Integer key) {
+ return entries.get(key);
+ }
+ };
cache.cache.invokeAll(entries.keySet(), ep);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
index 8d5ab4b..4f8827c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
@@ -359,10 +359,10 @@ public class LongDestroyDurableBackgroundTaskTest extends GridCommonAbstractTest
* @param ignite Ignite instance.
*/
private void validateIndexes(Ignite ignite) {
- Set<UUID> nodeIds = new HashSet<UUID>() {{
- add(grid(RESTARTED_NODE_NUM).cluster().localNode().id());
- add(grid(ALWAYS_ALIVE_NODE_NUM).cluster().localNode().id());
- }};
+ Set<UUID> nodeIds = new HashSet<>();
+
+ nodeIds.add(grid(RESTARTED_NODE_NUM).cluster().localNode().id());
+ nodeIds.add(grid(ALWAYS_ALIVE_NODE_NUM).cluster().localNode().id());
log.info("Doing indexes validation.");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index f85949a..dc397e6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -115,6 +115,7 @@ import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.lifecycle.LifecycleBean;
import org.apache.ignite.lifecycle.LifecycleEventType;
import org.apache.ignite.loadtests.colocation.GridTestLifecycleBean;
import org.apache.ignite.plugin.extensions.communication.Message;
@@ -1506,9 +1507,9 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
ignite0.context().cache().context().database().checkpointReadLock();
- try {
- long page = pageMem.acquirePage(
- fullId.groupId(), fullId.pageId(), IoStatisticsHolderNoOp.INSTANCE, true);
+ try {
+ long page = pageMem.acquirePage(
+ fullId.groupId(), fullId.pageId(), IoStatisticsHolderNoOp.INSTANCE, true);
try {
long bufPtr = pageMem.writeLock(fullId.groupId(), fullId.pageId(), page, true);
@@ -1887,29 +1888,31 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
CountDownLatch l1,
CountDownLatch l2
) throws Exception {
- return getConfiguration(getTestIgniteInstanceName(idx)).setLifecycleBeans(new GridTestLifecycleBean() {
+ LifecycleBean bean = new GridTestLifecycleBean() {
@Override public void onLifecycleEvent(LifecycleEventType type) {
if (type == LifecycleEventType.BEFORE_NODE_START) {
g.context().internalSubscriptionProcessor().registerDistributedMetastorageListener(
new DistributedMetastorageLifecycleListener() {
- @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) {
- g.context().cache().context().exchange().registerExchangeAwareComponent(
- new PartitionsExchangeAware() {
- @Override public void onInitBeforeTopologyLock(GridDhtPartitionsExchangeFuture fut) {
- l1.countDown();
-
- try {
- assertTrue(U.await(l2, 10, TimeUnit.SECONDS));
- } catch (IgniteInterruptedCheckedException e) {
- fail(X.getFullStackTrace(e));
- }
- }
- });
- }
- });
+ @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) {
+ g.context().cache().context().exchange().registerExchangeAwareComponent(
+ new PartitionsExchangeAware() {
+ @Override public void onInitBeforeTopologyLock(GridDhtPartitionsExchangeFuture fut) {
+ l1.countDown();
+
+ try {
+ assertTrue(U.await(l2, 10, TimeUnit.SECONDS));
+ } catch (IgniteInterruptedCheckedException e) {
+ fail(X.getFullStackTrace(e));
+ }
+ }
+ });
+ }
+ });
}
}
- });
+ };
+
+ return getConfiguration(getTestIgniteInstanceName(idx)).setLifecycleBeans(bean);
}
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/CreateIndexOnInvalidDataTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/CreateIndexOnInvalidDataTypeTest.java
index 269693e..da1935f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/CreateIndexOnInvalidDataTypeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/CreateIndexOnInvalidDataTypeTest.java
@@ -111,11 +111,10 @@ public class CreateIndexOnInvalidDataTypeTest extends AbstractIndexingCommonTest
sql("CREATE INDEX TEST_VAL_INT_IDX ON TEST(VAL_INT)");
GridTestUtils.assertThrowsAnyCause(log, () -> {
- sql("CREATE INDEX TEST_VAL_DATE_IDX ON TEST(VAL_DATE)");
+ sql("CREATE INDEX TEST_VAL_DATE_IDX ON TEST(VAL_DATE)");
- return null;
- },
- IgniteSQLException.class, "java.util.Date cannot be cast to java.sql.Date");
+ return null;
+ }, IgniteSQLException.class, "java.util.Date cannot be cast to java.sql.Date");
// Wait for node stop if it is initiated by FailureHandler
U.sleep(1000);
@@ -125,11 +124,10 @@ public class CreateIndexOnInvalidDataTypeTest extends AbstractIndexingCommonTest
assertEquals(KEY_CNT, res.size());
GridTestUtils.assertThrowsAnyCause(log, () -> {
- sql("DROP INDEX TEST_VAL_DATE_IDX");
+ sql("DROP INDEX TEST_VAL_DATE_IDX");
- return null;
- },
- IgniteSQLException.class, "Index doesn't exist: TEST_VAL_DATE_IDX");
+ return null;
+ }, IgniteSQLException.class, "Index doesn't exist: TEST_VAL_DATE_IDX");
}
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
index 3a51665..5877650 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteQueryDedicatedPoolTest.java
@@ -251,11 +251,10 @@ public class IgniteQueryDedicatedPoolTest extends GridCommonAbstractTest {
barrier.await();
cache.query(new ScanQuery<>((o, o2) -> {
- doSleep(500);
+ doSleep(500);
- return true;
- })
- ).getAll();
+ return true;
+ })).getAll();
return null;
});
@@ -274,7 +273,7 @@ public class IgniteQueryDedicatedPoolTest extends GridCommonAbstractTest {
@SuppressWarnings("unused")
@QuerySqlFunction(alias = "currentPolicy")
public static Byte currentPolicy() {
- return GridIoManager.currentPolicy();
+ return GridIoManager.currentPolicy();
}
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LazyOnDmlTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LazyOnDmlTest.java
index bed2178..023ae6d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LazyOnDmlTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LazyOnDmlTest.java
@@ -99,7 +99,7 @@ public class LazyOnDmlTest extends AbstractIndexingCommonTest {
GridQueryProcessor.idxCls = CheckLazyIndexing.class;
startGrids(3);
- }
+ }
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/MemLeakOnSqlWithClientReconnectTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/MemLeakOnSqlWithClientReconnectTest.java
index a31bead..a6c4885 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/MemLeakOnSqlWithClientReconnectTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/MemLeakOnSqlWithClientReconnectTest.java
@@ -138,22 +138,21 @@ public class MemLeakOnSqlWithClientReconnectTest extends AbstractIndexingCommonT
final AtomicBoolean end = new AtomicBoolean();
IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(() -> {
- String name = "cli_" + cliNum.getAndIncrement();
+ String name = "cli_" + cliNum.getAndIncrement();
- while (!end.get()) {
- try {
- startGrid(name);
+ while (!end.get()) {
+ try {
+ startGrid(name);
- U.sleep(10);
+ U.sleep(10);
- stopGrid(name);
- }
- catch (Exception e) {
- fail("Unexpected exception on start test client node");
- }
+ stopGrid(name);
}
- },
- 10, "cli-restart");
+ catch (Exception e) {
+ fail("Unexpected exception on start test client node");
+ }
+ }
+ }, 10, "cli-restart");
try {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationOnKeyValueInsertTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationOnKeyValueInsertTest.java
index 7d4503d..619b1f1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationOnKeyValueInsertTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationOnKeyValueInsertTest.java
@@ -164,9 +164,8 @@ public class SqlFieldTypeValidationOnKeyValueInsertTest extends AbstractIndexing
assertEquals(obj, cache.withKeepBinary().get(1));
grid(0).context().query()
- .querySqlFields(
- new SqlFieldsQuery(SQL_TEXT).setSchema(DEFAULT_CACHE_NAME), true)
- .getAll();
+ .querySqlFields(new SqlFieldsQuery(SQL_TEXT).setSchema(DEFAULT_CACHE_NAME), true)
+ .getAll();
}
/** */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridSubqueryJoinOptimizerSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridSubqueryJoinOptimizerSelfTest.java
index e137cac..197d877 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridSubqueryJoinOptimizerSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridSubqueryJoinOptimizerSelfTest.java
@@ -936,7 +936,7 @@ public class GridSubqueryJoinOptimizerSelfTest extends GridCommonAbstractTest {
for (String subSelect : subSelects) {
String formattedSubSelect = String.format(subSelect, "id");
- check(String.format(outerSqlTemplate, formattedSubSelect), 1);
+ check(String.format(outerSqlTemplate, formattedSubSelect), 1);
}
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java
index 2cbe187..4a1a857 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java
@@ -92,20 +92,20 @@ public class ComputeInlineSizeTest extends AbstractIndexingCommonTest {
private void checkIdxsInlineSizes() {
Collection<Index> idx = ignite.context().indexProcessor().indexes(context());
- Map<String, Integer> expInlineSize = new HashMap<String, Integer>() {{
- // 9 is inline for _KEY (LongIndexKeyType).
- put("PERSON_STR_IDX",
- 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE);
- put("PERSON_STRPRECBIG_IDX",
- InlineIndexTree.IGNITE_MAX_INDEX_PAYLOAD_SIZE_DEFAULT);
- // 3 is for storing info (type, length) of inlined key.
- put("PERSON_STRPREC_IDX",
- 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE + 10 + 3);
- put("PERSON_BYTES_IDX",
- 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE);
- put("PERSON_BYTESPREC_IDX",
- 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE + 20 + 3);
- }};
+ Map<String, Integer> expInlineSize = new HashMap<>();
+
+ // 9 is inline for _KEY (LongIndexKeyType).
+ expInlineSize.put("PERSON_STR_IDX",
+ 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE);
+ expInlineSize.put("PERSON_STRPRECBIG_IDX",
+ InlineIndexTree.IGNITE_MAX_INDEX_PAYLOAD_SIZE_DEFAULT);
+ // 3 is for storing info (type, length) of inlined key.
+ expInlineSize.put("PERSON_STRPREC_IDX",
+ 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE + 10 + 3);
+ expInlineSize.put("PERSON_BYTES_IDX",
+ 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE);
+ expInlineSize.put("PERSON_BYTESPREC_IDX",
+ 9 + InlineIndexTree.IGNITE_VARIABLE_TYPE_DEFAULT_INLINE_SIZE + 20 + 3);
for (Index i: idx) {
InlineIndexImpl impl = (InlineIndexImpl)i;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
index bc688cb..db63365 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -184,95 +184,95 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
@Override protected void initCacheAndDbData() throws SQLException {
final AtomicInteger idGen = new AtomicInteger();
- final Iterable<Integer> rootOrderIds = new ArrayList<Integer>() {{
- for (int i = 0; i < ROOT_ORDER_CNT; i++)
- add(idGen.incrementAndGet());
- }};
+ final List<Integer> rootOrderIds = new ArrayList<>();
+
+ for (int i = 0; i < ROOT_ORDER_CNT; i++)
+ rootOrderIds.add(idGen.incrementAndGet());
final Date curDate = new Date(new java.util.Date().getTime());
- final List<Date> dates = new ArrayList<Date>() {{
- for (int i = 0; i < DATES_CNT; i++)
- add(new Date(curDate.getTime() - i * 24 * 60 * 60 * 1000)); // Minus i days.
- }};
+ final List<Date> dates = new ArrayList<>();
+
+ for (int i = 0; i < DATES_CNT; i++)
+ dates.add(new Date(curDate.getTime() - i * 24 * 60 * 60 * 1000)); // Minus i days.
- final Iterable<CustOrder> orders = new ArrayList<CustOrder>() {{
- for (int rootOrderId : rootOrderIds) {
- // Generate 1 - 5 orders for 1 root order.
- for (int i = 0; i < rootOrderId % 5; i++) {
- int orderId = idGen.incrementAndGet();
+ final List<CustOrder> orders = new ArrayList<>();
- CustOrder order = new CustOrder(orderId, rootOrderId, dates.get(orderId % dates.size()),
- orderId % 2 == 0 ? "CUSTOM" : "OTHER", orderId);
+ for (int rootOrderId : rootOrderIds) {
+ // Generate 1 - 5 orders for 1 root order.
+ for (int i = 0; i < rootOrderId % 5; i++) {
+ int orderId = idGen.incrementAndGet();
- add(order);
+ CustOrder order = new CustOrder(orderId, rootOrderId, dates.get(orderId % dates.size()),
+ orderId % 2 == 0 ? "CUSTOM" : "OTHER", orderId);
- cacheCustOrd.put(order.orderId, order);
+ orders.add(order);
- insertInDb(order);
- }
+ cacheCustOrd.put(order.orderId, order);
+
+ insertInDb(order);
}
- }};
+ }
- final Collection<OrderParams> params = new ArrayList<OrderParams>() {{
- for (CustOrder o : orders) {
- OrderParams op = new OrderParams(idGen.incrementAndGet(), o.orderId, o.date,
- o.orderId % 2 == 0 ? "Algo 1" : "Algo 2");
+ final Collection<OrderParams> params = new ArrayList<>();
- add(op);
+ for (CustOrder o : orders) {
+ OrderParams op = new OrderParams(idGen.incrementAndGet(), o.orderId, o.date,
+ o.orderId % 2 == 0 ? "Algo 1" : "Algo 2");
- cacheOrdParam.put(op.key(useColocatedData()), op);
+ params.add(op);
- insertInDb(op);
- }
- }};
+ cacheOrdParam.put(op.key(useColocatedData()), op);
+
+ insertInDb(op);
+ }
- final Collection<ReplaceOrder> replaces = new ArrayList<ReplaceOrder>() {{
- for (CustOrder o : orders) {
- if (o.orderId % 7 == 0) {
- ReplaceOrder replace = new ReplaceOrder(idGen.incrementAndGet(), o.orderId, o.rootOrderId, o.alias,
- new Date(o.date.getTime() + 12 * 60 * 60 * 1000), o.orderId); // Plus a half of day.
+ final Collection<ReplaceOrder> replaces = new ArrayList<>();
- add(replace);
+ for (CustOrder o : orders) {
+ if (o.orderId % 7 == 0) {
+ ReplaceOrder replace = new ReplaceOrder(idGen.incrementAndGet(), o.orderId, o.rootOrderId, o.alias,
+ new Date(o.date.getTime() + 12 * 60 * 60 * 1000), o.orderId); // Plus a half of day.
- cacheReplOrd.put(replace.key(useColocatedData()), replace);
+ replaces.add(replace);
- insertInDb(replace);
- }
+ cacheReplOrd.put(replace.key(useColocatedData()), replace);
+
+ insertInDb(replace);
}
- }};
+ }
- final Collection<Cancel> cancels = new ArrayList<Cancel>() {{
- for (CustOrder o : orders) {
- if (o.orderId % 9 == 0) {
- Cancel c = new Cancel(idGen.incrementAndGet(), o.orderId,
- new Date(o.date.getTime() + 12 * 60 * 60 * 1000)); // Plus a half of day.
+ final Collection<Cancel> cancels = new ArrayList<>();
- add(c);
+ for (CustOrder o : orders) {
+ if (o.orderId % 9 == 0) {
+ Cancel c = new Cancel(idGen.incrementAndGet(), o.orderId,
+ new Date(o.date.getTime() + 12 * 60 * 60 * 1000)); // Plus a half of day.
- cacheCancel.put(c.key(useColocatedData()), c);
+ cancels.add(c);
- insertInDb(c);
- }
+ cacheCancel.put(c.key(useColocatedData()), c);
+
+ insertInDb(c);
}
- }};
+ }
- final Collection<Exec> execs = new ArrayList<Exec>() {{
- for (int rootOrderId : rootOrderIds) {
- int execShares = 10000 + rootOrderId;
- int price = 1000 + rootOrderId;
- int latsMkt = 3000 + rootOrderId;
+ final Collection<Exec> execs = new ArrayList<>();
- Exec exec = new Exec(idGen.incrementAndGet(), rootOrderId,
- dates.get(rootOrderId % dates.size()), execShares, price, latsMkt);
+ for (int rootOrderId : rootOrderIds) {
+ int execShares = 10000 + rootOrderId;
+ int price = 1000 + rootOrderId;
+ int latsMkt = 3000 + rootOrderId;
- add(exec);
+ Exec exec = new Exec(idGen.incrementAndGet(), rootOrderId,
+ dates.get(rootOrderId % dates.size()), execShares, price, latsMkt);
- cacheExec.put(exec.key(useColocatedData()), exec);
+ execs.add(exec);
- insertInDb(exec);
- }
- }};
+ cacheExec.put(exec.key(useColocatedData()), exec);
+
+ insertInDb(exec);
+ }
}
/**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/BusyExecutorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/BusyExecutorTest.java
index 395b0ba..dc5e3e3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/BusyExecutorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/BusyExecutorTest.java
@@ -49,7 +49,7 @@ public class BusyExecutorTest extends GridCommonAbstractTest {
*/
@Before
public void createPool() {
- pool = new IgniteThreadPoolExecutor("BusyExecutorPrefix",
+ pool = new IgniteThreadPoolExecutor("BusyExecutorPrefix",
"BusyExecutorTest",
0,
2,
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/SqlStatisticsCommandTests.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/SqlStatisticsCommandTests.java
index 9e79e9c..5c681b8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/SqlStatisticsCommandTests.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/SqlStatisticsCommandTests.java
@@ -32,6 +32,8 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Test;
+import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
+
/**
* Integration tests for statistics collection.
*/
@@ -260,8 +262,7 @@ public class SqlStatisticsCommandTests extends StatisticsAbstractTest {
* @param isNull If {@code true} - test that statistics is null, if {@code false} - test that they are not null.
*/
private void testStatistics(String schema, String obj, boolean isNull) throws IgniteInterruptedCheckedException {
- assertTrue("Unable to wait statistics by " + schema + "." + obj + " if null=" + isNull,
- GridTestUtils.waitForCondition(() -> {
+ assertTrue("Unable to wait statistics by " + schema + "." + obj + " if null=" + isNull, waitForCondition(() -> {
for (Ignite node : G.allGrids()) {
IgniteH2Indexing indexing = (IgniteH2Indexing)((IgniteEx)node).context().query().getIndexing();
@@ -281,7 +282,7 @@ public class SqlStatisticsCommandTests extends StatisticsAbstractTest {
* @param obj Object name.
*/
private void testStatisticsVersion(String schema, String obj, Predicate<Long> verChecker) throws IgniteInterruptedCheckedException {
- assertTrue(GridTestUtils.waitForCondition(() -> {
+ assertTrue(waitForCondition(() -> {
for (Ignite node : G.allGrids()) {
IgniteH2Indexing indexing = (IgniteH2Indexing)((IgniteEx)node).context().query().getIndexing();
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
index 8d0b6fc..137cb98 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
@@ -201,9 +201,8 @@ public class Log4j2LoggerSelfTest {
throws Exception {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setIpFinder(new TcpDiscoveryVmIpFinder(false) {{
- setAddresses(Collections.singleton("127.0.0.1:47500..47509"));
- }});
+ disco.setIpFinder(new TcpDiscoveryVmIpFinder(false)
+ .setAddresses(Collections.singleton("127.0.0.1:47500..47509")));
return new IgniteConfiguration()
.setIgniteInstanceName(igniteInstanceName)
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
index 8de18c1..9456634 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
@@ -123,9 +123,8 @@ public class Log4j2LoggerVerboseModeSelfTest {
throws Exception {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setIpFinder(new TcpDiscoveryVmIpFinder(false) {{
- setAddresses(Collections.singleton("127.0.0.1:47500..47509"));
- }});
+ disco.setIpFinder(new TcpDiscoveryVmIpFinder(false)
+ .setAddresses(Collections.singleton("127.0.0.1:47500..47509")));
File xml = GridTestUtils.resolveIgnitePath(LOG_PATH_VERBOSE_TEST);
diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
index a7bb8f4..2f158b9 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
@@ -291,7 +291,7 @@ public class ClusterProperties {
* @param mem Memory.
*/
public void memoryPerNode(double mem) {
- this.memPerNode = mem;
+ this.memPerNode = mem;
}
/**
diff --git a/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java b/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
index 7ee01e1..214d371 100644
--- a/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
+++ b/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
@@ -47,7 +47,7 @@ public class CatboostClassificationModel implements Model<NamedVector, Double> {
@Override public Double predict(NamedVector input) {
float[] floatInput = new float[input.size()];
int index = 0;
- for (String key: model.getFeatureNames()) {
+ for (String key : model.getFeatureNames()) {
floatInput[index] = (float)input.get(key);
index++;
}
@@ -57,7 +57,8 @@ public class CatboostClassificationModel implements Model<NamedVector, Double> {
.get(0, 0);
// use formula based on https://github.com/catboost/benchmarks/blob/61d62512f751325a14dd885bb71f8c2dabf7e24b/quality_benchmarks/catboost_experiment.py#L77
return Math.pow(1 + Math.exp(-predict), -1);
- } catch (CatBoostError e) {
+ }
+ catch (CatBoostError e) {
throw new RuntimeException(e.getMessage());
}
}
@@ -65,9 +66,10 @@ public class CatboostClassificationModel implements Model<NamedVector, Double> {
/** {@inheritDoc} */
@Override public void close() {
try {
- model.close();
- } catch (CatBoostError e) {
- logger.error(e.getMessage());
+ model.close();
+ }
+ catch (CatBoostError e) {
+ logger.error(e.getMessage());
}
}
}
diff --git a/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModel.java b/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModel.java
index 1f56486..aec9926 100644
--- a/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModel.java
+++ b/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModel.java
@@ -40,8 +40,8 @@ public class CatboostRegressionModel implements Model<NamedVector, Double> {
* @param model Catboost Model
*/
public CatboostRegressionModel(CatBoostModel model) {
- this.model = model;
- }
+ this.model = model;
+ }
/** {@inheritDoc} */
@Override public Double predict(NamedVector input) {
@@ -55,8 +55,9 @@ public class CatboostRegressionModel implements Model<NamedVector, Double> {
try {
return model.predict(floatInput, model.getFeatureNames())
.get(0, 0);
- } catch (CatBoostError e) {
- throw new RuntimeException(e.getMessage());
+ }
+ catch (CatBoostError e) {
+ throw new RuntimeException(e.getMessage());
}
}
@@ -64,7 +65,8 @@ public class CatboostRegressionModel implements Model<NamedVector, Double> {
@Override public void close() {
try {
model.close();
- } catch (CatBoostError e) {
+ }
+ catch (CatBoostError e) {
logger.error(e.getMessage());
}
}
diff --git a/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModelParser.java b/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModelParser.java
index afa9ef1..cd52e39 100644
--- a/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModelParser.java
+++ b/modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModelParser.java
@@ -37,8 +37,9 @@ public class CatboostRegressionModelParser implements
@Override public CatboostRegressionModel parse(byte[] mdl) {
try (InputStream inputStream = new ByteArrayInputStream(mdl)) {
return new CatboostRegressionModel(CatBoostModel.loadModel(inputStream));
- } catch (IOException | CatBoostError e) {
+ }
+ catch (IOException | CatBoostError e) {
throw new RuntimeException("Failed to parse model " + e.getMessage(), e);
}
- }
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
index d682de0..560111b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/kmeans/KMeansModel.java
@@ -177,42 +177,45 @@ public final class KMeansModel implements ClusterizationModel<Vector, Integer>,
public static KMeansModel fromJSON(Path path) {
ObjectMapper mapper = new ObjectMapper().configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
- KMeansJSONExportModel exportModel;
- try {
- exportModel = mapper
- .readValue(new File(path.toAbsolutePath().toString()), KMeansJSONExportModel.class);
-
- return exportModel.convert();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ KMeansJSONExportModel exportModel;
+ try {
+ exportModel = mapper
+ .readValue(new File(path.toAbsolutePath().toString()), KMeansJSONExportModel.class);
+
+ return exportModel.convert();
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
+
return null;
}
// TODO: https://github.com/apache/spark/blob/master/mllib/src/main/scala/org/apache/spark/mllib/pmml/export/KMeansPMMLModelExport.scala
/** {@inheritDoc} */
@Override public void toJSON(Path path) {
- ObjectMapper mapper = new ObjectMapper();
-
- try {
- KMeansJSONExportModel exportModel = new KMeansJSONExportModel(
- System.currentTimeMillis(),
- "ann_" + UUID.randomUUID().toString(),
- KMeansModel.class.getSimpleName()
- );
- List<double[]> listOfCenters = new ArrayList<>();
- for (int i = 0; i < centers.length; i++) {
- listOfCenters.add(centers[i].asArray());
- }
-
- exportModel.mdlCenters = listOfCenters;
- exportModel.distanceMeasure = distanceMeasure;
-
- File file = new File(path.toAbsolutePath().toString());
- mapper.writeValue(file, exportModel);
- } catch (IOException e) {
- e.printStackTrace();
+ ObjectMapper mapper = new ObjectMapper();
+
+ try {
+ KMeansJSONExportModel exportModel = new KMeansJSONExportModel(
+ System.currentTimeMillis(),
+ "ann_" + UUID.randomUUID().toString(),
+ KMeansModel.class.getSimpleName()
+ );
+ List<double[]> listOfCenters = new ArrayList<>();
+ for (int i = 0; i < centers.length; i++) {
+ listOfCenters.add(centers[i].asArray());
}
+
+ exportModel.mdlCenters = listOfCenters;
+ exportModel.distanceMeasure = distanceMeasure;
+
+ File file = new File(path.toAbsolutePath().toString());
+ mapper.writeValue(file, exportModel);
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
}
/** */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
index 1490b7c..59b2d87 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/PredictionsAggregator.java
@@ -25,12 +25,11 @@ import org.apache.ignite.ml.math.functions.IgniteFunction;
* Predictions aggregator interface.
*/
@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-@JsonSubTypes(
- {
- @JsonSubTypes.Type(value = MeanValuePredictionsAggregator.class, name = "MeanValuePredictionsAggregator"),
- @JsonSubTypes.Type(value = OnMajorityPredictionsAggregator.class, name = "OnMajorityPredictionsAggregator"),
- @JsonSubTypes.Type(value = WeightedPredictionsAggregator.class, name = "WeightedPredictionsAggregator"),
- })
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = MeanValuePredictionsAggregator.class, name = "MeanValuePredictionsAggregator"),
+ @JsonSubTypes.Type(value = OnMajorityPredictionsAggregator.class, name = "OnMajorityPredictionsAggregator"),
+ @JsonSubTypes.Type(value = WeightedPredictionsAggregator.class, name = "WeightedPredictionsAggregator"),
+})
public interface PredictionsAggregator extends IgniteFunction<double[], Double> {
/**
* Represents aggregator as String.
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java
index baf14e1..197ed70 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java
@@ -66,8 +66,8 @@ public final class ANNClassificationModel extends NNClassificationModel implemen
*/
public ANNClassificationModel(LabeledVectorSet<LabeledVector> centers,
ANNClassificationTrainer.CentroidStat centroindsStat) {
- this.candidates = centers;
- this.centroindsStat = centroindsStat;
+ this.candidates = centers;
+ this.centroindsStat = centroindsStat;
}
/** */
@@ -86,8 +86,8 @@ public final class ANNClassificationModel extends NNClassificationModel implemen
/** {@inheritDoc} */
@Override public Double predict(Vector v) {
- List<LabeledVector> neighbors = findKNearestNeighbors(v);
- return classify(neighbors, v, weighted);
+ List<LabeledVector> neighbors = findKNearestNeighbors(v);
+ return classify(neighbors, v, weighted);
}
/** */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java
index 3572181..ea98bb3 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java
@@ -27,33 +27,33 @@ import org.apache.ignite.ml.math.util.MatrixUtil;
* Bray–Curtis dissimilarity</a>
*/
public class BrayCurtisDistance implements DistanceMeasure {
- /** Serializable version identifier. */
- private static final long serialVersionUID = 1771556549784040091L;
-
- /** {@inheritDoc} */
- @Override public double compute(Vector a, Vector b)
- throws CardinalityException {
- double diff = MatrixUtil.localCopyOf(a).minus(b).kNorm(1);
- double sum = MatrixUtil.localCopyOf(a).plus(b).kNorm(1);
-
- return diff / sum;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object obj) {
- if (this == obj)
- return true;
-
- return obj != null && getClass() == obj.getClass();
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return getClass().hashCode();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "BrayCurtisDistance{}";
- }
+ /** Serializable version identifier. */
+ private static final long serialVersionUID = 1771556549784040091L;
+
+ /** {@inheritDoc} */
+ @Override public double compute(Vector a, Vector b)
+ throws CardinalityException {
+ double diff = MatrixUtil.localCopyOf(a).minus(b).kNorm(1);
+ double sum = MatrixUtil.localCopyOf(a).plus(b).kNorm(1);
+
+ return diff / sum;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+
+ return obj != null && getClass() == obj.getClass();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return getClass().hashCode();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "BrayCurtisDistance{}";
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/CanberraDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/CanberraDistance.java
index 66e349c..f5399f7 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/CanberraDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/CanberraDistance.java
@@ -26,39 +26,39 @@ import org.apache.ignite.ml.math.util.MatrixUtil;
* @see <a href="https://en.wikipedia.org/wiki/Canberra_distance">Canberra distance</a>
*/
public class CanberraDistance implements DistanceMeasure {
- /**
- * Serializable version identifier.
- */
- private static final long serialVersionUID = 1771556549784040092L;
+ /**
+ * Serializable version identifier.
+ */
+ private static final long serialVersionUID = 1771556549784040092L;
- /**
- * {@inheritDoc}
- */
- @Override public double compute(Vector a, Vector b)
- throws CardinalityException {
- Vector top = MatrixUtil.localCopyOf(a).minus(b).map(Math::abs);
- Vector down = MatrixUtil.localCopyOf(a).map(Math::abs)
- .plus(MatrixUtil.localCopyOf(b).map(Math::abs))
- .map(value -> value != 0 ? 1 / value : 0);
+ /**
+ * {@inheritDoc}
+ */
+ @Override public double compute(Vector a, Vector b)
+ throws CardinalityException {
+ Vector top = MatrixUtil.localCopyOf(a).minus(b).map(Math::abs);
+ Vector down = MatrixUtil.localCopyOf(a).map(Math::abs)
+ .plus(MatrixUtil.localCopyOf(b).map(Math::abs))
+ .map(value -> value != 0 ? 1 / value : 0);
- return top.times(down).sum();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override public boolean equals(Object obj) {
- if (this == obj) {
- return true;
+ return top.times(down).sum();
}
- return obj != null && getClass() == obj.getClass();
- }
+ /**
+ * {@inheritDoc}
+ */
+ @Override public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ return obj != null && getClass() == obj.getClass();
+ }
- /**
- * {@inheritDoc}
- */
- @Override public int hashCode() {
- return getClass().hashCode();
- }
+ /**
+ * {@inheritDoc}
+ */
+ @Override public int hashCode() {
+ return getClass().hashCode();
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
index 4176d97..e4e1d96 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/DistanceMeasure.java
@@ -31,20 +31,19 @@ import org.apache.ignite.ml.math.primitives.vector.impl.DenseVector;
* n-dimensional vectors.
*/
@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-@JsonSubTypes(
- {
- @JsonSubTypes.Type(value = BrayCurtisDistance.class, name = "BrayCurtisDistance"),
- @JsonSubTypes.Type(value = CanberraDistance.class, name = "CanberraDistance"),
- @JsonSubTypes.Type(value = ChebyshevDistance.class, name = "ChebyshevDistance"),
- @JsonSubTypes.Type(value = CosineSimilarity.class, name = "CosineSimilarity"),
- @JsonSubTypes.Type(value = EuclideanDistance.class, name = "EuclideanDistance"),
- @JsonSubTypes.Type(value = HammingDistance.class, name = "HammingDistance"),
- @JsonSubTypes.Type(value = JaccardIndex.class, name = "JaccardIndex"),
- @JsonSubTypes.Type(value = JensenShannonDistance.class, name = "JensenShannonDistance"),
- @JsonSubTypes.Type(value = ManhattanDistance.class, name = "ManhattanDistance"),
- @JsonSubTypes.Type(value = MinkowskiDistance.class, name = "MinkowskiDistance"),
- @JsonSubTypes.Type(value = WeightedMinkowskiDistance.class, name = "WeightedMinkowskiDistance"),
- })
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = BrayCurtisDistance.class, name = "BrayCurtisDistance"),
+ @JsonSubTypes.Type(value = CanberraDistance.class, name = "CanberraDistance"),
+ @JsonSubTypes.Type(value = ChebyshevDistance.class, name = "ChebyshevDistance"),
+ @JsonSubTypes.Type(value = CosineSimilarity.class, name = "CosineSimilarity"),
+ @JsonSubTypes.Type(value = EuclideanDistance.class, name = "EuclideanDistance"),
+ @JsonSubTypes.Type(value = HammingDistance.class, name = "HammingDistance"),
+ @JsonSubTypes.Type(value = JaccardIndex.class, name = "JaccardIndex"),
+ @JsonSubTypes.Type(value = JensenShannonDistance.class, name = "JensenShannonDistance"),
+ @JsonSubTypes.Type(value = ManhattanDistance.class, name = "ManhattanDistance"),
+ @JsonSubTypes.Type(value = MinkowskiDistance.class, name = "MinkowskiDistance"),
+ @JsonSubTypes.Type(value = WeightedMinkowskiDistance.class, name = "WeightedMinkowskiDistance"),
+})
public interface DistanceMeasure extends Externalizable {
/**
* Compute the distance between two n-dimensional vectors.
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java
index 1fc5624..bed3497 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java
@@ -27,69 +27,69 @@ import org.apache.ignite.ml.math.util.MatrixUtil;
* Jensen–Shannon divergence</a>
*/
public class JensenShannonDistance implements DistanceMeasure {
- /**
- * Serializable version identifier.
- */
- private static final long serialVersionUID = 1771556549784040093L;
+ /**
+ * Serializable version identifier.
+ */
+ private static final long serialVersionUID = 1771556549784040093L;
- /** */
- private final Double base;
+ /** */
+ private final Double base;
- /** */
- public JensenShannonDistance() {
- base = Math.E;
- }
-
- /** */
- public JensenShannonDistance(Double base) {
- this.base = base;
- }
+ /** */
+ public JensenShannonDistance() {
+ base = Math.E;
+ }
- /**
- * {@inheritDoc}
- */
- @Override public double compute(Vector a, Vector b)
- throws CardinalityException {
- Vector aNormalized = MatrixUtil.localCopyOf(a).divide(a.sum());
- Vector bNormalized = MatrixUtil.localCopyOf(b).divide(b.sum());
+ /** */
+ public JensenShannonDistance(Double base) {
+ this.base = base;
+ }
- Vector mean = aNormalized.plus(bNormalized).divide(2d);
+ /**
+ * {@inheritDoc}
+ */
+ @Override public double compute(Vector a, Vector b)
+ throws CardinalityException {
+ Vector aNormalized = MatrixUtil.localCopyOf(a).divide(a.sum());
+ Vector bNormalized = MatrixUtil.localCopyOf(b).divide(b.sum());
- double js = aNormalized.map(mean, this::relativeEntropy).sum() +
- bNormalized.map(mean, this::relativeEntropy).sum();
+ Vector mean = aNormalized.plus(bNormalized).divide(2d);
- js /= Math.log(base);
+ double js = aNormalized.map(mean, this::relativeEntropy).sum() +
+ bNormalized.map(mean, this::relativeEntropy).sum();
- return Math.sqrt(js / 2d);
- }
+ js /= Math.log(base);
- /** */
- private double relativeEntropy(double x, double y) {
- if (x > 0 && y > 0) {
- return x * Math.log(x / y);
- }
- if (x == 0 && y >= 0) {
- return 0;
+ return Math.sqrt(js / 2d);
}
- return Double.POSITIVE_INFINITY;
- }
+ /** */
+ private double relativeEntropy(double x, double y) {
+ if (x > 0 && y > 0) {
+ return x * Math.log(x / y);
+ }
+ if (x == 0 && y >= 0) {
+ return 0;
+ }
- /**
- * {@inheritDoc}
- */
- @Override public boolean equals(Object obj) {
- if (this == obj) {
- return true;
+ return Double.POSITIVE_INFINITY;
}
- return obj != null && getClass() == obj.getClass();
- }
+ /**
+ * {@inheritDoc}
+ */
+ @Override public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
- /**
- * {@inheritDoc}
- */
- @Override public int hashCode() {
- return getClass().hashCode();
- }
+ return obj != null && getClass() == obj.getClass();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override public int hashCode() {
+ return getClass().hashCode();
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java
index 71d3186..ce73166 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java
@@ -29,75 +29,75 @@ import org.apache.ignite.ml.math.util.MatrixUtil;
* Calculates the Weighted Minkowski distance between two points.
*/
public class WeightedMinkowskiDistance implements DistanceMeasure {
- /**
- * Serializable version identifier.
- */
- private static final long serialVersionUID = 1771556549784040096L;
+ /**
+ * Serializable version identifier.
+ */
+ private static final long serialVersionUID = 1771556549784040096L;
- /** */
- private int p = 1;
+ /** */
+ private int p = 1;
- /** */
- private final double[] weights;
+ /** */
+ private final double[] weights;
- /** */
- @JsonIgnore
- private final Vector internalWeights;
+ /** */
+ @JsonIgnore
+ private final Vector internalWeights;
- /** */
- @JsonCreator
- public WeightedMinkowskiDistance(@JsonProperty("p")int p, @JsonProperty("weights")double[] weights) {
- this.p = p;
- this.weights = weights.clone();
- internalWeights = VectorUtils.of(weights).copy().map(x -> Math.pow(Math.abs(x), p));
- }
+ /** */
+ @JsonCreator
+ public WeightedMinkowskiDistance(@JsonProperty("p")int p, @JsonProperty("weights")double[] weights) {
+ this.p = p;
+ this.weights = weights.clone();
+ internalWeights = VectorUtils.of(weights).copy().map(x -> Math.pow(Math.abs(x), p));
+ }
- /**
- * {@inheritDoc}
- */
- @Override public double compute(Vector a, Vector b)
- throws CardinalityException {
+ /**
+ * {@inheritDoc}
+ */
+ @Override public double compute(Vector a, Vector b)
+ throws CardinalityException {
- return Math.pow(
- MatrixUtil.localCopyOf(a).minus(b)
- .map(x -> Math.pow(Math.abs(x), p))
- .times(internalWeights)
- .sum(),
- 1 / (double)p
- );
- }
+ return Math.pow(
+ MatrixUtil.localCopyOf(a).minus(b)
+ .map(x -> Math.pow(Math.abs(x), p))
+ .times(internalWeights)
+ .sum(),
+ 1 / (double)p
+ );
+ }
- /** Returns p-norm. */
- public int getP() {
- return p;
- }
+ /** Returns p-norm. */
+ public int getP() {
+ return p;
+ }
- /** Returns weights. */
- public double[] getWeights() { return weights.clone(); }
+ /** Returns weights. */
+ public double[] getWeights() { return weights.clone(); }
- /**
- * {@inheritDoc}
- */
- @Override public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
+ /**
+ * {@inheritDoc}
+ */
+ @Override public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
- return obj != null && getClass() == obj.getClass();
- }
+ return obj != null && getClass() == obj.getClass();
+ }
- /**
- * {@inheritDoc}
- */
- @Override public int hashCode() {
- return getClass().hashCode();
- }
+ /**
+ * {@inheritDoc}
+ */
+ @Override public int hashCode() {
+ return getClass().hashCode();
+ }
- /** {@inheritDoc} */
- @Override public String toString() {
- return "WeightedMinkowskiDistance{" +
- "p=" + p +
- ", weights=" + Arrays.toString(weights) +
- '}';
- }
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "WeightedMinkowskiDistance{" +
+ "p=" + p +
+ ", weights=" + Arrays.toString(weights) +
+ '}';
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetCounter.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetCounter.java
index d2f8065..7399a08 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetCounter.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetCounter.java
@@ -24,55 +24,55 @@ import java.util.Map;
* Counter for encode category.
*/
public class TargetCounter {
- /** */
- private Double targetSum = 0d;
+ /** */
+ private Double targetSum = 0d;
- /** */
- private Long targetCount = 0L;
+ /** */
+ private Long targetCount = 0L;
- /** */
- private final Map<String, Long> categoryCounts = new HashMap<>();
+ /** */
+ private final Map<String, Long> categoryCounts = new HashMap<>();
- /** */
- private final Map<String, Double> categoryTargetSum = new HashMap<>();
+ /** */
+ private final Map<String, Double> categoryTargetSum = new HashMap<>();
- /** */
- public Double getTargetSum() {
- return targetSum;
- }
+ /** */
+ public Double getTargetSum() {
+ return targetSum;
+ }
- /** */
- public void setTargetSum(Double targetSum) {
- this.targetSum = targetSum;
- }
+ /** */
+ public void setTargetSum(Double targetSum) {
+ this.targetSum = targetSum;
+ }
- /** */
- public Long getTargetCount() {
- return targetCount;
- }
+ /** */
+ public Long getTargetCount() {
+ return targetCount;
+ }
- /** */
- public void setTargetCount(Long targetCount) {
- this.targetCount = targetCount;
- }
+ /** */
+ public void setTargetCount(Long targetCount) {
+ this.targetCount = targetCount;
+ }
- /** */
- public Map<String, Long> getCategoryCounts() {
- return categoryCounts;
- }
+ /** */
+ public Map<String, Long> getCategoryCounts() {
+ return categoryCounts;
+ }
- /** */
- public void setCategoryCounts(Map<String, Long> categoryCounts) {
- this.categoryCounts.putAll(categoryCounts);
- }
+ /** */
+ public void setCategoryCounts(Map<String, Long> categoryCounts) {
+ this.categoryCounts.putAll(categoryCounts);
+ }
- /** */
- public Map<String, Double> getCategoryTargetSum() {
- return categoryTargetSum;
- }
+ /** */
+ public Map<String, Double> getCategoryTargetSum() {
+ return categoryTargetSum;
+ }
- /** */
- public void setCategoryTargetSum(Map<String, Double> categoryTargetSum) {
- this.categoryTargetSum.putAll(categoryTargetSum);
- }
+ /** */
+ public void setCategoryTargetSum(Map<String, Double> categoryTargetSum) {
+ this.categoryTargetSum.putAll(categoryTargetSum);
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetEncodingMeta.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetEncodingMeta.java
index 7bcd650..dc2e81d 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetEncodingMeta.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/target/TargetEncodingMeta.java
@@ -24,33 +24,33 @@ import java.util.Map;
* Metadata for encode category.
*/
public class TargetEncodingMeta {
- /** */
- private Double globalMean;
+ /** */
+ private Double globalMean;
- /** */
- private Map<String, Double> categoryMean;
+ /** */
+ private Map<String, Double> categoryMean;
- /** */
- public TargetEncodingMeta withGlobalMean(Double globalMean) {
- this.globalMean = globalMean;
+ /** */
+ public TargetEncodingMeta withGlobalMean(Double globalMean) {
+ this.globalMean = globalMean;
- return this;
- }
+ return this;
+ }
- /** */
- public TargetEncodingMeta withCategoryMean(Map<String, Double> categoryMean) {
- this.categoryMean = categoryMean;
+ /** */
+ public TargetEncodingMeta withCategoryMean(Map<String, Double> categoryMean) {
+ this.categoryMean = categoryMean;
- return this;
- }
+ return this;
+ }
- /** */
- public Double getGlobalMean() {
- return globalMean;
- }
+ /** */
+ public Double getGlobalMean() {
+ return globalMean;
+ }
- /** */
- public Map<String, Double> getCategoryMean() {
- return Collections.unmodifiableMap(categoryMean);
- }
+ /** */
+ public Map<String, Double> getCategoryMean() {
+ return Collections.unmodifiableMap(categoryMean);
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
index 4cb5340..b49b60e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModel.java
@@ -165,20 +165,21 @@ public final class LinearRegressionModel implements IgniteModel<Vector, Double>,
/** {@inheritDoc} */
@Override public void toJSON(Path path) {
ObjectMapper mapper = new ObjectMapper();
- try {
- LinearRegressionModelJSONExportModel exportModel = new LinearRegressionModelJSONExportModel(
- System.currentTimeMillis(),
- "linreg_" + UUID.randomUUID().toString(),
- LinearRegressionModel.class.getSimpleName()
- );
- exportModel.intercept = intercept;
- exportModel.weights = weights.asArray();
-
- File file = new File(path.toAbsolutePath().toString());
- mapper.writeValue(file, exportModel);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ try {
+ LinearRegressionModelJSONExportModel exportModel = new LinearRegressionModelJSONExportModel(
+ System.currentTimeMillis(),
+ "linreg_" + UUID.randomUUID().toString(),
+ LinearRegressionModel.class.getSimpleName()
+ );
+ exportModel.intercept = intercept;
+ exportModel.weights = weights.asArray();
+
+ File file = new File(path.toAbsolutePath().toString());
+ mapper.writeValue(file, exportModel);
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
}
/** */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModel.java
index 9282dfe..611ffb6 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/LogisticRegressionModel.java
@@ -219,39 +219,42 @@ public final class LogisticRegressionModel implements IgniteModel<Vector, Double
/** Loads KMeansModel from JSON file. */
public static LogisticRegressionModel fromJSON(Path path) {
- ObjectMapper mapper = new ObjectMapper();
+ ObjectMapper mapper = new ObjectMapper();
- LogisticRegressionJSONExportModel logisticRegressionJSONExportModel;
- try {
- logisticRegressionJSONExportModel = mapper
- .readValue(new File(path.toAbsolutePath().toString()), LogisticRegressionJSONExportModel.class);
+ LogisticRegressionJSONExportModel logisticRegressionJSONExportModel;
+ try {
+ logisticRegressionJSONExportModel = mapper
+ .readValue(new File(path.toAbsolutePath().toString()), LogisticRegressionJSONExportModel.class);
+
+ return logisticRegressionJSONExportModel.convert();
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
- return logisticRegressionJSONExportModel.convert();
- } catch (IOException e) {
- e.printStackTrace();
- }
return null;
}
/** {@inheritDoc} */
@Override public void toJSON(Path path) {
- ObjectMapper mapper = new ObjectMapper();
-
- try {
- LogisticRegressionJSONExportModel exportModel = new LogisticRegressionJSONExportModel(
- System.currentTimeMillis(),
- "logReg_" + UUID.randomUUID().toString(),
- LogisticRegressionModel.class.getSimpleName());
- exportModel.intercept = intercept;
- exportModel.isKeepingRawLabels = isKeepingRawLabels;
- exportModel.threshold = threshold;
- exportModel.weights = weights.asArray();
-
- File file = new File(path.toAbsolutePath().toString());
- mapper.writeValue(file, exportModel);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ ObjectMapper mapper = new ObjectMapper();
+
+ try {
+ LogisticRegressionJSONExportModel exportModel = new LogisticRegressionJSONExportModel(
+ System.currentTimeMillis(),
+ "logReg_" + UUID.randomUUID().toString(),
+ LogisticRegressionModel.class.getSimpleName());
+ exportModel.intercept = intercept;
+ exportModel.isKeepingRawLabels = isKeepingRawLabels;
+ exportModel.threshold = threshold;
+ exportModel.weights = weights.asArray();
+
+ File file = new File(path.toAbsolutePath().toString());
+ mapper.writeValue(file, exportModel);
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
}
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVectorSet.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVectorSet.java
index 3eda191..2111679 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVectorSet.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVectorSet.java
@@ -89,7 +89,7 @@ public class LabeledVectorSet<Row extends LabeledVector> extends Dataset<Row> im
* @param lbs Labels of observations.
*/
public LabeledVectorSet(double[][] mtx, double[] lbs) {
- this(mtx, lbs, null);
+ this(mtx, lbs, null);
}
/**
@@ -179,7 +179,7 @@ public class LabeledVectorSet<Row extends LabeledVector> extends Dataset<Row> im
/** */
public static Vector emptyVector(int size) {
- return new DenseVector(size);
+ return new DenseVector(size);
}
/** Makes copy with new Label objects and old features and Metadata objects. */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java
index e215db0..d85f3e4 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java
@@ -208,40 +208,42 @@ public final class SVMLinearClassificationModel implements IgniteModel<Vector, D
/** Loads SVMLinearClassificationModel from JSON file. */
public static SVMLinearClassificationModel fromJSON(Path path) {
- ObjectMapper mapper = new ObjectMapper();
+ ObjectMapper mapper = new ObjectMapper();
- SVMLinearClassificationJSONExportModel exportModel;
- try {
- exportModel = mapper
- .readValue(new File(path.toAbsolutePath().toString()), SVMLinearClassificationJSONExportModel.class);
+ SVMLinearClassificationJSONExportModel exportModel;
+ try {
+ exportModel = mapper
+ .readValue(new File(path.toAbsolutePath().toString()), SVMLinearClassificationJSONExportModel.class);
- return exportModel.convert();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ return exportModel.convert();
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
return null;
}
/** {@inheritDoc} */
@Override public void toJSON(Path path) {
- ObjectMapper mapper = new ObjectMapper();
-
- try {
- SVMLinearClassificationJSONExportModel exportModel = new SVMLinearClassificationJSONExportModel(
- System.currentTimeMillis(),
- "svm_" + UUID.randomUUID().toString(),
- SVMLinearClassificationModel.class.getSimpleName());
- exportModel.intercept = intercept;
- exportModel.isKeepingRawLabels = isKeepingRawLabels;
- exportModel.threshold = threshold;
- exportModel.weights = weights.asArray();
-
- File file = new File(path.toAbsolutePath().toString());
- mapper.writeValue(file, exportModel);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ ObjectMapper mapper = new ObjectMapper();
+
+ try {
+ SVMLinearClassificationJSONExportModel exportModel = new SVMLinearClassificationJSONExportModel(
+ System.currentTimeMillis(),
+ "svm_" + UUID.randomUUID().toString(),
+ SVMLinearClassificationModel.class.getSimpleName());
+ exportModel.intercept = intercept;
+ exportModel.isKeepingRawLabels = isKeepingRawLabels;
+ exportModel.threshold = threshold;
+ exportModel.weights = weights.asArray();
+
+ File file = new File(path.toAbsolutePath().toString());
+ mapper.writeValue(file, exportModel);
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
}
/** */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/AdaptableDatasetTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/AdaptableDatasetTrainer.java
index 1f78650..d6dacd8 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/trainers/AdaptableDatasetTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/trainers/AdaptableDatasetTrainer.java
@@ -112,7 +112,7 @@ public class AdaptableDatasetTrainer<I, O, IW, OW, M extends IgniteModel<IW, OW>
@Override protected <K, V> AdaptableDatasetModel<I, O, IW, OW, M> updateModel(
AdaptableDatasetModel<I, O, IW, OW, M> mdl, DatasetBuilder<K, V> datasetBuilder,
Preprocessor<K, V> extractor) {
- M updated = wrapped.withEnvironmentBuilder(envBuilder)
+ M updated = wrapped.withEnvironmentBuilder(envBuilder)
.updateModel(
mdl.innerModel(),
datasetBuilder.withUpstreamTransformer(upstreamTransformerBuilder),
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeNode.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeNode.java
index 8d705e4..2ea81e9 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeNode.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/DecisionTreeNode.java
@@ -26,15 +26,14 @@ import org.apache.ignite.ml.math.primitives.vector.Vector;
* Base interface for decision tree nodes.
*/
@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-@JsonSubTypes(
- {
- @JsonSubTypes.Type(value = DecisionTreeLeafNode.class, name = "leaf"),
- @JsonSubTypes.Type(value = DecisionTreeConditionalNode.class, name = "conditional"),
- })
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = DecisionTreeLeafNode.class, name = "leaf"),
+ @JsonSubTypes.Type(value = DecisionTreeConditionalNode.class, name = "conditional"),
+})
public abstract class DecisionTreeNode implements IgniteModel<Vector, Double> {
- /**
- * Empty constructor for serialization needs.
- */
- protected DecisionTreeNode() {
- }
+ /**
+ * Empty constructor for serialization needs.
+ */
+ protected DecisionTreeNode() {
+ }
}
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/common/ExternalizeTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/common/ExternalizeTest.java
index dc37ee8..72aca07 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/common/ExternalizeTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/common/ExternalizeTest.java
@@ -88,7 +88,7 @@ public class ExternalizeTest {
assertEquals(MathTestConstants.VAL_NOT_EQUALS, initObj, objRestored);
- assertEquals(MathTestConstants.VAL_NOT_EQUALS, 0, Integer.compare(initObj.hashCode(), objRestored.hashCode()));
+ assertEquals(MathTestConstants.VAL_NOT_EQUALS, 0, Integer.compare(initObj.hashCode(), objRestored.hashCode()));
}
catch (ClassNotFoundException | IOException e) {
fail(e + " [" + e.getMessage() + "]");
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/local/LocalDatasetBuilderTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/local/LocalDatasetBuilderTest.java
index 18ba697..ed3bdd5 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/local/LocalDatasetBuilderTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/local/LocalDatasetBuilderTest.java
@@ -49,14 +49,14 @@ public class LocalDatasetBuilderTest {
AtomicLong cnt = new AtomicLong();
dataset.compute((partData, env) -> {
- cnt.incrementAndGet();
+ cnt.incrementAndGet();
- int[] arr = partData.data;
+ int[] arr = partData.data;
- assertEquals(10, arr.length);
+ assertEquals(10, arr.length);
- for (int i = 0; i < 10; i++)
- assertEquals(env.partition() * 10 + i, arr[i]);
+ for (int i = 0; i < 10; i++)
+ assertEquals(env.partition() * 10 + i, arr[i]);
});
assertEquals(10, cnt.intValue());
@@ -94,16 +94,16 @@ public class LocalDatasetBuilderTest {
LocalDatasetBuilder<Integer, Integer> builder) {
PartitionContextBuilder<Integer, Integer, Serializable> partCtxBuilder = (env, upstream, upstreamSize) -> null;
- PartitionDataBuilder<Integer, Integer, Serializable, TestPartitionData> partDataBuilder
- = (env, upstream, upstreamSize, ctx) -> {
- int[] arr = new int[Math.toIntExact(upstreamSize)];
+ PartitionDataBuilder<Integer, Integer, Serializable, TestPartitionData> partDataBuilder =
+ (env, upstream, upstreamSize, ctx) -> {
+ int[] arr = new int[Math.toIntExact(upstreamSize)];
- int ptr = 0;
- while (upstream.hasNext())
- arr[ptr++] = upstream.next().getValue();
+ int ptr = 0;
+ while (upstream.hasNext())
+ arr[ptr++] = upstream.next().getValue();
- return new TestPartitionData(arr);
- };
+ return new TestPartitionData(arr);
+ };
return builder.build(
TestUtils.testEnvBuilder(),
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleDatasetTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleDatasetTest.java
index 4545602..edd7ca1 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleDatasetTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleDatasetTest.java
@@ -36,12 +36,12 @@ public class SimpleDatasetTest {
/** Basic test for SimpleDataset features. IMPL NOTE derived from LocalDatasetExample. */
@Test
public void basicTest() throws Exception {
- Map<Integer, Vector> dataPoints = new HashMap<Integer, Vector>() {{
- put(5, VectorUtils.of(42, 10000));
- put(6, VectorUtils.of(32, 64000));
- put(7, VectorUtils.of(53, 120000));
- put(8, VectorUtils.of(24, 70000));
- }};
+ Map<Integer, Vector> dataPoints = new HashMap<>();
+
+ dataPoints.put(5, VectorUtils.of(42, 10000));
+ dataPoints.put(6, VectorUtils.of(32, 64000));
+ dataPoints.put(7, VectorUtils.of(53, 120000));
+ dataPoints.put(8, VectorUtils.of(24, 70000));
Vectorizer<Integer, Vector, Integer, Double> vectorizer = new DummyVectorizer<>();
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleLabeledDatasetTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleLabeledDatasetTest.java
index eff9216..54fdfb0 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleLabeledDatasetTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/SimpleLabeledDatasetTest.java
@@ -40,12 +40,12 @@ public class SimpleLabeledDatasetTest {
/** Basic test for SimpleLabeledDataset features. */
@Test
public void basicTest() throws Exception {
- Map<Integer, Vector> dataPoints = new HashMap<Integer, Vector>() {{
- put(5, VectorUtils.of(42, 10000));
- put(6, VectorUtils.of(32, 64000));
- put(7, VectorUtils.of(53, 120000));
- put(8, VectorUtils.of(24, 70000));
- }};
+ Map<Integer, Vector> dataPoints = new HashMap<Integer, Vector>();
+
+ dataPoints.put(5, VectorUtils.of(42, 10000));
+ dataPoints.put(6, VectorUtils.of(32, 64000));
+ dataPoints.put(7, VectorUtils.of(53, 120000));
+ dataPoints.put(8, VectorUtils.of(24, 70000));
double[][] actualFeatures = new double[2][];
double[][] actualLabels = new double[2][];
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/environment/LearningEnvironmentTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/environment/LearningEnvironmentTest.java
index 4592f1c..54d869b 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/environment/LearningEnvironmentTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/environment/LearningEnvironmentTest.java
@@ -87,10 +87,10 @@ public class LearningEnvironmentTest {
DatasetTrainer<IgniteModel<Object, Vector>, Void> trainer = new DatasetTrainer<IgniteModel<Object, Vector>, Void>() {
/** {@inheritDoc} */
- @Override public <K, V> IgniteModel<Object, Vector> fitWithInitializedDeployingContext(
- DatasetBuilder<K, V> datasetBuilder,
- Preprocessor<K, V> preprocessor
- ) {
+ @Override public <K, V> IgniteModel<Object, Vector> fitWithInitializedDeployingContext(
+ DatasetBuilder<K, V> datasetBuilder,
+ Preprocessor<K, V> preprocessor
+ ) {
Dataset<EmptyContext, TestUtils.DataWrapper<Integer>> ds = datasetBuilder.build(envBuilder,
... 1582 lines suppressed ...