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 2021/03/22 02:55:42 UTC

[ignite] branch master updated: IGNITE-14361 WhiteSpace after checkstyle rule (#8907)

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 034d196  IGNITE-14361 WhiteSpace after checkstyle rule (#8907)
034d196 is described below

commit 034d1968e78b5a4f37d3695a03bee07ef0e872aa
Author: Nikolay <ni...@apache.org>
AuthorDate: Mon Mar 22 05:55:15 2021 +0300

    IGNITE-14361 WhiteSpace after checkstyle rule (#8907)
---
 checkstyle/checkstyle.xml                          |  8 +++
 .../ignite/examples/spark/SharedRDDExample.java    |  2 +-
 .../benchmarks/jmh/tree/BPlusTreeBenchmark.java    |  4 +-
 .../jdbc2/JdbcAbstractDmlStatementSelfTest.java    |  4 +-
 .../internal/jdbc2/JdbcBulkLoadSelfTest.java       |  2 +-
 .../internal/jdbc2/JdbcComplexQuerySelfTest.java   |  2 +-
 .../jdbc2/JdbcDistributedJoinsQueryTest.java       |  2 +-
 .../internal/jdbc2/JdbcMetadataSelfTest.java       |  2 +-
 .../jdbc2/JdbcNoCacheStreamingSelfTest.java        |  2 +-
 .../jdbc2/JdbcPreparedStatementSelfTest.java       |  2 +-
 .../internal/jdbc2/JdbcResultSetSelfTest.java      |  2 +-
 .../internal/jdbc2/JdbcStatementSelfTest.java      |  2 +-
 .../internal/jdbc2/JdbcStreamingSelfTest.java      |  4 +-
 .../jdbc2/JdbcStreamingToPublicCacheTest.java      |  2 +-
 .../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java |  2 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java      |  2 +-
 .../ignite/jdbc/JdbcErrorsAbstractSelfTest.java    |  2 +-
 .../apache/ignite/jdbc/JdbcMetadataSelfTest.java   |  2 +-
 .../ignite/jdbc/JdbcPreparedStatementSelfTest.java |  2 +-
 .../apache/ignite/jdbc/JdbcStatementSelfTest.java  |  2 +-
 .../thin/JdbcThinAbstractDmlStatementSelfTest.java |  4 +-
 .../ignite/jdbc/thin/JdbcThinBulkLoadSelfTest.java |  4 +-
 .../jdbc/thin/JdbcThinComplexQuerySelfTest.java    |  2 +-
 .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java |  2 +-
 .../thin/JdbcThinPartitionAwarenessSelfTest.java   |  4 +-
 .../thin/JdbcThinPreparedStatementSelfTest.java    |  2 +-
 .../jdbc/thin/JdbcThinResultSetSelfTest.java       |  2 +-
 .../jdbc/thin/JdbcThinStatementCancelSelfTest.java |  2 +-
 .../jdbc/thin/JdbcThinStatementSelfTest.java       |  2 +-
 .../thin/JdbcThinStatementTimeoutSelfTest.java     |  2 +-
 .../qa/query/WarningOnBigQueryResultsBaseTest.java |  4 +-
 .../persistence/FoldersReuseCompatibilityTest.java |  2 +-
 .../AbstractPageCompressionIntegrationTest.java    |  2 +-
 .../compress/CompressionConfigurationTest.java     |  4 +-
 .../compress/CompressionProcessorTest.java         |  6 +-
 .../DiskPageCompressionIntegrationTest.java        | 10 ++--
 .../WalPageCompressionIntegrationTest.java         |  4 +-
 .../internal/commandline/query/KillCommand.java    |  2 +-
 .../commandline/CommandHandlerParsingTest.java     |  2 +-
 .../util/GridCommandHandlerClusterByClassTest.java |  4 +-
 .../apache/ignite/util/GridCommandHandlerTest.java |  2 +-
 .../java/org/apache/ignite/cache/QueryEntity.java  |  2 +-
 .../sorted/SortedEvictionPolicyFactory.java        |  2 +-
 .../ignite/configuration/CacheConfiguration.java   |  4 +-
 .../events/CacheConsistencyViolationEvent.java     |  4 +-
 .../ignite/internal/GridEventConsumeHandler.java   |  2 +-
 .../internal/client/thin/TcpClientChannel.java     |  2 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java       |  2 +-
 .../managers/discovery/GridDiscoveryManager.java   |  2 +-
 .../processors/cache/CacheEvictableEntryImpl.java  |  2 +-
 .../processors/cache/GridCacheIoManager.java       |  2 +-
 .../processors/cache/GridCacheMapEntry.java        |  4 +-
 .../processors/cache/GridCacheProcessor.java       |  2 +-
 .../binary/CacheObjectBinaryProcessorImpl.java     |  6 +-
 .../dht/topology/GridClientPartitionTopology.java  |  2 +-
 .../dht/topology/GridDhtPartitionsReservation.java |  4 +-
 .../cache/distributed/near/GridNearGetFuture.java  |  2 +-
 .../cache/distributed/near/GridNearLockFuture.java |  2 +-
 .../GridCacheDatabaseSharedManager.java            |  2 +-
 .../cache/persistence/GridCacheOffheapManager.java |  2 +-
 .../cache/persistence/RecoveryDebug.java           |  2 +-
 .../cache/persistence/tree/BPlusTree.java          |  6 +-
 .../persistence/wal/FileWriteAheadLogManager.java  |  2 +-
 .../processors/cache/query/CacheQueryEntry.java    |  2 +-
 .../query/GridCacheDistributedQueryManager.java    |  2 +-
 .../cache/query/jdbc/GridCacheQueryJdbcTask.java   |  6 +-
 .../cache/store/GridCacheWriteBehindStore.java     | 10 ++--
 .../processors/cache/tree/CacheDataTree.java       |  2 +-
 .../processors/cache/verify/IdleVerifyUtility.java |  2 +-
 .../processors/datastreamer/DataStreamerImpl.java  |  2 +-
 .../datastructures/AtomicDataStructureProxy.java   |  2 +-
 .../datastructures/DataStructuresProcessor.java    |  2 +-
 .../datastructures/GridCacheLockImpl.java          |  2 +-
 .../datastructures/GridCacheSemaphoreState.java    |  4 +-
 .../internal/processors/odbc/SqlListenerUtils.java |  2 +-
 .../cache/ClientCacheSqlFieldsQueryRequest.java    |  2 +-
 .../platform/cluster/PlatformClusterGroup.java     |  2 +-
 .../internal/processors/query/QueryUtils.java      |  8 +--
 .../org/apache/ignite/internal/util/GridDebug.java |  4 +-
 .../apache/ignite/internal/util/IgniteUtils.java   |  2 +-
 .../util/distributed/DistributedProcess.java       |  2 +-
 .../util/ipc/loopback/IpcServerTcpEndpoint.java    |  2 +-
 .../ipc/shmem/IpcSharedMemoryServerEndpoint.java   |  2 +-
 .../util/offheap/unsafe/GridUnsafeMap.java         |  2 +-
 .../util/tostring/CircularStringBuilder.java       |  2 +-
 .../visor/cache/index/IndexRebuildStatusTask.java  |  2 +-
 .../diagnostic/VisorPageLocksTrackerArgs.java      |  2 +-
 .../java/org/apache/ignite/lang/IgniteBiTuple.java |  2 +-
 .../priorityqueue/PriorityQueueCollisionSpi.java   |  2 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java    |  2 +-
 .../ignite/spi/indexing/noop/NoopIndexingSpi.java  |  2 +-
 .../apache/ignite/stream/StreamTransformer.java    |  2 +-
 .../java/org/jsr166/ConcurrentLinkedHashMap.java   |  8 +--
 .../store/StoreResourceInjectionSelfTest.java      |  4 +-
 .../TestJdbcPojoStoreFactoryWithHangWriteAll.java  |  2 +-
 .../failure/FailureHandlerTriggeredTest.java       |  2 +-
 .../GridMultithreadedJobStealingSelfTest.java      | 12 ++--
 ...ectByteBufferStreamImplV2ByteOrderSelfTest.java | 18 +++---
 .../optimized/OptimizedMarshallerTest.java         | 12 ++--
 ...InterceptorPartitionCounterLocalSanityTest.java | 12 ++--
 .../processors/cache/CacheRebalancingSelfTest.java |  2 +-
 .../cache/CacheStopAndDestroySelfTest.java         | 20 +++----
 .../cache/GridCacheEntryVersionSelfTest.java       |  2 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java      |  2 +-
 .../cache/GridCacheTtlManagerLoadTest.java         |  2 +-
 .../IgniteCacheClusterReadOnlyModeSelfTest.java    |  4 +-
 .../processors/cache/IgniteCacheGroupsTest.java    |  2 +-
 ...acheAbstractDataStructuresFailoverSelfTest.java |  2 +-
 .../GridCacheAtomicStampedApiSelfAbstractTest.java |  2 +-
 .../IgniteAtomicStampedClusterReadOnlyTest.java    |  2 +-
 .../datastructures/IgniteLockAbstractSelfTest.java |  2 +-
 .../SemaphoreFailoverNoWaitingAcquirerTest.java    |  2 +-
 .../distributed/CacheBlockOnReadAbstractTest.java  |  2 +-
 .../GridCacheMultiNodeLockAbstractTest.java        | 12 ++--
 .../distributed/GridExchangeFreeSwitchTest.java    |  8 +--
 .../dht/GridCacheTxNodeFailureSelfTest.java        |  2 +-
 .../dht/IgniteCacheMultiTxLockSelfTest.java        |  2 +-
 ...lanceIsProcessingWhenAssignmentIsEmptyTest.java |  2 +-
 .../GridCacheRebalancingSyncSelfTest.java          |  2 +-
 ...teCacheStoreSessionWriteBehindAbstractTest.java |  4 +-
 ...heMvccAbstractBasicCoordinatorFailoverTest.java |  2 +-
 .../cache/mvcc/CacheMvccAbstractTest.java          |  6 +-
 .../mvcc/CacheMvccConfigurationValidationTest.java |  6 +-
 ...sCacheObjectBinaryProcessorOnDiscoveryTest.java |  2 +-
 .../IgnitePdsCacheRebalancingAbstractTest.java     |  2 +-
 ...itePdsCacheStartStopWithFreqCheckpointTest.java |  2 +-
 .../IgnitePdsSporadicDataRecordsOnBackupTest.java  |  2 +-
 ...gnitePdsRebalancingOnNotStableTopologyTest.java |  2 +-
 .../db/file/IgnitePdsThreadInterruptionTest.java   |  2 +-
 .../db/wal/WalDeletionArchiveAbstractTest.java     |  4 +-
 .../pagelocktracker/log/PageLockLogTest.java       |  6 +-
 .../IgniteChangeGlobalStateCacheTest.java          |  2 +-
 .../wal/AbstractWalDeltaConsistencyTest.java       |  2 +-
 .../cache/query/CacheDataPageScanQueryTest.java    | 10 ++--
 .../cache/query/IndexingSpiQuerySelfTest.java      |  2 +-
 .../CacheContinuousQueryCounterAbstractTest.java   |  4 +-
 .../CacheContinuousQueryRandomOperationsTest.java  |  2 +-
 .../continuous/CacheKeepBinaryIterationTest.java   |  4 +-
 .../GridCacheContinuousQueryAbstractSelfTest.java  | 16 ++---
 .../GridCacheWriteBehindStoreAbstractSelfTest.java |  2 +-
 ...iteBehindStorePartitionedMultiNodeSelfTest.java |  2 +-
 .../processors/database/BPlusTreeSelfTest.java     | 24 ++++----
 .../IgniteDataStreamerPerformanceTest.java         |  2 +-
 .../IgniteMessagingConfigVariationFullApiTest.java |  6 +-
 .../ignite/internal/util/GridArraysSelfTest.java   | 20 +++----
 .../GridOffHeapMapPerformanceAbstractTest.java     |  2 +-
 .../util/tostring/GridToStringBuilderSelfTest.java |  2 +-
 .../GridBoundedConcurrentOrderedMapSelfTest.java   |  4 +-
 .../GridContinuousOperationsLoadTest.java          | 10 ++--
 .../marshaller/GridMarshallerAbstractTest.java     |  2 +-
 .../messaging/IgniteMessagingSendAsyncTest.java    |  2 +-
 .../java/org/apache/ignite/p2p/GridP2PTestJob.java |  2 +-
 .../platform/PlatformEventsWriteEventTask.java     |  2 +-
 .../tcp/TcpCommunicationSpiDropNodesTest.java      |  2 +-
 .../tcp/TcpDiscoveryNodeJoinAndFailureTest.java    |  2 +-
 .../apache/ignite/testframework/GridTestUtils.java |  2 +-
 .../testframework/junits/GridAbstractTest.java     |  6 +-
 .../testframework/test/VariationsIteratorTest.java | 10 ++--
 .../testsuites/IgniteCacheMvccTestSuite7.java      |  4 +-
 .../apache/ignite/util/GridLongListSelfTest.java   | 10 ++--
 .../development/utils/IgniteWalConverterTest.java  |  8 +--
 .../ignite/tests/p2p/AlwaysTruePredicate.java      |  2 +-
 .../cache/hibernate/HibernateCacheProxy.java       |  4 +-
 .../processors/query/h2/database/H2TreeIndex.java  |  2 +-
 .../query/h2/database/io/AbstractH2LeafIO.java     |  2 +-
 .../processors/query/h2/dml/DmlAstUtils.java       |  2 +-
 .../processors/query/h2/opt/GridH2MetaTable.java   |  2 +-
 .../query/h2/opt/join/CollocationModel.java        |  2 +-
 .../query/h2/opt/join/DistributedJoinContext.java  |  2 +-
 .../query/h2/opt/join/DistributedLookupBatch.java  |  2 +-
 .../query/h2/sql/GridSqlQuerySplitter.java         | 14 ++---
 .../query/h2/twostep/AbstractReducer.java          |  4 +-
 .../query/h2/twostep/GridMapQueryExecutor.java     |  2 +-
 .../query/h2/twostep/GridReduceQueryExecutor.java  | 10 ++--
 .../processors/query/h2/twostep/ReduceIndex.java   |  4 +-
 .../query/h2/twostep/ReducePartitionMapper.java    | 10 ++--
 .../visor/verify/ValidateIndexesClosure.java       |  2 +-
 .../cache/BinaryTypeMismatchLoggingTest.java       |  2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java    |  4 +-
 .../processors/cache/GridCacheOffHeapSelfTest.java |  2 +-
 .../cache/GridCacheQuerySimpleBenchmark.java       |  4 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java    |  2 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java    |  4 +-
 .../cache/IgniteCacheCollocatedQuerySelfTest.java  |  8 +--
 .../cache/IgniteCacheDistributedJoinTest.java      | 12 ++--
 .../IgniteCacheFieldsQueryNoDataSelfTest.java      |  2 +-
 .../cache/IgniteCacheLargeResultSelfTest.java      |  2 +-
 .../cache/IgniteCacheOffheapEvictQueryTest.java    |  4 +-
 .../cache/IgniteCacheOffheapIndexScanTest.java     |  2 +-
 .../cache/IgniteCacheQueryLoadSelfTest.java        |  2 +-
 .../IgniteCacheQueryMultiThreadedSelfTest.java     |  2 +-
 .../IgniteCacheSqlQueryMultiThreadedSelfTest.java  |  2 +-
 ...heClientQueryReplicatedNodeRestartSelfTest.java |  8 +--
 .../near/IgniteCacheQueryNodeRestartSelfTest.java  |  2 +-
 .../near/IgniteCacheQueryNodeRestartSelfTest2.java |  2 +-
 .../cache/index/H2ConnectionLeaksSelfTest.java     |  2 +-
 .../cache/index/H2DynamicTableSelfTest.java        |  2 +-
 .../cache/index/IgniteDecimalSelfTest.java         |  2 +-
 ...acheMvccAbstractSqlCoordinatorFailoverTest.java |  6 +-
 .../cache/mvcc/CacheMvccBackupsAbstractTest.java   |  6 +-
 .../cache/mvcc/CacheMvccSqlTxModesTest.java        |  2 +-
 .../mvcc/CacheMvccSqlTxQueriesAbstractTest.java    |  4 +-
 ...cheMvccSqlTxQueriesWithReducerAbstractTest.java | 38 ++++++------
 .../cache/mvcc/MvccRepeatableReadBulkOpsTest.java  |  2 +-
 .../IgniteDbSingleNodeWithIndexingPutGetTest.java  | 14 ++---
 .../query/IgniteCacheGroupsCompareQueryTest.java   |  2 +-
 .../query/IgniteSqlParameterizedQueryTest.java     |  2 +-
 .../processors/query/IgniteSqlRoutingTest.java     |  2 +-
 .../query/IgniteSqlSplitterSelfTest.java           | 16 ++---
 .../processors/query/LocalQueryLazyTest.java       |  2 +-
 .../query/MemLeakOnSqlWithClientReconnectTest.java |  2 +-
 .../processors/query/RunningQueriesTest.java       |  2 +-
 .../query/SqlFieldTypeValidationTypesTest.java     | 12 ++--
 .../processors/query/SqlSystemViewsSelfTest.java   |  4 +-
 .../query/h2/IgniteSqlQueryMinMaxTest.java         | 70 +++++++++++-----------
 .../processors/query/h2/QueryDataPageScanTest.java | 38 ++++++------
 .../query/h2/sql/AbstractH2CompareQueryTest.java   |  6 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java       |  2 +-
 .../query/h2/sql/GridQueryParsingTest.java         |  4 +-
 .../query/h2/sql/H2CompareBigQueryTest.java        |  2 +-
 ...neOrSinglePartitionsQueryOptimizationsTest.java |  4 +-
 .../h2/twostep/TableViewSubquerySelfTest.java      |  2 +-
 .../apache/ignite/ml/dataset/DatasetBuilder.java   |  2 +-
 .../bootstrapping/BootstrappedDatasetBuilder.java  |  2 +-
 .../ignite/ml/environment/logging/MLLogger.java    |  2 +-
 .../ml/preprocessing/PreprocessingTrainer.java     |  2 +-
 .../normalization/NormalizationPreprocessor.java   |  2 +-
 .../selection/split/TrainTestDatasetSplitter.java  |  2 +-
 .../split/mapper/SHA256UniformMapper.java          |  2 +-
 .../impl/local/LocalDatasetBuilderTest.java        |  2 +-
 .../java/org/apache/ignite/ml/math/BlasTest.java   |  4 +-
 .../vector/VectorImplementationsFixtures.java      |  2 +-
 .../discrete/DiscreteNaiveBayesModelTest.java      |  2 +-
 .../discrete/DiscreteNaiveBayesTrainerTest.java    |  2 +-
 .../gini/GiniImpurityMeasureCalculatorTest.java    | 26 ++++----
 .../mse/MSEImpurityMeasureCalculatorTest.java      | 18 +++---
 .../data/impurity/GiniFeatureHistogramTest.java    |  4 +-
 .../data/impurity/ImpurityHistogramTest.java       |  4 +-
 .../opencensus/OpenCensusSqlNativeTracingTest.java |  4 +-
 .../GridSpringResourceInjectionSelfTest.java       |  2 +-
 .../scanners/file/UriDeploymentFileScanner.java    |  2 +-
 .../cache/IgniteCacheAbstractBenchmark.java        |  2 +-
 .../spi/discovery/zk/internal/ZkIgnitePaths.java   |  2 +-
 .../zk/ZookeeperDiscoverySpiTestUtil.java          |  4 +-
 244 files changed, 549 insertions(+), 539 deletions(-)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index dae4106..117b54b 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -98,6 +98,14 @@
         </module>
 
         <!--
+            Checks that there is whitespace after a token.
+            See: https://checkstyle.sourceforge.io/config_whitespace.html#WhitespaceAfter
+        -->
+        <module name="WhitespaceAfter">
+            <property name="tokens" value="COMMA, SEMI"/>
+        </module>
+
+        <!--
             Checks that there is no whitespace before a token.
             See: https://checkstyle.sourceforge.io/config_whitespace.html#NoWhitespaceBefore
         -->
diff --git a/examples/src/main/spark/org/apache/ignite/examples/spark/SharedRDDExample.java b/examples/src/main/spark/org/apache/ignite/examples/spark/SharedRDDExample.java
index ed6b89d..5024f3e 100644
--- a/examples/src/main/spark/org/apache/ignite/examples/spark/SharedRDDExample.java
+++ b/examples/src/main/spark/org/apache/ignite/examples/spark/SharedRDDExample.java
@@ -64,7 +64,7 @@ public class SharedRDDExample {
 
         // Creates Ignite context with specific configuration and runs Ignite in the embedded mode.
         JavaIgniteContext<Integer, Integer> igniteContext = new JavaIgniteContext<Integer, Integer>(
-            sparkContext,"examples/config/spark/example-shared-rdd.xml", false);
+            sparkContext, "examples/config/spark/example-shared-rdd.xml", false);
 
         // Create a Java Ignite RDD of Type (Int,Int) Integer Pair.
         JavaIgniteRDD<Integer, Integer> sharedRDD = igniteContext.<Integer, Integer>fromCache("sharedRDD");
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
index af843cb..9013f49 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
@@ -302,7 +302,7 @@ public class BPlusTreeBenchmark extends JmhAbstractBenchmark {
         }
 
         /** {@inheritDoc} */
-        @Override public Long getLookupRow(BPlusTree<Long,?> tree, long pageAddr, int idx) {
+        @Override public Long getLookupRow(BPlusTree<Long, ?> tree, long pageAddr, int idx) {
             return PageUtils.getLong(pageAddr, offset(idx));
         }
     }
@@ -338,7 +338,7 @@ public class BPlusTreeBenchmark extends JmhAbstractBenchmark {
         }
 
         /** {@inheritDoc} */
-        @Override public Long getLookupRow(BPlusTree<Long,?> tree, long pageAddr, int idx) {
+        @Override public Long getLookupRow(BPlusTree<Long, ?> tree, long pageAddr, int idx) {
             return PageUtils.getLong(pageAddr, offset(idx));
         }
     }
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
index abee822..d658934 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
@@ -75,7 +75,7 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
      * @return Cache configuration for non binary marshaller tests.
      */
     private CacheConfiguration nonBinCacheConfig() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
@@ -91,7 +91,7 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
      * @return Cache configuration for binary marshaller tests.
      */
     final CacheConfiguration binaryCacheConfig() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
index 756b904..b53c478 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
@@ -67,7 +67,7 @@ public class JdbcBulkLoadSelfTest extends GridCommonAbstractTest {
     private IgniteConfiguration getConfiguration0(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
index acb594f..c3d9308 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
@@ -67,7 +67,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration(@NotNull String name, Class<?> clsK, Class<?> clsV) {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setName(name);
         cache.setCacheMode(PARTITIONED);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
index 62af862..b2c9cc4 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -49,7 +49,7 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
index 6c1b803..07131cc 100755
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -109,7 +109,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration(@NotNull String name) {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setName(name);
         cache.setCacheMode(PARTITIONED);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
index 7a8eb10..443cba6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
@@ -64,7 +64,7 @@ public class JdbcNoCacheStreamingSelfTest extends GridCommonAbstractTest {
     private IgniteConfiguration getConfiguration0(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
index 4eaa7f7..98998d2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
@@ -71,7 +71,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
index 97d5a6e..72b580f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
@@ -71,7 +71,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
index f9ee85f..8e9b21b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
@@ -56,7 +56,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
index 219c496..95f760b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
@@ -74,7 +74,7 @@ public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest {
     private IgniteConfiguration getConfiguration0(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
@@ -326,7 +326,7 @@ public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest {
 
                 return null;
             }
-        }, SQLException.class,"Streaming mode supports only INSERT commands without subqueries.");
+        }, SQLException.class, "Streaming mode supports only INSERT commands without subqueries.");
     }
 
     /**
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
index 726dab9..1eac2fb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
@@ -48,7 +48,7 @@ public class JdbcStreamingToPublicCacheTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
index 44fa5ba..77476d9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractJdbcPojoQuerySelfTest extends GridCommonAbstractTe
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setWriteSynchronizationMode(FULL_SYNC);
         cache.setAtomicityMode(TRANSACTIONAL);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index 8c952ea..182ad0e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -60,7 +60,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
index 0a83688..5d40617 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
@@ -909,7 +909,7 @@ public abstract class JdbcErrorsAbstractSelfTest extends GridCommonAbstractTest
     /**
      * Cache store stub.
      */
-    protected class TestCacheStore extends CacheStoreAdapter<Object,Object> implements Serializable {
+    protected class TestCacheStore extends CacheStoreAdapter<Object, Object> implements Serializable {
         /** {@inheritDoc} */
         @Override public Object load(Object key) throws CacheLoaderException {
             return null;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 7583aa7..34c0aae 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -68,7 +68,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index 4b14531..55d6a63 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -69,7 +69,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index 3c0d46c..5cc41d2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -54,7 +54,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
index 25f2014..c3871c2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
@@ -127,7 +127,7 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest extends JdbcThinAbstr
      * @return Cache configuration for non binary marshaller tests.
      */
     private CacheConfiguration nonBinCacheConfig() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
@@ -143,7 +143,7 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest extends JdbcThinAbstr
      * @return Cache configuration for binary marshaller tests.
      */
     final CacheConfiguration binaryCacheConfig() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
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 013bd37..3e28261 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
@@ -134,7 +134,7 @@ public class JdbcThinBulkLoadSelfTest extends JdbcThinAbstractDmlStatementSelfTe
      */
     @SuppressWarnings("unchecked")
     private CacheConfiguration cacheConfigWithIndexedTypes() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(cacheMode);
         cache.setAtomicityMode(atomicityMode);
@@ -160,7 +160,7 @@ public class JdbcThinBulkLoadSelfTest extends JdbcThinAbstractDmlStatementSelfTe
      * @return The cache configuration.
      */
     private CacheConfiguration cacheConfigWithQueryEntity() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
index 4b2242e..be319e7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
@@ -59,7 +59,7 @@ public class JdbcThinComplexQuerySelfTest extends JdbcThinAbstractSelfTest {
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration() {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index 5975eb0..9f32479 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -89,7 +89,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration(QueryEntity qryEntity) {
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
index 3f73e24..84cff1b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
@@ -82,7 +82,7 @@ public class JdbcThinPartitionAwarenessSelfTest extends JdbcThinAbstractSelfTest
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
@@ -619,7 +619,7 @@ public class JdbcThinPartitionAwarenessSelfTest extends JdbcThinAbstractSelfTest
      */
     @SuppressWarnings("unchecked")
     protected CacheConfiguration<Object, Object> prepareCacheConfig(String cacheName) {
-        CacheConfiguration<Object,Object> cache = defaultCacheConfiguration();
+        CacheConfiguration<Object, Object> cache = defaultCacheConfiguration();
 
         cache.setName(cacheName);
         cache.setCacheMode(PARTITIONED);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
index 5e1b757..8dce9e0 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
@@ -92,7 +92,7 @@ public class JdbcThinPreparedStatementSelfTest extends JdbcThinAbstractSelfTest
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
index 9adc6a0..4f7e759 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
@@ -72,7 +72,7 @@ public class JdbcThinResultSetSelfTest extends JdbcThinAbstractSelfTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementCancelSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementCancelSelfTest.java
index d66a3ba..f76b264 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementCancelSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementCancelSelfTest.java
@@ -88,7 +88,7 @@ public class JdbcThinStatementCancelSelfTest extends JdbcThinAbstractSelfTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
index 9d1ddb0..9924bb3 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
@@ -64,7 +64,7 @@ public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementTimeoutSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementTimeoutSelfTest.java
index b4f37a5..681c7ae 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementTimeoutSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementTimeoutSelfTest.java
@@ -63,7 +63,7 @@ public class JdbcThinStatementTimeoutSelfTest extends JdbcThinAbstractSelfTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsBaseTest.java b/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsBaseTest.java
index 32c5089..e2d8054 100644
--- a/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsBaseTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/qa/query/WarningOnBigQueryResultsBaseTest.java
@@ -193,10 +193,10 @@ public class WarningOnBigQueryResultsBaseTest extends AbstractIndexingCommonTest
     protected void checkDurations(List<Long> durations) {
         assertFalse(F.isEmpty(durations));
 
-        assertTrue("Invalid durations: " + durations,durations.get(0) >= 0);
+        assertTrue("Invalid durations: " + durations, durations.get(0) >= 0);
 
         for (int i = 0; i < durations.size() - 1; ++i) {
-            assertTrue("Invalid durations: " + durations,durations.get(i + 1) >= 0);
+            assertTrue("Invalid durations: " + durations, durations.get(i + 1) >= 0);
             assertTrue("Invalid durations: " + durations, durations.get(i) <= durations.get(i + 1));
         }
     }
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
index 63cf8b1..cbcaba4 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
@@ -123,7 +123,7 @@ public class FoldersReuseCompatibilityTest extends IgnitePersistenceCompatibilit
         final PersistenceBasicCompatibilityTest.TestStringContainerToBePrinted actual = (PersistenceBasicCompatibilityTest.TestStringContainerToBePrinted)ignite.cache(CACHE_NAME).get(KEY_OBJ);
         assertEquals(VAL, actual.data);
 
-        assertNodeIndexesInFolder();// should not create any new style directories
+        assertNodeIndexesInFolder(); // should not create any new style directories
 
         stopAllGrids();
     }
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java
index 754ecd3..bd7e3da 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java
@@ -173,7 +173,7 @@ public abstract class AbstractPageCompressionIntegrationTest extends GridCommonA
             this.str = i + "bla bla bla!";
             this.i = -i;
             this.x = 0xffaabbccdd773311L + i;
-            this.id = new UUID(i,-i);
+            this.id = new UUID(i, -i);
         }
 
         /** {@inheritDoc} */
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionConfigurationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionConfigurationTest.java
index b554d78..91fc492 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionConfigurationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionConfigurationTest.java
@@ -46,13 +46,13 @@ public class CompressionConfigurationTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String instanceName) throws Exception {
-        CacheConfiguration<Object,Object> ccfg1 = new CacheConfiguration<>("cache1");
+        CacheConfiguration<Object, Object> ccfg1 = new CacheConfiguration<>("cache1");
 
         ccfg1.setDiskPageCompression(compression1);
         ccfg1.setDiskPageCompressionLevel(level1);
         ccfg1.setGroupName("myGroup");
 
-        CacheConfiguration<Object,Object> ccfg2 = new CacheConfiguration<>("cache2");
+        CacheConfiguration<Object, Object> ccfg2 = new CacheConfiguration<>("cache2");
 
         ccfg2.setDiskPageCompression(compression2);
         ccfg2.setDiskPageCompressionLevel(level2);
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
index 683a94f..4a4a250 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
@@ -879,7 +879,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest {
 
         checkIo(io, page);
 
-        Function<ByteBuffer,List<Bytes>> getContents = (buf) -> {
+        Function<ByteBuffer, List<Bytes>> getContents = (buf) -> {
             try {
                 long addr = bufferAddress(buf);
 
@@ -1046,7 +1046,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public byte[] getLookupRow(BPlusTree<byte[],?> tree, long pageAddr, int idx) {
+        @Override public byte[] getLookupRow(BPlusTree<byte[], ?> tree, long pageAddr, int idx) {
             return PageUtils.getBytes(pageAddr, offset(idx), itemSize);
         }
     }
@@ -1075,7 +1075,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public byte[] getLookupRow(BPlusTree<byte[],?> tree, long pageAddr, int idx) {
+        @Override public byte[] getLookupRow(BPlusTree<byte[], ?> tree, long pageAddr, int idx) {
             return PageUtils.getBytes(pageAddr, offset(idx), itemSize);
         }
     }
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
index 3261b0e..27cb3cf 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
@@ -92,7 +92,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
 
         String cacheName = "test";
 
-        CacheConfiguration<Integer,TestVal> ccfg = new CacheConfiguration<Integer,TestVal>()
+        CacheConfiguration<Integer, TestVal> ccfg = new CacheConfiguration<Integer, TestVal>()
             .setName(cacheName)
             .setBackups(0)
             .setAtomicityMode(ATOMIC)
@@ -100,7 +100,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
             .setDiskPageCompression(compression)
             .setDiskPageCompressionLevel(compressionLevel);
 
-        IgniteCache<Integer,TestVal> cache = ignite.getOrCreateCache(ccfg);
+        IgniteCache<Integer, TestVal> cache = ignite.getOrCreateCache(ccfg);
 
         int cnt = 2_000;
 
@@ -133,7 +133,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
         else
             assertTrue(sparseStoreSize < 0);
 
-        GridCacheContext<?,?> cctx = ignite.cachex(cacheName).context();
+        GridCacheContext<?, ?> cctx = ignite.cachex(cacheName).context();
 
         int cacheId = cctx.cacheId();
         int groupId = cctx.groupId();
@@ -187,7 +187,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
 
         String cacheName = "test";
 
-        CacheConfiguration<Integer,TestVal> ccfg = new CacheConfiguration<Integer,TestVal>()
+        CacheConfiguration<Integer, TestVal> ccfg = new CacheConfiguration<Integer, TestVal>()
             .setName(cacheName)
             .setBackups(0)
             .setAtomicityMode(ATOMIC)
@@ -198,7 +198,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
 
         ignite.getOrCreateCache(ccfg);
 
-        IgniteInternalCache<Integer,TestVal> cache = ignite.cachex(cacheName);
+        IgniteInternalCache<Integer, TestVal> cache = ignite.cachex(cacheName);
 
         MetricRegistry mreg = ignite.context().metric().registry(
             metricName(CACHE_GROUP_METRICS_PREFIX, cacheName));
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java
index b589eaf..eccb021 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java
@@ -74,8 +74,8 @@ public class WalPageCompressionIntegrationTest extends AbstractPageCompressionIn
             .setAtomicityMode(ATOMIC)
             .setIndexedTypes(Integer.class, TestVal.class);
 
-        IgniteCache<Integer,TestVal> cache0 = ignite0.getOrCreateCache(ccfg);
-        IgniteCache<Integer,TestVal> cache1 = ignite1.getOrCreateCache(ccfg);
+        IgniteCache<Integer, TestVal> cache0 = ignite0.getOrCreateCache(ccfg);
+        IgniteCache<Integer, TestVal> cache1 = ignite1.getOrCreateCache(ccfg);
 
         int cnt = 20_000;
 
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/query/KillCommand.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/query/KillCommand.java
index af2dbd5..c54360a 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/query/KillCommand.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/query/KillCommand.java
@@ -207,7 +207,7 @@ public class KillCommand extends AbstractCommand<Object> {
         params.put("query_id", "Query identifier.");
 
         Command.usage(log, "Kill scan query by node id, cache name and query id:", KILL,
-            params, SCAN.toString(),"origin_node_id", "cache_name", "query_id");
+            params, SCAN.toString(), "origin_node_id", "cache_name", "query_id");
 
         params.clear();
         params.put("origin_node_id", "Originating node id.");
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java
index c4b3aa6..2d74e02 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java
@@ -431,7 +431,7 @@ public class CommandHandlerParsingTest {
                         BaselineArguments arg = ((BaselineCommand)args.command()).arg();
 
                         assertEquals(baselineAct, arg.getCmd().text());
-                        assertEquals(new HashSet<>(asList("c_id1","c_id2")), new HashSet<>(arg.getConsistentIds()));
+                        assertEquals(new HashSet<>(asList("c_id1", "c_id2")), new HashSet<>(arg.getConsistentIds()));
                     }
 
                     break;
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java
index fde7f72..4014d4e 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java
@@ -567,7 +567,7 @@ public class GridCommandHandlerClusterByClassTest extends GridCommandHandlerClus
     public void testCacheIdleVerifyDump() throws Exception {
         IgniteEx ignite = crd;
 
-        int keysCount = 20;//less than parts number for ability to check skipZeros flag.
+        int keysCount = 20; //less than parts number for ability to check skipZeros flag.
 
         createCacheAndPreload(ignite, keysCount);
 
@@ -780,7 +780,7 @@ public class GridCommandHandlerClusterByClassTest extends GridCommandHandlerClus
 
         while (partIdMatcher.find()) {
             assertEquals(i++, Integer.parseInt(partIdMatcher.group(1)));
-            assertTrue(primaryMatcher.find());//primary node should be first in every line
+            assertTrue(primaryMatcher.find()); //primary node should be first in every line
         }
 
         assertEquals(expectedPartsCount, i);
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 173b850..80c33ee 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
@@ -2151,7 +2151,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
 
         String outputStr = testOut.toString();
 
-        assertContains(log,outputStr, "The check procedure failed on 1 node.");
+        assertContains(log, outputStr, "The check procedure failed on 1 node.");
         assertContains(log, outputStr, "The check procedure has finished, no conflicts have been found.");
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index 7f71f1d..41a4b4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -303,7 +303,7 @@ public class QueryEntity implements Serializable {
                 queryFieldsToAdd.add(new QueryField(
                     targetFieldName,
                     targetFieldType,
-                    !contains(target.getNotNullFields(),targetFieldName),
+                    !contains(target.getNotNullFields(), targetFieldName),
                     getFromMap(target.getDefaultFieldValues(), targetFieldName),
                     precision == null ? -1 : precision,
                     scale == null ? -1 : scale
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java
index a88c277..1d0dfc0 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java
@@ -44,7 +44,7 @@ import org.apache.ignite.cache.eviction.EvictableEntry;
  * <p>
  * User defined comparator should implement {@link Serializable} interface.
  */
-public class SortedEvictionPolicyFactory<K,V> extends AbstractEvictionPolicyFactory<SortedEvictionPolicy<K, V>> {
+public class SortedEvictionPolicyFactory<K, V> extends AbstractEvictionPolicyFactory<SortedEvictionPolicy<K, V>> {
     /** */
     private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 1137022..afce846 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -2417,7 +2417,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
      * @return {@code this} for chaining.
      * @see #setDiskPageCompressionLevel
      */
-    public CacheConfiguration<K,V> setDiskPageCompression(DiskPageCompression diskPageCompression) {
+    public CacheConfiguration<K, V> setDiskPageCompression(DiskPageCompression diskPageCompression) {
         this.diskPageCompression = diskPageCompression;
 
         return this;
@@ -2440,7 +2440,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
      *                             {@link DiskPageCompression#LZ4 LZ4}: from {@code 0} to {@code 17} (default {@code 0}).
      * @return {@code this} for chaining.
      */
-    public CacheConfiguration<K,V> setDiskPageCompressionLevel(Integer diskPageCompressionLevel) {
+    public CacheConfiguration<K, V> setDiskPageCompressionLevel(Integer diskPageCompressionLevel) {
         this.diskPageCompressionLevel = diskPageCompressionLevel;
 
         return this;
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java
index b00be51..688ea3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java
@@ -66,10 +66,10 @@ public class CacheConsistencyViolationEvent<K, V> extends EventAdapter {
     private static final long serialVersionUID = 0L;
 
     /** Represents original values of entries that were affected by a cache operation.*/
-    final Map<UUID /*Node*/, Map<K,V>> originalEntries;
+    final Map<UUID /*Node*/, Map<K, V>> originalEntries;
 
     /** Collection of repaired entries. */
-    final Map<K,V> repairedEntries;
+    final Map<K, V> repairedEntries;
 
     /**
      * Creates a new instance of CacheConsistencyViolationEvent.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index f2b904e..f640a08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -66,7 +66,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
     private static final long serialVersionUID = 0L;
 
     /** Default callback. */
-    private static final IgniteBiPredicate<UUID,Event> DFLT_CALLBACK = new P2<UUID, Event>() {
+    private static final IgniteBiPredicate<UUID, Event> DFLT_CALLBACK = new P2<UUID, Event>() {
         @Override public boolean apply(UUID uuid, Event e) {
             return true;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
index 77ae58a..11a5016 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
@@ -508,7 +508,7 @@ class TcpClientChannel implements ClientChannel, ClientMessageHandler, ClientCon
                 writer.writeString(pwd);
             }
 
-            writer.out().writeInt(0, writer.out().position() - 4);// actual size
+            writer.out().writeInt(0, writer.out().position() - 4); // actual size
 
             write(writer.out().arrayCopy(), writer.out().position());
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java
index a159043..3852453 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java
@@ -228,7 +228,7 @@ public class JdbcResultSet implements ResultSet {
 
         // Connections from new clients send queries with new tasks, so we have to continue in the same manner
         JdbcQueryTask qryTask = JdbcQueryTaskV3.createTask(loc ? ignite : null, conn.cacheName(), conn.schemaName(),
-            null,true, loc, null, fetchSize, uuid, conn.isLocalQuery(), conn.isCollocatedQuery(),
+            null, true, loc, null, fetchSize, uuid, conn.isLocalQuery(), conn.isCollocatedQuery(),
             conn.isDistributedJoins(), conn.isEnforceJoinOrder(), conn.isLazy(), updateMetadata, false);
 
         try {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index e686e55..b992f7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -428,7 +428,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
             }
         }
 
-        return res == null ? Collections.<String, Map<UUID,Boolean>>emptyMap() : res;
+        return res == null ? Collections.<String, Map<UUID, Boolean>>emptyMap() : res;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
index ad15c1b..a604bc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
@@ -193,7 +193,7 @@ public class CacheEvictableEntryImpl<K, V> implements EvictableEntry<K, V> {
 
     /** {@inheritDoc} */
     @Override public <T> boolean replaceMeta(T curVal, T newVal) {
-        return cached.replaceMeta(META_KEY,curVal, newVal);
+        return cached.replaceMeta(META_KEY, curVal, newVal);
     }
 
     /** {@inheritDoc} */
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 2d28b5a..8bbde01 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
@@ -942,7 +942,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
 
             case 114:
             case 120: {
-                processMessage(nodeId, msg, c);// Will be handled by Rebalance Demander.
+                processMessage(nodeId, msg, c); // Will be handled by Rebalance Demander.
             }
 
             break;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 5f39b50..b0221a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2156,7 +2156,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
                     if (transformCloClsName != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_READ)) {
                         evtOld = cctx.unwrapTemporary(old);
 
-                        cctx.events().addEvent(partition(), key, cctx.localNodeId(),null, null,
+                        cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, null,
                             (GridCacheVersion)null, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld,
                             evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepBinary);
                     }
@@ -2526,7 +2526,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
             if (intercept && c.wasIntercepted) {
                 assert c.op == UPDATE || c.op == DELETE : c.op;
 
-                Cache.Entry<?,?> entry = new CacheLazyEntry<>(
+                Cache.Entry<?, ?> entry = new CacheLazyEntry<>(
                     cctx,
                     key,
                     null,
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 67ee23f..faa98de 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
@@ -1786,7 +1786,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      */
     void prepareStartCaches(Collection<StartCacheInfo> startCacheInfos) throws IgniteCheckedException {
         prepareStartCaches(startCacheInfos, (data, operation) -> {
-            operation.apply(data);// PROXY
+            operation.apply(data); // PROXY
         });
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index faa2005..4d613d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -1483,7 +1483,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
         if (!dataBag.commonDataCollectedFor(BINARY_PROC.ordinal())) {
             Map<Integer, BinaryMetadataHolder> res = U.newHashMap(metadataLocCache.size());
 
-            for (Map.Entry<Integer,BinaryMetadataHolder> e : metadataLocCache.entrySet()) {
+            for (Map.Entry<Integer, BinaryMetadataHolder> e : metadataLocCache.entrySet()) {
                 if (!e.getValue().removing())
                     res.put(e.getKey(), e.getValue());
             }
@@ -1496,7 +1496,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
     @Override public void collectJoiningNodeData(DiscoveryDataBag dataBag) {
         Map<Integer, BinaryMetadataHolder> res = U.newHashMap(metadataLocCache.size());
 
-        for (Map.Entry<Integer,BinaryMetadataHolder> e : metadataLocCache.entrySet())
+        for (Map.Entry<Integer, BinaryMetadataHolder> e : metadataLocCache.entrySet())
             res.put(e.getKey(), e.getValue());
 
         dataBag.addJoiningNodeData(BINARY_PROC.ordinal(), (Serializable) res);
@@ -1504,7 +1504,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
 
     /** {@inheritDoc} */
     @Override public void onJoiningNodeDataReceived(DiscoveryDataBag.JoiningNodeDiscoveryData data) {
-        Map<Integer,BinaryMetadataHolder> newNodeMeta = (Map<Integer, BinaryMetadataHolder>) data.joiningNodeData();
+        Map<Integer, BinaryMetadataHolder> newNodeMeta = (Map<Integer, BinaryMetadataHolder>) data.joiningNodeData();
 
         if (newNodeMeta == null)
             return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridClientPartitionTopology.java
index 4df8273..bd3d3bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridClientPartitionTopology.java
@@ -969,7 +969,7 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology {
             node2part.put(parts.nodeId(), parts);
 
             // Add new mappings.
-            for (Map.Entry<Integer,GridDhtPartitionState> e : parts.entrySet()) {
+            for (Map.Entry<Integer, GridDhtPartitionState> e : parts.entrySet()) {
                 int p = e.getKey();
 
                 Set<UUID> ids = part2node.get(p);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java
index d522eb4..0f6c4a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java
@@ -46,7 +46,7 @@ public class GridDhtPartitionsReservation implements GridReservable {
     private final Object appKey;
 
     /** */
-    private final GridCacheContext<?,?> cctx;
+    private final GridCacheContext<?, ?> cctx;
 
     /** */
     private final AffinityTopologyVersion topVer;
@@ -65,7 +65,7 @@ public class GridDhtPartitionsReservation implements GridReservable {
      * @param cctx Cache context.
      * @param appKey Application key for reservation.
      */
-    public GridDhtPartitionsReservation(AffinityTopologyVersion topVer, GridCacheContext<?,?> cctx, Object appKey) {
+    public GridDhtPartitionsReservation(AffinityTopologyVersion topVer, GridCacheContext<?, ?> cctx, Object appKey) {
         assert topVer != null;
         assert cctx != null;
         assert appKey != null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 4b4f194..6906a0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -415,7 +415,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
                     if (cctx.statisticsEnabled() && !skipVals && !affNode.isLocal() && !isNear)
                         cache().metrics0().onRead(false);
 
-                    if (!checkRetryPermits(key,affNode,mapped))
+                    if (!checkRetryPermits(key, affNode, mapped))
                         return saved;
 
                     if (!affNodes.contains(cctx.localNode())) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index b88f74c..14767e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -1044,7 +1044,7 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo
 
                                 if (cand != null) {
                                     if (tx == null && !cand.reentry())
-                                        cctx.mvcc().addExplicitLock(threadId,cand,topVer);
+                                        cctx.mvcc().addExplicitLock(threadId, cand, topVer);
 
                                     IgniteBiTuple<GridCacheVersion, CacheObject> val = entry.versionedValue();
 
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 fe63918..8fa76c8 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
@@ -591,7 +591,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
     ) throws IgniteCheckedException {
         List<DataRegionConfiguration> regionConfs = new ArrayList<>();
 
-        DataStorageConfiguration dataConf = memCfg;//not do the changes in-place it's better to make the copy of memCfg.
+        DataStorageConfiguration dataConf = memCfg; //not do the changes in-place it's better to make the copy of memCfg.
 
         regionConfs.add(dataConf.getDefaultDataRegionConfiguration());
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 0e85ea3..2873d2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -2699,7 +2699,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
             boolean retVal) throws IgniteCheckedException {
             CacheDataStore delegate = init0(false);
 
-            return delegate.mvccRemove(cctx, key, mvccVer,filter, primary, needHistory, needOldVal, retVal);
+            return delegate.mvccRemove(cctx, key, mvccVer, filter, primary, needHistory, needOldVal, retVal);
         }
 
         /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RecoveryDebug.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RecoveryDebug.java
index d4423ef..3fad4e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RecoveryDebug.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RecoveryDebug.java
@@ -72,7 +72,7 @@ public class RecoveryDebug implements AutoCloseable {
      * @param constId Consistent ID.
      * @param log Logger.
      */
-    public RecoveryDebug(Object constId,long time, @Nullable IgniteLogger log) {
+    public RecoveryDebug(Object constId, long time, @Nullable IgniteLogger log) {
         this.log = log;
 
         try {
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 10e2c66..97ee910 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
@@ -1626,7 +1626,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
                     return io.getLookupRow(this, pageAddr, cnt - 1);
                 }
 
-                long rightId = inner(io).getLeft(pageAddr, cnt);// The same as getRight(cnt - 1), but good for routing pages.
+                long rightId = inner(io).getLeft(pageAddr, cnt); // The same as getRight(cnt - 1), but good for routing pages.
 
                 return getGreatestRowInSubTree(rightId);
             }
@@ -3140,7 +3140,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          * @param x Implementation specific argument.
          * @param findLast Ignore row passed, find last row
          */
-        private GetOne(L row, TreeRowClosure<L,T> c, Object x, boolean findLast) {
+        private GetOne(L row, TreeRowClosure<L, T> c, Object x, boolean findLast) {
             super(row, findLast);
 
             this.x = x;
@@ -3153,7 +3153,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             if (lvl != 0 && !canGetRowFromInner)
                 return false;
 
-            row = c == null || c.apply(BPlusTree.this, io,pageAddr, idx) ? getRow(io, pageAddr, idx, x) : null;
+            row = c == null || c.apply(BPlusTree.this, io, pageAddr, idx) ? getRow(io, pageAddr, idx, x) : null;
 
             return true;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index 607561d..6a74f04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -1864,7 +1864,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
                 blockingSectionBegin();
 
                 try {
-                    segmentAware.awaitSegment(0);//wait for init at least one work segments.
+                    segmentAware.awaitSegment(0); //wait for init at least one work segments.
                 }
                 finally {
                     blockingSectionEnd();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryEntry.java
index 4787464..3df7d48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueryEntry.java
@@ -25,7 +25,7 @@ import org.apache.ignite.lang.IgniteBiTuple;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-final class CacheQueryEntry<K,V> extends IgniteBiTuple<K,V> implements Cache.Entry<K,V> {
+final class CacheQueryEntry<K, V> extends IgniteBiTuple<K, V> implements Cache.Entry<K, V> {
     /** */
     private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 08fbfe8..a36f4d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -92,7 +92,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
     private Collection<Long> cancelled = new GridBoundedConcurrentOrderedSet<>(MAX_CANCEL_IDS);
 
     /** Query response handler. */
-    private IgniteBiInClosure<UUID,GridCacheQueryResponse> resHnd = new CI2<UUID, GridCacheQueryResponse>() {
+    private IgniteBiInClosure<UUID, GridCacheQueryResponse> resHnd = new CI2<UUID, GridCacheQueryResponse>() {
         @Override public void apply(UUID nodeId, GridCacheQueryResponse res) {
             processQueryResponse(nodeId, res);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 41f02ee..97b2b7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -294,7 +294,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
 
             assert futId != null;
 
-            ConcurrentMap<UUID,Cursor> m = ignite.cluster().nodeLocalMap();
+            ConcurrentMap<UUID, Cursor> m = ignite.cluster().nodeLocalMap();
 
             if (c == null)
                 c = m.get(futId);
@@ -350,7 +350,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
          * @return {@code true} If succeeded.
          */
         private boolean remove(UUID futId, Cursor c) {
-            if (ignite.cluster().<UUID,Cursor>nodeLocalMap().remove(futId, c)) {
+            if (ignite.cluster().<UUID, Cursor>nodeLocalMap().remove(futId, c)) {
                 c.cursor.close();
 
                 return true;
@@ -369,7 +369,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
             SCHEDULER.schedule(new CAX() {
                 @Override public void applyx() {
                     for (;;) {
-                        Cursor c = ignite.cluster().<UUID,Cursor>nodeLocalMap().get(id);
+                        Cursor c = ignite.cluster().<UUID, Cursor>nodeLocalMap().get(id);
 
                         if (c == null)
                             break;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
index 1a5b9e8..d3da3a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java
@@ -936,10 +936,10 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
      */
     private class Flusher extends GridWorker {
         /** Queue to flush. */
-        private final FastSizeDeque<IgniteBiTuple<K, StatefulValue<K,V>>> queue;
+        private final FastSizeDeque<IgniteBiTuple<K, StatefulValue<K, V>>> queue;
 
         /** Flusher write map. */
-        private final ConcurrentHashMap<K, StatefulValue<K,V>> flusherWriteMap;
+        private final ConcurrentHashMap<K, StatefulValue<K, V>> flusherWriteMap;
 
         /** Critical size of flusher local queue. */
         private final int flusherCacheCriticalSize;
@@ -1267,7 +1267,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
                 }
                 else {
                     // Return values to queue
-                    ArrayList<Map.Entry<K, StatefulValue<K,V>>> pendingList = new ArrayList(pending.entrySet());
+                    ArrayList<Map.Entry<K, StatefulValue<K, V>>> pendingList = new ArrayList(pending.entrySet());
 
                     for (int i = pendingList.size() - 1; i >= 0; i--)
                         queue.addFirst(F.t(pendingList.get(i).getKey(), pendingList.get(i).getValue()));
@@ -1339,8 +1339,8 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
      *
      * @return Flusher maps for the underlying store operations.
      */
-    Map<K, StatefulValue<K,V>>[] flusherMaps() {
-        Map<K, StatefulValue<K,V>>[] result = new Map[flushThreadCnt];
+    Map<K, StatefulValue<K, V>>[] flusherMaps() {
+        Map<K, StatefulValue<K, V>>[] result = new Map[flushThreadCnt];
 
         for (int i = 0; i < flushThreadCnt; i++)
             result[i] = flushThreads[i].flusherWriteMap;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
index e9a88ba..4ae2ae7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
@@ -152,7 +152,7 @@ public class CacheDataTree extends BPlusTree<CacheSearchRow, CacheDataRow> {
     @Override public GridCursor<CacheDataRow> find(
         CacheSearchRow lower,
         CacheSearchRow upper,
-        TreeRowClosure<CacheSearchRow,CacheDataRow> c,
+        TreeRowClosure<CacheSearchRow, CacheDataRow> c,
         Object x
     ) throws IgniteCheckedException {
         // If there is a group of caches, lower and upper bounds will not be null here.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
index 330b565..6533f4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
@@ -88,7 +88,7 @@ public class IdleVerifyUtility {
             for (int pageNo = 0; pageNo < pageStore.pages(); pageId++, pageNo++) {
                 buf.clear();
 
-                pageStore.read(pageId, buf, true,true);
+                pageStore.read(pageId, buf, true, true);
             }
         }
         catch (Throwable e) {
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 7c24263..67d9d5b 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
@@ -2457,7 +2457,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
     }
 
     /** */
-    private static final class SilentCompoundFuture<T,R> extends GridCompoundFuture<T,R> {
+    private static final class SilentCompoundFuture<T, R> extends GridCompoundFuture<T, R> {
        /** {@inheritDoc} */
         @Override protected void logError(IgniteLogger log, String msg, Throwable e) {
             // no-op
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/AtomicDataStructureProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/AtomicDataStructureProxy.java
index 820f3bd..59baec0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/AtomicDataStructureProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/AtomicDataStructureProxy.java
@@ -36,7 +36,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
  * Represents base class for atomic data structures.
  */
 public abstract class AtomicDataStructureProxy<V extends AtomicDataStructureValue>
-    implements GridCacheRemovable,IgniteChangeGlobalStateSupport {
+    implements GridCacheRemovable, IgniteChangeGlobalStateSupport {
     /** Logger. */
     protected IgniteLogger log;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 6a8c400..16f7b91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -1308,7 +1308,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
 
                     boolean updated = false;
 
-                    Map<UUID,Integer> waiters = semState.getWaiters();
+                    Map<UUID, Integer> waiters = semState.getWaiters();
 
                     Integer permit = ((GridCacheSemaphoreState) val).getCount();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
index 96fb452..17e737f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
@@ -200,7 +200,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
         /** */
         private Map<String, Integer> processSignal() {
-            Map<String,Integer> ret = new HashMap<>(outgoingSignals);
+            Map<String, Integer> ret = new HashMap<>(outgoingSignals);
 
             outgoingSignals.clear();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreState.java
index 8755bfa..4669c2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreState.java
@@ -59,7 +59,7 @@ public class GridCacheSemaphoreState extends VolatileAtomicDataStructureValue im
      * @param failoverSafe Failover safe flag.
      * @param gridStartTime Cluster start time.
      */
-    public GridCacheSemaphoreState(int cnt, @Nullable Map<UUID,Integer> waiters, boolean failoverSafe, long gridStartTime) {
+    public GridCacheSemaphoreState(int cnt, @Nullable Map<UUID, Integer> waiters, boolean failoverSafe, long gridStartTime) {
         this.cnt = cnt;
         this.waiters = waiters;
         this.failoverSafe = failoverSafe;
@@ -100,7 +100,7 @@ public class GridCacheSemaphoreState extends VolatileAtomicDataStructureValue im
     /**
      * @return Waiters.
      */
-    public Map<UUID,Integer> getWaiters() {
+    public Map<UUID, Integer> getWaiters() {
         return waiters;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
index 07da232..cd83308 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
@@ -42,7 +42,7 @@ public abstract class SqlListenerUtils {
      */
     @Nullable public static Object readObject(BinaryReaderExImpl reader, boolean binObjAllow)
         throws BinaryObjectException {
-        return readObject(reader, binObjAllow,true);
+        return readObject(reader, binObjAllow, true);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java
index 505499e..6a701f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java
@@ -82,7 +82,7 @@ public class ClientCacheSqlFieldsQueryRequest extends ClientCacheDataRequest imp
 
         SqlFieldsQuery qry = stmtType == JdbcStatementType.ANY_STATEMENT_TYPE
                 ? new SqlFieldsQuery(sql)
-                : new SqlFieldsQueryEx(sql,stmtType == JdbcStatementType.SELECT_STATEMENT_TYPE);
+                : new SqlFieldsQueryEx(sql, stmtType == JdbcStatementType.SELECT_STATEMENT_TYPE);
 
         qry.setSchema(schema)
                 .setPageSize(pageSize)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
index 9019553..532fd8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
@@ -471,7 +471,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
                 return new PlatformEvents(platformCtx, platformCtx.kernalContext().grid().events(prj));
 
             case OP_GET_SERVICES:
-                return new PlatformServices(platformCtx, platformCtx.kernalContext().grid().services(prj),false);
+                return new PlatformServices(platformCtx, platformCtx.kernalContext().grid().services(prj), false);
         }
 
         return super.processOutObject(type);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
index 39a50f4..1577932 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
@@ -889,7 +889,7 @@ public class QueryUtils {
      * @throws IgniteCheckedException If failed.
      */
     public static QueryClassProperty buildClassProperty(Class<?> keyCls, Class<?> valCls, String pathStr,
-        Class<?> resType, Map<String,String> aliases, boolean notNull, CacheObjectContext coCtx)
+        Class<?> resType, Map<String, String> aliases, boolean notNull, CacheObjectContext coCtx)
         throws IgniteCheckedException {
         QueryClassProperty res = buildClassProperty(false, valCls, pathStr, resType, aliases, notNull, coCtx);
 
@@ -916,7 +916,7 @@ public class QueryUtils {
      * @throws IgniteCheckedException If failed.
      */
     public static GridQueryProperty buildProperty(Class<?> keyCls, Class<?> valCls, String keyFieldName,
-        String valueFieldName, String pathStr, Class<?> resType, Map<String,String> aliases, boolean notNull,
+        String valueFieldName, String pathStr, Class<?> resType, Map<String, String> aliases, boolean notNull,
         CacheObjectContext coCtx) throws IgniteCheckedException {
         if (pathStr.equals(keyFieldName))
             return new KeyOrValProperty(true, pathStr, keyCls);
@@ -961,7 +961,7 @@ public class QueryUtils {
      */
     @SuppressWarnings("ConstantConditions")
     public static QueryClassProperty buildClassProperty(boolean key, Class<?> cls, String pathStr, Class<?> resType,
-        Map<String,String> aliases, boolean notNull, CacheObjectContext coCtx) {
+        Map<String, String> aliases, boolean notNull, CacheObjectContext coCtx) {
         String[] path = pathStr.split("\\.");
 
         QueryClassProperty res = null;
@@ -1211,7 +1211,7 @@ public class QueryUtils {
      * @param ccfg Cache configuration.
      * @return {@code true} If query index must be enabled for this cache.
      */
-    public static boolean isEnabled(CacheConfiguration<?,?> ccfg) {
+    public static boolean isEnabled(CacheConfiguration<?, ?> ccfg) {
         return !F.isEmpty(ccfg.getIndexedTypes()) ||
             !F.isEmpty(ccfg.getQueryEntities());
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
index 2d55cc0..883d938 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
@@ -66,7 +66,7 @@ public class GridDebug {
      * sudo mkdir /ramdisk
      * sudo mount -t tmpfs -o size=2048M tmpfs /ramdisk
      */
-    private static final String LOGS_PATH = null;// "/ramdisk/";
+    private static final String LOGS_PATH = null; // "/ramdisk/";
 
     /** */
     private static boolean allowLog;
@@ -225,7 +225,7 @@ public class GridDebug {
         if (que == null)
             return;
 
-        int start = -1;// que.size() - 5000;
+        int start = -1; // que.size() - 5000;
 
         int x = 0;
 
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 ff71dff..61dba92 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
@@ -11448,7 +11448,7 @@ public abstract class IgniteUtils {
     /**
      * The batch of tasks with a batch index in global array.
      */
-    private static class Batch<T,R> {
+    private static class Batch<T, R> {
         /** List tasks. */
         private final List<T> tasks;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/DistributedProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/DistributedProcess.java
index 6539453..7cfa0fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/DistributedProcess.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/DistributedProcess.java
@@ -180,7 +180,7 @@ public class DistributedProcess<I extends Serializable, R extends Serializable>
                 return;
             }
 
-            finish.apply(p.id,msg.result(), msg.error());
+            finish.apply(p.id, msg.result(), msg.error());
 
             processes.remove(msg.processId());
         });
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
index e4927d5..2b193ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java
@@ -149,7 +149,7 @@ public class IpcServerTcpEndpoint implements IpcServerEndpoint {
      * @throws IgniteCheckedException If invalid property name or value.
      */
     public void setupConfiguration(Map<String, String> endpointCfg) throws IgniteCheckedException {
-        for (Map.Entry<String,String> e : endpointCfg.entrySet()) {
+        for (Map.Entry<String, String> e : endpointCfg.entrySet()) {
             try {
                 switch (e.getKey()) {
                     case "type":
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
index fbba3b1..b85228c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
@@ -497,7 +497,7 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
      * @throws IgniteCheckedException If invalid property name or value.
      */
     public void setupConfiguration(Map<String, String> endpointCfg) throws IgniteCheckedException {
-        for (Map.Entry<String,String> e : endpointCfg.entrySet()) {
+        for (Map.Entry<String, String> e : endpointCfg.entrySet()) {
             try {
                 switch (e.getKey()) {
                     case "type":
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
index 39ed03d..4c05d36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
@@ -769,7 +769,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
          * @return Iterator.
          */
         GridCloseableIterator<IgniteBiTuple<byte[], byte[]>> iterator() {
-            return new GridCloseableIteratorAdapter<IgniteBiTuple<byte[],byte[]>>() {
+            return new GridCloseableIteratorAdapter<IgniteBiTuple<byte[], byte[]>>() {
                 private final Queue<IgniteBiTuple<byte[], byte[]>> bin = new LinkedList<>();
 
                 {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java
index 3107116..af0f668 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java
@@ -51,7 +51,7 @@ public class CircularStringBuilder {
      * Reset internal builder state
      */
     public void reset() {
-        Arrays.fill(value,(char)0);
+        Arrays.fill(value, (char)0);
         finishAt = -1;
         full = false;
         skipped = 0;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusTask.java
index 22713f9..1e0c90d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusTask.java
@@ -103,7 +103,7 @@ public class IndexRebuildStatusTask extends VisorMultiNodeTask<IndexRebuildStatu
 
             Set<IndexRebuildStatusInfoContainer> res = new HashSet<>();
 
-            for (IgniteCache<?,?> cache : rebuildIdxCaches)
+            for (IgniteCache<?, ?> cache : rebuildIdxCaches)
                 res.add(new IndexRebuildStatusInfoContainer(cache.getConfiguration(CacheConfiguration.class)));
 
             return res;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTrackerArgs.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTrackerArgs.java
index 35e8b43..3ef21a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTrackerArgs.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTrackerArgs.java
@@ -62,7 +62,7 @@ public class VisorPageLocksTrackerArgs extends IgniteDataTransferObject {
     @Override protected void writeExternalData(ObjectOutput out) throws IOException {
         out.writeObject(op);
 
-        U.writeString(out,filePath);
+        U.writeString(out, filePath);
 
         U.writeCollection(out, nodeIds);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
index 525da39..e73ccc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
@@ -250,7 +250,7 @@ public class IgniteBiTuple<V1, V2> implements Map<V1, V2>, Map.Entry<V1, V2>,
     /** {@inheritDoc} */
     @Override public Set<Map.Entry<V1, V2>> entrySet() {
         return isEmpty() ?
-            Collections.<Entry<V1,V2>>emptySet() :
+            Collections.<Entry<V1, V2>>emptySet() :
             Collections.<Entry<V1, V2>>singleton(this);
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
index 9b941d3..994aa96 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
@@ -684,7 +684,7 @@ public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements Colli
     /**
      * Comparator for by priority comparison of collision contexts.
      */
-    private class PriorityGridCollisionJobContextComparator implements Comparator<GridCollisionJobContextWrapper>,Serializable {
+    private class PriorityGridCollisionJobContextComparator implements Comparator<GridCollisionJobContextWrapper>, Serializable {
         /** */
         private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
index 8ec4a67..0a85d37 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
@@ -71,7 +71,7 @@ public interface IndexingSpi extends IgniteSpi {
      * @return Query result. If the iterator implements {@link AutoCloseable} it will be correctly closed.
      * @throws IgniteSpiException If failed.
      */
-    public Iterator<Cache.Entry<?,?>> query(@Nullable String cacheName, Collection<Object> params,
+    public Iterator<Cache.Entry<?, ?>> query(@Nullable String cacheName, Collection<Object> params,
         @Nullable IndexingQueryFilter filters) throws IgniteSpiException;
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
index 8d18cce..05fd5ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
 @IgniteSpiNoop
 public class NoopIndexingSpi extends IgniteSpiAdapter implements IndexingSpi {
     /** {@inheritDoc} */
-    @Override public Iterator<Cache.Entry<?,?>> query(@Nullable String cacheName, Collection<Object> params,
+    @Override public Iterator<Cache.Entry<?, ?>> query(@Nullable String cacheName, Collection<Object> params,
         @Nullable IndexingQueryFilter filters) throws IgniteSpiException {
         throw new IgniteSpiException("You have to configure custom GridIndexingSpi implementation.");
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
index 9951c7c..35f2e42 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
@@ -73,7 +73,7 @@ public abstract class StreamTransformer<K, V> implements StreamReceiver<K, V>, E
      * @param <K> Key type.
      * @param <V> Value type.
      */
-    private static class EntryProcessorWrapper<K, V> extends StreamTransformer<K,V> implements GridPeerDeployAware {
+    private static class EntryProcessorWrapper<K, V> extends StreamTransformer<K, V> implements GridPeerDeployAware {
         /** */
         private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
index 6287019..1f0d2df 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
@@ -573,7 +573,7 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
 
                 int len = tab.length;
 
-                for (int i = 0 ; i < len; i++) {
+                for (int i = 0; i < len; i++) {
                     for (HashEntry<K, V> e = tab[i]; e != null; e = e.next) {
                         V v = e.val;
 
@@ -2040,7 +2040,7 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
          * @param v Value
          */
         WriteThroughEntry(K k, V v) {
-            super(k,v);
+            super(k, v);
         }
 
         /**
@@ -2177,7 +2177,7 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
             if (!(o instanceof Map.Entry))
                 return false;
 
-            Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>)o;
 
             V v = get(e.getKey());
 
@@ -2189,7 +2189,7 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
             if (!(o instanceof Map.Entry))
                 return false;
 
-            Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>)o;
 
             return ConcurrentLinkedHashMap.this.remove(e.getKey(), e.getValue());
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
index 9c7b490..9f9583f 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
@@ -1,4 +1,4 @@
-package org.apache.ignite.cache.store;/*
+/*
  * 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.
@@ -15,6 +15,8 @@ package org.apache.ignite.cache.store;/*
  * limitations under the License.
  */
 
+package org.apache.ignite.cache.store;
+
 import javax.cache.configuration.Factory;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.configuration.CacheConfiguration;
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/TestJdbcPojoStoreFactoryWithHangWriteAll.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/TestJdbcPojoStoreFactoryWithHangWriteAll.java
index ebe93f3..cc57690 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/TestJdbcPojoStoreFactoryWithHangWriteAll.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/TestJdbcPojoStoreFactoryWithHangWriteAll.java
@@ -56,7 +56,7 @@ public class TestJdbcPojoStoreFactoryWithHangWriteAll<K, V> extends CacheJdbcPoj
     }
 
     /** */
-    public static class TestJdbcPojoStoreWithHangWriteAll<K,V> extends CacheJdbcPojoStore<K,V> {
+    public static class TestJdbcPojoStoreWithHangWriteAll<K, V> extends CacheJdbcPojoStore<K, V> {
         /** {@inheritDoc} */
         @Override protected void fillParameter(PreparedStatement stmt, int idx, JdbcTypeField field, @Nullable Object fieldVal) throws CacheException {
             try {
diff --git a/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java b/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java
index 2abdd58..dd54bc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java
@@ -88,7 +88,7 @@ public class FailureHandlerTriggeredTest extends GridCommonAbstractTest {
         grid0.getOrCreateCache(new CacheConfiguration<>()
                 .setName(DEFAULT_CACHE_NAME)
                 .setCacheMode(CacheMode.REPLICATED))
-            .put(1,1);
+            .put(1, 1);
 
         grid0.cluster().baselineAutoAdjustEnabled(false);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
index eecf4bc..fcee6df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
@@ -117,12 +117,12 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
             info("Metrics [nodeId=" + g.cluster().localNode().id() +
                 ", metrics=" + g.cluster().localNode().metrics() + ']');
 
-        assertNull("Test failed with exception: ",fail.get());
+        assertNull("Test failed with exception: ", fail.get());
 
         // Total jobs number is threadsNum * 2
-        assertEquals("Incorrect processed jobs number",threadsNum * 2, stolen.get() + noneStolen.get());
+        assertEquals("Incorrect processed jobs number", threadsNum * 2, stolen.get() + noneStolen.get());
 
-        assertFalse( "No jobs were stolen.",stolen.get() == 0);
+        assertFalse( "No jobs were stolen.", stolen.get() == 0);
 
         for (Ignite g : G.allGrids())
             assertTrue("Node get no jobs.", nodes.contains(g.name()));
@@ -188,12 +188,12 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
 
         future.get();
 
-        assertNull("Test failed with exception: ",fail.get());
+        assertNull("Test failed with exception: ", fail.get());
 
         // Total jobs number is threadsNum * 3
-        assertEquals("Incorrect processed jobs number",threadsNum * jobsPerTask, stolen.get() + noneStolen.get());
+        assertEquals("Incorrect processed jobs number", threadsNum * jobsPerTask, stolen.get() + noneStolen.get());
 
-        assertFalse( "No jobs were stolen.",stolen.get() == 0);
+        assertFalse( "No jobs were stolen.", stolen.get() == 0);
 
         for (Ignite g : G.allGrids())
             assertTrue("Node get no jobs.", nodes.contains(g.name()));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
index a2c6daa..69165f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
@@ -266,15 +266,15 @@ public class DirectByteBufferStreamImplV2ByteOrderSelfTest {
         for (int i = 0; i < ARR_LEN; i++)
             arr[i] = RND.nextInt();
 
-        testWriteArrayInternal(arr, false, false,2);
-        testWriteArrayInternal(arr, false, true,2);
-        testWriteArrayInternal(arr, true, false,2);
-        testWriteArrayInternal(arr, true, true,2);
-
-        testWriteArrayInternalOverflow(arr, false, false,2);
-        testWriteArrayInternalOverflow(arr, false, true,2);
-        testWriteArrayInternalOverflow(arr, true, false,2);
-        testWriteArrayInternalOverflow(arr, true, true,2);
+        testWriteArrayInternal(arr, false, false, 2);
+        testWriteArrayInternal(arr, false, true, 2);
+        testWriteArrayInternal(arr, true, false, 2);
+        testWriteArrayInternal(arr, true, true, 2);
+
+        testWriteArrayInternalOverflow(arr, false, false, 2);
+        testWriteArrayInternalOverflow(arr, false, true, 2);
+        testWriteArrayInternalOverflow(arr, true, false, 2);
+        testWriteArrayInternalOverflow(arr, true, true, 2);
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
index e52be7f..d966032 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
@@ -463,7 +463,7 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
     /**
      * Some non-serializable class.
      */
-    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","FieldMayBeStatic"})
+    @SuppressWarnings( {"PublicField", "TransientFieldInNonSerializableClass", "FieldMayBeStatic"})
     private static class NonSerializableA {
         /** */
         private final long longVal = 0x33445566778899AAL;
@@ -472,7 +472,7 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
         protected Short shortVal = (short)0xAABB;
 
         /** */
-        public String[] strArr = {"AA","BB"};
+        public String[] strArr = {"AA", "BB"};
 
         /** */
         public boolean flag1 = true;
@@ -508,7 +508,7 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
 
             assertEquals(shortVal.shortValue(), (short)0xAABB);
 
-            assertTrue(Arrays.equals(strArr, new String[] {"AA","BB"}));
+            assertTrue(Arrays.equals(strArr, new String[] {"AA", "BB"}));
 
             assertEquals(intVal, 0);
 
@@ -523,7 +523,7 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
     /**
      * Some non-serializable class.
      */
-    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
+    @SuppressWarnings( {"PublicField", "TransientFieldInNonSerializableClass", "PackageVisibleInnerClass"})
     static class NonSerializableB extends NonSerializableA {
         /** */
         public Short shortVal = 0x1122;
@@ -567,7 +567,7 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
     /**
      * Some non-serializable class.
      */
-    @SuppressWarnings( {"TransientFieldInNonSerializableClass","PublicField"})
+    @SuppressWarnings( {"TransientFieldInNonSerializableClass", "PublicField"})
     private static class NonSerializable extends NonSerializableB {
         /** */
         private int idVal = -17;
@@ -618,7 +618,7 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
     /**
      * Some serializable class.
      */
-    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
+    @SuppressWarnings( {"PublicField", "TransientFieldInNonSerializableClass", "PackageVisibleInnerClass"})
     static class ForSerializableB {
         /** */
         public Short shortVal = 0x1122;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
index 77792ad..4a51834 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
@@ -109,7 +109,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
      */
     @Test
     public void testLocal() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(ATOMIC,false);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(ATOMIC, false);
 
         doTestPartitionCounterOperation(ccfg);
     }
@@ -119,7 +119,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
      */
     @Test
     public void testLocalWithStore() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(ATOMIC,true);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(ATOMIC, true);
 
         doTestPartitionCounterOperation(ccfg);
     }
@@ -129,7 +129,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
      */
     @Test
     public void testLocalTx() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL,false);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL, false);
 
         doTestPartitionCounterOperation(ccfg);
     }
@@ -139,7 +139,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
      */
     @Test
     public void testLocalTxWithStore() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL,true);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL, true);
 
         doTestPartitionCounterOperation(ccfg);
     }
@@ -150,7 +150,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
     @Ignore("https://issues.apache.org/jira/browse/IGNITE-9530")
     @Test
     public void testLocalMvccTx() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL_SNAPSHOT,false);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL_SNAPSHOT, false);
 
         doTestPartitionCounterOperation(ccfg);
     }
@@ -161,7 +161,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
     @Ignore("https://issues.apache.org/jira/browse/IGNITE-9530")
     @Test
     public void testLocalMvccTxWithStore() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL_SNAPSHOT,true);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(TRANSACTIONAL_SNAPSHOT, true);
 
         doTestPartitionCounterOperation(ccfg);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
index f5f4d3f..0b03087 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
@@ -50,7 +50,7 @@ public class CacheRebalancingSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<Integer,Integer> ccfg = new CacheConfiguration<>();
+        CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
         ccfg.setBackups(1);
         ccfg.setName(REBALANCE_TEST_CACHE_NAME);
         ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 3df7c7e..b203a12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -385,7 +385,7 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         dhtCache0.close();
 
         try {
-            dhtCache0.get(key);// Not affected, but can not be taken.
+            dhtCache0.get(key); // Not affected, but can not be taken.
 
             fail();
         }
@@ -394,7 +394,7 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         }
 
         assertEquals(key, dhtCache1.get(key)); // Not affected.
-        assertEquals(key, dhtCache2.get(key));// Not affected.
+        assertEquals(key, dhtCache2.get(key)); // Not affected.
 
         // DHT Creation after closed.
 
@@ -426,7 +426,7 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         dhtCache0.close();
 
         try {
-            dhtCache0.get(key);// Can not be taken.
+            dhtCache0.get(key); // Can not be taken.
 
             fail();
         }
@@ -502,13 +502,13 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
 
         assert cache2.get(KEY_VAL).equals(KEY_VAL);
 
-        cache2.close();// Client node.
+        cache2.close(); // Client node.
 
-        assert cache0.get(KEY_VAL).equals(KEY_VAL);// Not affected.
-        assert cache1.get(KEY_VAL).equals(KEY_VAL);// Not affected.
+        assert cache0.get(KEY_VAL).equals(KEY_VAL); // Not affected.
+        assert cache1.get(KEY_VAL).equals(KEY_VAL); // Not affected.
 
         try {
-            cache2.get(KEY_VAL);// Affected.
+            cache2.get(KEY_VAL); // Affected.
 
             assert false;
         }
@@ -638,11 +638,11 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
 
         U.sleep(1000);
 
-        assert cache0.get(KEY_VAL).equals(KEY_VAL + 0);// Not affected.
-        assert cache1.get(KEY_VAL).equals(KEY_VAL + 0);// Not affected.
+        assert cache0.get(KEY_VAL).equals(KEY_VAL + 0); // Not affected.
+        assert cache1.get(KEY_VAL).equals(KEY_VAL + 0); // Not affected.
 
         try {
-            cache2.get(KEY_VAL);// Affected.
+            cache2.get(KEY_VAL); // Affected.
 
             assert false;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
index 630d4de..4b4f5d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
@@ -94,7 +94,7 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest {
         startGridsMultiThreaded(3);
 
         try {
-            Map<Integer,Integer> map = F.asMap(1, 1, 2, 2, 3, 3);
+            Map<Integer, Integer> map = F.asMap(1, 1, 2, 2, 3, 3);
 
             for (Integer key : map.keySet()) {
                 info("Affinity nodes [key=" + key + ", nodes=" +
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index deaa9a6..72df280 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
@@ -123,7 +123,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
 
             ClusterNode locNode = grid.cluster().localNode();
 
-            for (;key < 30; key++) {
+            for (; key < 30; key++) {
                 if (!grid.affinity(DEFAULT_CACHE_NAME).isPrimary(locNode, key) && !grid.affinity(DEFAULT_CACHE_NAME).isBackup(locNode, key))
                     break;
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
index c3df336..3a6a693 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
@@ -48,7 +48,7 @@ public class GridCacheTtlManagerLoadTest extends GridCacheTtlManagerSelfTest {
 
             IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() {
                 @Override public Object call() throws Exception {
-                    IgniteCache<Object,Object> cache = g.cache(DEFAULT_CACHE_NAME).
+                    IgniteCache<Object, Object> cache = g.cache(DEFAULT_CACHE_NAME).
                         withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000)));
 
                     long key = 0;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheClusterReadOnlyModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheClusterReadOnlyModeSelfTest.java
index cac0953..26d3369 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheClusterReadOnlyModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheClusterReadOnlyModeSelfTest.java
@@ -416,7 +416,7 @@ public class IgniteCacheClusterReadOnlyModeSelfTest extends IgniteCacheClusterRe
     /** */
     @Test
     public void testReplaceDenied() {
-        performActionReadOnlyExceptionExpected(cache -> cache.replace(KEY,VAL + 1));
+        performActionReadOnlyExceptionExpected(cache -> cache.replace(KEY, VAL + 1));
     }
 
     /** */
@@ -428,7 +428,7 @@ public class IgniteCacheClusterReadOnlyModeSelfTest extends IgniteCacheClusterRe
     /** */
     @Test
     public void testGetAndReplaceDenied() {
-        performActionReadOnlyExceptionExpected(cache -> cache.getAndReplace(KEY,VAL + 1));
+        performActionReadOnlyExceptionExpected(cache -> cache.getAndReplace(KEY, VAL + 1));
     }
 
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
index db64131..65f5df6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
@@ -4634,7 +4634,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
     /**
      *
      */
-    static class MapBasedStore<K,V> implements CacheStore<K,V>, Serializable {
+    static class MapBasedStore<K, V> implements CacheStore<K, V>, Serializable {
         /** */
         private final Map<K, V> src;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index fb20b89..2ba6fdd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -534,7 +534,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
      */
     @Test
     public void testCanCloseAtomicStampedInInterruptedThread() throws Exception {
-        doCloseByInterruptedThread(grid(0).atomicStamped(STRUCTURE_NAME, 10, 10,true));
+        doCloseByInterruptedThread(grid(0).atomicStamped(STRUCTURE_NAME, 10, 10, true));
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
index 588839d..63ee166 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
@@ -160,7 +160,7 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends IgniteAt
                 true);
 
             try (Transaction tx = ignite.transactions().txStart()) {
-                cache.put(1,1);
+                cache.put(1, 1);
 
                 assertEquals(initVal, atomicStamped.value());
                 assertEquals(initStamp, atomicStamped.stamp());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicStampedClusterReadOnlyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicStampedClusterReadOnlyTest.java
index 5a27c88..726b0ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicStampedClusterReadOnlyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicStampedClusterReadOnlyTest.java
@@ -122,7 +122,7 @@ public class IgniteAtomicStampedClusterReadOnlyTest extends GridCommonAbstractTe
     /** */
     @Test
     public void testCompareAndSetDenied() {
-        performAction(s -> s.compareAndSet(INITIAL_VAL, INITIAL_VAL + 1,INITIAL_STAMP, INITIAL_STAMP + 1));
+        performAction(s -> s.compareAndSet(INITIAL_VAL, INITIAL_VAL + 1, INITIAL_STAMP, INITIAL_STAMP + 1));
     }
 
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
index afe125b..0f587aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
@@ -752,7 +752,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
 
                 lock.getOrCreateCondition("c1").signal();
 
-                lock.getOrCreateCondition("c2").await(10,MILLISECONDS);
+                lock.getOrCreateCondition("c2").await(10, MILLISECONDS);
             }
             finally {
                 lock.unlock();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
index aab012e..08d8d03 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
@@ -101,7 +101,7 @@ public class SemaphoreFailoverNoWaitingAcquirerTest extends GridCommonAbstractTe
             awaitPartitionMapExchange();
             IgniteSemaphore sem2 = grid(1).semaphore("sem", 1, true, true);
 
-            assertTrue("Could not aquire after 'restart'",sem2.tryAcquire(1, 5000, TimeUnit.MILLISECONDS));
+            assertTrue("Could not aquire after 'restart'", sem2.tryAcquire(1, 5000, TimeUnit.MILLISECONDS));
         }
         finally {
             stopAllGrids();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
index 471ca58..bbfc173 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
@@ -977,7 +977,7 @@ public abstract class CacheBlockOnReadAbstractTest extends GridCommonAbstractTes
         // On average every read operation was much faster then blocking timeout.
         double avgDuration = (double)timeout() / readOperation.readOperationsFinishedUnderBlock();
 
-        assertTrue("Avarage duration was too long.",avgDuration < timeout() * 0.25);
+        assertTrue("Avarage duration was too long.", avgDuration < timeout() * 0.25);
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
index b87b432..0b0213f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
@@ -157,7 +157,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
      * @param cache Cache.
      * @param key Key.
      */
-    private void checkLocked(IgniteCache<Integer,String> cache, Integer key) {
+    private void checkLocked(IgniteCache<Integer, String> cache, Integer key) {
         assert cache.isLocalLocked(key, false);
         assert cache.isLocalLocked(key, true);
     }
@@ -166,7 +166,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
      * @param cache Cache.
      * @param key Key.
      */
-    private void checkRemoteLocked(IgniteCache<Integer,String> cache, Integer key) {
+    private void checkRemoteLocked(IgniteCache<Integer, String> cache, Integer key) {
         assert cache.isLocalLocked(key, false);
         assert !cache.isLocalLocked(key, true);
     }
@@ -177,7 +177,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
      * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings({"BusyWait"})
-    private void checkUnlocked(IgniteCache<Integer,String> cache, Integer key) throws IgniteCheckedException {
+    private void checkUnlocked(IgniteCache<Integer, String> cache, Integer key) throws IgniteCheckedException {
         assert !cache.isLocalLocked(key, true);
 
         if (partitioned()) {
@@ -201,7 +201,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
      * @param cache Cache.
      * @param keys Keys.
      */
-    private void checkLocked(IgniteCache<Integer,String> cache, Iterable<Integer> keys) {
+    private void checkLocked(IgniteCache<Integer, String> cache, Iterable<Integer> keys) {
         for (Integer key : keys)
             checkLocked(cache, key);
     }
@@ -210,7 +210,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
      * @param cache Cache.
      * @param keys Keys.
      */
-    private void checkRemoteLocked(IgniteCache<Integer,String> cache, Iterable<Integer> keys) {
+    private void checkRemoteLocked(IgniteCache<Integer, String> cache, Iterable<Integer> keys) {
         for (Integer key : keys)
             checkRemoteLocked(cache, key);
     }
@@ -220,7 +220,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
      * @param keys Keys.
      * @throws IgniteCheckedException If failed.
      */
-    private void checkUnlocked(IgniteCache<Integer,String> cache, Iterable<Integer> keys) throws IgniteCheckedException {
+    private void checkUnlocked(IgniteCache<Integer, String> cache, Iterable<Integer> keys) throws IgniteCheckedException {
         for (Integer key : keys)
             checkUnlocked(cache, key);
     }
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 ef94050..0de3b86 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
@@ -74,7 +74,7 @@ public class GridExchangeFreeSwitchTest extends GridCommonAbstractTest {
     private static final String CACHE_NAME = "testCache";
 
     /** Cache configuration closure. */
-    private IgniteClosure<String, CacheConfiguration<?,?>[]> cacheC;
+    private IgniteClosure<String, CacheConfiguration<?, ?>[]> cacheC;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
@@ -341,9 +341,9 @@ public class GridExchangeFreeSwitchTest extends GridCommonAbstractTest {
         String cacheName = "partitioned";
 
         try {
-            cacheC = new IgniteClosure<String, CacheConfiguration<?,?>[]>() {
-                @Override public CacheConfiguration<?,?>[] apply(String igniteInstanceName) {
-                    CacheConfiguration<?,?> ccfg = new CacheConfiguration<>();
+            cacheC = new IgniteClosure<String, CacheConfiguration<?, ?>[]>() {
+                @Override public CacheConfiguration<?, ?>[] apply(String igniteInstanceName) {
+                    CacheConfiguration<?, ?> ccfg = new CacheConfiguration<>();
 
                     ccfg.setName(cacheName);
                     ccfg.setWriteSynchronizationMode(FULL_SYNC);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index 3c75a10..9e519e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -469,7 +469,7 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
     private int generateKey(Ignite ignite, boolean backup) {
         Affinity<Object> aff = ignite.affinity(DEFAULT_CACHE_NAME);
 
-        for (int key = 0;;key++) {
+        for (int key = 0;; key++) {
             if (backup) {
                 if (!aff.isBackup(ignite(0).cluster().localNode(), key))
                     continue;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
index 0518513..d7e879a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
@@ -196,7 +196,7 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
      * @param keys Number of keys.
      * @return Running thread.
      */
-    private Thread runCacheOperations(final IgniteInternalCache<Object,Object> cache, final int keys) {
+    private Thread runCacheOperations(final IgniteInternalCache<Object, Object> cache, final int keys) {
         Thread t = new Thread() {
             @Override public void run() {
                 while (run) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/RebalanceIsProcessingWhenAssignmentIsEmptyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/RebalanceIsProcessingWhenAssignmentIsEmptyTest.java
index 11e7d9e..c6d0f25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/RebalanceIsProcessingWhenAssignmentIsEmptyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/RebalanceIsProcessingWhenAssignmentIsEmptyTest.java
@@ -100,7 +100,7 @@ public class RebalanceIsProcessingWhenAssignmentIsEmptyTest extends GridCommonAb
          * @param nodes Nodes consistence ids.
          */
         public TestAffinity(String... nodes) {
-            super(false,2);
+            super(false, 2);
 
             this.nodeConsistentIds = nodes;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index 3123911..e304212 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -569,7 +569,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
         };
 
         t1.start();
-        t2.start();// Should cancel t1 rebalancing.
+        t2.start(); // Should cancel t1 rebalancing.
         t3.start();
 
         t1.join();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
index d5af190..52a1d54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
@@ -138,7 +138,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign
 
             assertTrue(latch.await(10_000, TimeUnit.MILLISECONDS));
 
-            assertTrue(entLatch.await(10_000,TimeUnit.MILLISECONDS));
+            assertTrue(entLatch.await(10_000, TimeUnit.MILLISECONDS));
         }
         finally {
             latch = null;
@@ -156,7 +156,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign
 
             assertTrue(latch.await(10_000, TimeUnit.MILLISECONDS));
 
-            assertTrue(entLatch.await(10_000,TimeUnit.MILLISECONDS));
+            assertTrue(entLatch.await(10_000, TimeUnit.MILLISECONDS));
         }
         finally {
             latch = null;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
index 3796225..081e3db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
@@ -462,7 +462,7 @@ public abstract class CacheMvccAbstractBasicCoordinatorFailoverTest extends Cach
         WriteMode writeMode) throws Exception {
         for (boolean readInTx : new boolean[]{false, true}) {
             for (int i = 1; i <= 3; i++) {
-                readInProgressCoordinatorFailsSimple(fromClient, i, readInTx,cfgC, readMode, writeMode);
+                readInProgressCoordinatorFailsSimple(fromClient, i, readInTx, cfgC, readMode, writeMode);
 
                 afterTest();
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractTest.java
index 18222fd..7a467cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractTest.java
@@ -503,10 +503,10 @@ public abstract class CacheMvccAbstractTest extends GridCommonAbstractTest {
                                                 else if (writeMode == WriteMode.DML) {
                                                     if (rmvd.equals(id1)) {
                                                         removeSql(cache, id1);
-                                                        updateSql(cache, id2,a1.val + a2.val, 1);
+                                                        updateSql(cache, id2, a1.val + a2.val, 1);
                                                     }
                                                     else {
-                                                        updateSql(cache, id1,a1.val + a2.val, 1);
+                                                        updateSql(cache, id1, a1.val + a2.val, 1);
                                                         removeSql(cache, id2);
                                                     }
                                                 }
@@ -1021,7 +1021,7 @@ public abstract class CacheMvccAbstractTest extends GridCommonAbstractTest {
                                 Integer readVal = readVals.get(range);
 
                                 if (readVal != null)
-                                    assertTrue("readVal=" + readVal + ", val=" + val + ", map=" + map,readVal <= val);
+                                    assertTrue("readVal=" + readVal + ", val=" + val + ", map=" + map, readVal <= val);
 
                                 readVals.put(range, val);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
index fb83ae0..f864bc6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
@@ -120,9 +120,9 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
         IgniteCache cache1 = node1.createCache(new CacheConfiguration("cache1")
             .setAtomicityMode(TRANSACTIONAL_SNAPSHOT));
 
-        cache1.put(1,1);
-        cache1.put(2,2);
-        cache1.put(2,2);
+        cache1.put(1, 1);
+        cache1.put(2, 2);
+        cache1.put(2, 2);
 
         GridTestUtils.assertThrows(log, new Callable<Void>() {
             @Override public Void call() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java
index 4e205ed..d0a5822 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java
@@ -110,7 +110,7 @@ public class IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest extends GridComm
         BinaryObjectBuilder builder = ig.binary().builder(typeName);
 
         if (fields != null) {
-            for (IgniteBiTuple<String,Class<?>> field: fields)
+            for (IgniteBiTuple<String, Class<?>> field: fields)
                 builder.setField(field.get1(), field.get2());
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index 7dc39a3..7a36be7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -653,7 +653,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
             while (!fut.isDone()) {
                 int nextKeys = keys + 10;
 
-                for (;keys < nextKeys; keys++)
+                for (; keys < nextKeys; keys++)
                     cache.put(keys, keys);
             }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
index 703a79b..f711e37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
@@ -139,7 +139,7 @@ public class IgnitePdsCacheStartStopWithFreqCheckpointTest extends GridCommonAbs
 
                 try {
                     // Stop cache without destroy.
-                    crd.context().cache().dynamicDestroyCaches(cacheNames, false,false).get();
+                    crd.context().cache().dynamicDestroyCaches(cacheNames, false, false).get();
                 }
                 catch (IgniteCheckedException e) {
                     throw new IgniteException("Failed to destroy cache", e);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java
index ef72b98..d82d263 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java
@@ -136,7 +136,7 @@ public class IgnitePdsSporadicDataRecordsOnBackupTest extends GridCommonAbstract
 
         stopAllGrids();
 
-        assertEquals(0,findSporadicDataRecords(nodeFolderName0) + findSporadicDataRecords(nodeFolderName1));
+        assertEquals(0, findSporadicDataRecords(nodeFolderName0) + findSporadicDataRecords(nodeFolderName1));
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
index a736305..a31f1f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
@@ -49,7 +49,7 @@ public class IgnitePdsRebalancingOnNotStableTopologyTest extends GridCommonAbstr
     private static final long CHECKPOINT_FREQUENCY = 2_000_000;
 
     /** Cluster size. */
-    private static final int CLUSTER_SIZE = SF.applyLB(5,3 );
+    private static final int CLUSTER_SIZE = SF.applyLB(5, 3 );
 
     /**
      * @throws Exception When fails.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
index 3c1e2e7..99c1e68 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
@@ -145,7 +145,7 @@ public class IgnitePdsThreadInterruptionTest extends GridCommonAbstractTest {
             worker.start();
 
         // Interrupts should not affect reads.
-        for (int i = 0;i < workers.length / 2; i++)
+        for (int i = 0; i < workers.length / 2; i++)
             workers[i].interrupt();
 
         U.sleep(3_000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java
index c1ef5a6..61911f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java
@@ -66,7 +66,7 @@ public abstract class WalDeletionArchiveAbstractTest extends GridCommonAbstractT
 
         dbCfg.setWalMode(walMode());
         dbCfg.setWalSegmentSize(512 * 1024);
-        dbCfg.setCheckpointFrequency(60 * 1000);//too high value for turn off frequency checkpoint.
+        dbCfg.setCheckpointFrequency(60 * 1000); //too high value for turn off frequency checkpoint.
         dbCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
             .setMaxSize(100 * 1024 * 1024)
             .setPersistenceEnabled(true));
@@ -217,7 +217,7 @@ public abstract class WalDeletionArchiveAbstractTest extends GridCommonAbstractT
 
         File[] cpFiles = dbMgr.checkpointDirectory().listFiles();
 
-        assertTrue(cpFiles.length <= (checkpointCnt * 2 + 1));// starts & ends + node_start
+        assertTrue(cpFiles.length <= (checkpointCnt * 2 + 1)); // starts & ends + node_start
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/log/PageLockLogTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/log/PageLockLogTest.java
index 9ffd46b..5bd5f4b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/log/PageLockLogTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/log/PageLockLogTest.java
@@ -425,7 +425,7 @@ public abstract class PageLockLogTest extends AbstractPageLockTest {
         checkLogEntry(logDump.locklog.get(0), pageId1, READ_LOCK, STRUCTURE_ID, 1);
         checkLogEntry(logDump.locklog.get(1), pageId2, READ_LOCK, STRUCTURE_ID, 2);
         checkLogEntry(logDump.locklog.get(2), pageId3, READ_LOCK, STRUCTURE_ID, 3);
-        checkNextOp(logDump, 0,0, 0);
+        checkNextOp(logDump, 0, 0, 0);
 
         lockLog.onReadUnlock(STRUCTURE_ID, pageId2, page2, pageAddr2);
 
@@ -436,7 +436,7 @@ public abstract class PageLockLogTest extends AbstractPageLockTest {
         checkLogEntry(logDump.locklog.get(1), pageId2, READ_LOCK, STRUCTURE_ID, 2);
         checkLogEntry(logDump.locklog.get(2), pageId3, READ_LOCK, STRUCTURE_ID, 3);
         checkLogEntry(logDump.locklog.get(3), pageId2, READ_UNLOCK, STRUCTURE_ID, 2);
-        checkNextOp(logDump, 0,0, 0);
+        checkNextOp(logDump, 0, 0, 0);
 
         lockLog.onReadUnlock(STRUCTURE_ID, pageId3, page3, pageAddr3);
 
@@ -448,7 +448,7 @@ public abstract class PageLockLogTest extends AbstractPageLockTest {
         checkLogEntry(logDump.locklog.get(2), pageId3, READ_LOCK, STRUCTURE_ID, 3);
         checkLogEntry(logDump.locklog.get(3), pageId2, READ_UNLOCK, STRUCTURE_ID, 2);
         checkLogEntry(logDump.locklog.get(4), pageId3, READ_UNLOCK, STRUCTURE_ID, 1);
-        checkNextOp(logDump, 0,0, 0);
+        checkNextOp(logDump, 0, 0, 0);
 
         lockLog.onReadUnlock(STRUCTURE_ID, pageId1, page1, pageAddr1);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
index 22fdd87..c8ae6e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
@@ -46,7 +46,7 @@ public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbs
 
         IgniteCache<String, String> cacheP = ig1P.getOrCreateCache(cacheName);
 
-        cacheP.put("key","value");
+        cacheP.put("key", "value");
 
         stopAllPrimary();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
index 1fc61dd..1d5b345 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractWalDeltaConsistencyTest extends GridCommonAbstract
      * @return Cache configuration.
      */
     @SuppressWarnings("unchecked")
-    protected <K,V> CacheConfiguration<K, V> cacheConfiguration(String name) {
+    protected <K, V> CacheConfiguration<K, V> cacheConfiguration(String name) {
         return defaultCacheConfiguration().setName(name);
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheDataPageScanQueryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheDataPageScanQueryTest.java
index 1b51722..3f67f09 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheDataPageScanQueryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheDataPageScanQueryTest.java
@@ -104,7 +104,7 @@ public class CacheDataPageScanQueryTest extends GridCommonAbstractTest {
 
         long maxKey = 10_000;
 
-        Map<Long,String> map = new ConcurrentHashMap<>();
+        Map<Long, String> map = new ConcurrentHashMap<>();
 
         int threads = 16;
         AtomicInteger threadShift = new AtomicInteger();
@@ -130,10 +130,10 @@ public class CacheDataPageScanQueryTest extends GridCommonAbstractTest {
         info("Alloc size: " + metrics.getTotalAllocatedSize());
         info("Store size: " + metrics.getStorageSize());
 
-        HashMap<Long,String> map2 = new HashMap<>(map);
+        HashMap<Long, String> map2 = new HashMap<>(map);
 
-        IgniteCache<Long,String> c = ignite.cache(CACHE);
-        for (Cache.Entry<Long,String> e : c.query(new ScanQuery<Long,String>()).getAll())
+        IgniteCache<Long, String> c = ignite.cache(CACHE);
+        for (Cache.Entry<Long, String> e : c.query(new ScanQuery<Long, String>()).getAll())
             assertEquals(e.getValue(), map.remove(e.getKey()));
 
         assertTrue(map.isEmpty());
@@ -145,7 +145,7 @@ public class CacheDataPageScanQueryTest extends GridCommonAbstractTest {
         ignite.cluster().active(true);
 
         c = ignite.cache(CACHE);
-        for (Cache.Entry<Long,String> e : c.query(new ScanQuery<Long,String>()).getAll())
+        for (Cache.Entry<Long, String> e : c.query(new ScanQuery<Long, String>()).getAll())
             assertEquals(e.getValue(), map2.remove(e.getKey()));
 
         assertTrue(map2.isEmpty());
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 5ebc00b..06e6ac5 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
@@ -68,7 +68,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest {
     }
 
     /** */
-    protected <K,V> CacheConfiguration<K, V> cacheConfiguration(String cacheName) {
+    protected <K, V> CacheConfiguration<K, V> cacheConfiguration(String cacheName) {
         return new CacheConfiguration<>(cacheName);
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
index 457d1cc..11da098 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
@@ -458,8 +458,8 @@ public abstract class CacheContinuousQueryCounterAbstractTest extends GridCommon
             }
         });
 
-        qry.setRemoteFilter(new CacheEntryEventSerializableFilter<Integer,Integer>() {
-            @Override public boolean evaluate(CacheEntryEvent<? extends Integer,? extends Integer> evt) {
+        qry.setRemoteFilter(new CacheEntryEventSerializableFilter<Integer, Integer>() {
+            @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) {
                 return evt.getValue() % 2 == 0;
             }
         });
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 aa6cb63..9400e5e 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
@@ -1307,7 +1307,7 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
                         tx.commit();
 
                     // We don't update part counter if nothing was removed when MVCC enabled.
-                    updatePartitionCounter(cache, key, partCntr, expEvtCntrs,mvccEnabled && proc.getOldVal() == null);
+                    updatePartitionCounter(cache, key, partCntr, expEvtCntrs, mvccEnabled && proc.getOldVal() == null);
 
                     waitAndCheckEvent(evtsQueues, partCntr, expEvtCntrs, affinity(cache), key, oldVal, oldVal);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
index 4d01ef0..9acaf87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
@@ -84,7 +84,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
      */
     @Test
     public void testTxOnHeap() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,1, TRANSACTIONAL);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL);
 
         doTestScanQuery(ccfg, true, true);
         doTestScanQuery(ccfg, true, false);
@@ -97,7 +97,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
      */
     @Test
     public void testMvccTxOnHeap() throws Exception {
-        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,1, TRANSACTIONAL_SNAPSHOT);
+        CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL_SNAPSHOT);
 
         doTestScanQuery(ccfg, true, true);
         doTestScanQuery(ccfg, true, false);
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 af76777..67f185c 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
@@ -340,9 +340,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
         });
 
         try (QueryCursor<Cache.Entry<Integer, Integer>> ignored = cache.query(qry)) {
-            cachePut(cache,1, 1);
-            cachePut(cache,2, 2);
-            cachePut(cache,3, 3);
+            cachePut(cache, 1, 1);
+            cachePut(cache, 2, 2);
+            cachePut(cache, 3, 3);
 
             cacheRemove(cache, 2);
 
@@ -568,8 +568,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             }
         });
 
-        qry.setRemoteFilter(new CacheEntryEventSerializableFilter<Integer,Integer>() {
-            @Override public boolean evaluate(CacheEntryEvent<? extends Integer,? extends Integer> evt) {
+        qry.setRemoteFilter(new CacheEntryEventSerializableFilter<Integer, Integer>() {
+            @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) {
                 return evt.getKey() > 2;
             }
         });
@@ -621,9 +621,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
         final Map<Integer, List<Integer>> map = new HashMap<>();
         final CountDownLatch latch = new CountDownLatch(1);
 
-        qry.setLocalListener(new CacheEntryUpdatedListener<Integer,Integer>() {
-            @Override public void onUpdated(Iterable<CacheEntryEvent<? extends Integer,? extends Integer>> evts) {
-                for (CacheEntryEvent<? extends Integer,? extends Integer> e : evts) {
+        qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() {
+            @Override public void onUpdated(Iterable<CacheEntryEvent<? extends Integer, ? extends Integer>> evts) {
+                for (CacheEntryEvent<? extends Integer, ? extends Integer> e : evts) {
                     synchronized (map) {
                         List<Integer> vals = map.get(e.getKey());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
index 308937c..40516c9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
@@ -99,7 +99,7 @@ public abstract class GridCacheWriteBehindStoreAbstractSelfTest extends GridComm
         if (store.getWriteCoalescing())
             assertTrue("Store cache must be empty after shutdown", store.writeCache().isEmpty());
         else
-            for (Map<?,?> fMap : store.flusherMaps())
+            for (Map<?, ?> fMap : store.flusherMaps())
                 assertTrue("Store flusher cache must be empty after shutdown", fMap.isEmpty());
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
index d8b75ec..0658ac5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
@@ -187,7 +187,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
         Collection<Integer> allKeys = new ArrayList<>(100);
 
         for (int i = 0; i < GRID_CNT; i++) {
-            Map<Integer,String> map = stores[i].getMap();
+            Map<Integer, String> map = stores[i].getMap();
 
             assertFalse("Missing writes for node: " + i, map.isEmpty());
 
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 9465dc7..e15d360 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
@@ -811,7 +811,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
     private void doTestRandomInvoke(boolean canGetRow) throws IgniteCheckedException {
         TestTree tree = createTestTree(canGetRow);
 
-        Map<Long,Long> map = new HashMap<>();
+        Map<Long, Long> map = new HashMap<>();
 
         int loops = reuseList == null ? 20_000 : 60_000;
 
@@ -1173,7 +1173,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
     private void doTestRandomPutRemove(boolean canGetRow) throws IgniteCheckedException {
         TestTree tree = createTestTree(canGetRow);
 
-        Map<Long,Long> map = new HashMap<>();
+        Map<Long, Long> map = new HashMap<>();
 
         int loops = reuseList == null ? 100_000 : 300_000;
 
@@ -1211,7 +1211,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
      * @param map Map.
      * @throws IgniteCheckedException If failed.
      */
-    private void assertEqualContents(IgniteTree<Long, Long> tree, Map<Long,Long> map) throws IgniteCheckedException {
+    private void assertEqualContents(IgniteTree<Long, Long> tree, Map<Long, Long> map) throws IgniteCheckedException {
         GridCursor<Long> cursor = tree.find(null, null);
 
         while (cursor.next()) {
@@ -1271,7 +1271,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         TestTree tree = createTestTree(true);
 
-        TreeMap<Long,Long> map = new TreeMap<>();
+        TreeMap<Long, Long> map = new TreeMap<>();
 
         for (int i = 0; i < 20_000 + rnd.nextInt(2 * MAX_PER_PAGE); i++) {
             Long row = (long)rnd.nextInt(40_000);
@@ -1352,7 +1352,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
             items[i] = (long) i;
 
         TestTree testTree = createTestTree(true);
-        TreeMap<Long,Long> goldenMap = new TreeMap<>();
+        TreeMap<Long, Long> goldenMap = new TreeMap<>();
 
         assertEquals(0, testTree.size());
         assertEquals(0, goldenMap.size());
@@ -2509,7 +2509,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
     private void doTestRandomPutRemoveMultithreaded(boolean canGetRow) throws Exception {
         final TestTree tree = createTestTree(canGetRow);
 
-        final Map<Long,Long> map = new ConcurrentHashMap<>();
+        final Map<Long, Long> map = new ConcurrentHashMap<>();
 
         final int loops = reuseList == null ? 20_000 : 60_000;
 
@@ -2567,7 +2567,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
                                 }
                             });
 
-                            map.put(x,x);
+                            map.put(x, x);
                         }
                         else if (op == 3) {
                             tree.invoke(x, null, new IgniteTree.InvokeClosure<Long>() {
@@ -2818,12 +2818,12 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
          * @param beforeLock Before lock.
          */
         private static void printLocks(SB b, ConcurrentMap<Object, Map<Long, Long>> locks, Map<Object, Long> beforeLock) {
-            for (Map.Entry<Object,Map<Long,Long>> entry : locks.entrySet()) {
+            for (Map.Entry<Object, Map<Long, Long>> entry : locks.entrySet()) {
                 Object thId = entry.getKey();
 
                 Long z = beforeLock.get(thId);
 
-                Set<Map.Entry<Long,Long>> xx = entry.getValue().entrySet();
+                Set<Map.Entry<Long, Long>> xx = entry.getValue().entrySet();
 
                 if (z == null && xx.isEmpty())
                     continue;
@@ -2835,7 +2835,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
                 b.a('\n');
 
-                for (Map.Entry<Long,Long> x : xx)
+                for (Map.Entry<Long, Long> x : xx)
                     b.a(" -  ").appendHex(x.getValue()).a("  (").appendHex(x.getKey()).a(")\n");
 
                 b.a('\n');
@@ -2908,7 +2908,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Long getLookupRow(BPlusTree<Long,?> tree, long pageAddr, int idx) {
+        @Override public Long getLookupRow(BPlusTree<Long, ?> tree, long pageAddr, int idx) {
             Long row = PageUtils.getLong(pageAddr, offset(idx));
 
             checkNotRemoved(row);
@@ -2976,7 +2976,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Long getLookupRow(BPlusTree<Long,?> tree, long pageAddr, int idx) {
+        @Override public Long getLookupRow(BPlusTree<Long, ?> tree, long pageAddr, int idx) {
             return PageUtils.getLong(pageAddr, offset(idx));
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
index c143d8f..d49e7b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
@@ -156,7 +156,7 @@ public class IgniteDataStreamerPerformanceTest extends GridCommonAbstractTest {
 
             t.start();
 
-            int threadNum = 2;//Runtime.getRuntime().availableProcessors();
+            int threadNum = 2; //Runtime.getRuntime().availableProcessors();
 
             multithreaded(new Callable<Object>() {
                 @SuppressWarnings("InfiniteLoopStatement")
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
index ee29c23..294665f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
@@ -509,7 +509,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
     private UUID registerListener(ClusterGroup grp) throws Exception {
         Ignite ignite = grid(SERVER_NODE_IDX);
 
-        IgniteBiPredicate<UUID,Object> lsnr = new MessageListener();
+        IgniteBiPredicate<UUID, Object> lsnr = new MessageListener();
 
         return ignite.message(grp).remoteListen(MESSAGE_TOPIC, lsnr);
     }
@@ -517,7 +517,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
     /**
      * Ignite predicate.
      */
-    private static class MessageListener implements IgniteBiPredicate<UUID,Object> {
+    private static class MessageListener implements IgniteBiPredicate<UUID, Object> {
         /**
          * Default constructor.
          */
@@ -536,7 +536,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
     /**
      * Ignite order predicate.
      */
-    private static class OrderedMessageListener implements IgniteBiPredicate<UUID,TestObject> {
+    private static class OrderedMessageListener implements IgniteBiPredicate<UUID, TestObject> {
         /**
          * Counter.
          */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridArraysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridArraysSelfTest.java
index 6ff07bc..f8a96f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridArraysSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridArraysSelfTest.java
@@ -110,12 +110,12 @@ public class GridArraysSelfTest extends GridCommonAbstractTest {
      */
     @Test
     public void testRemoveLong() {
-        long[] arr = {0,1,2,3,4,5,6};
+        long[] arr = {0, 1, 2, 3, 4, 5, 6};
 
-        assertTrue(Arrays.equals(new long[]{1,2,3,4,5,6}, remove(arr, 0)));
-        assertTrue(Arrays.equals(new long[]{0,2,3,4,5,6}, remove(arr, 1)));
-        assertTrue(Arrays.equals(new long[]{0,1,2,3,5,6}, remove(arr, 4)));
-        assertTrue(Arrays.equals(new long[]{0,1,2,3,4,5}, remove(arr, 6)));
+        assertTrue(Arrays.equals(new long[] {1, 2, 3, 4, 5, 6}, remove(arr, 0)));
+        assertTrue(Arrays.equals(new long[] {0, 2, 3, 4, 5, 6}, remove(arr, 1)));
+        assertTrue(Arrays.equals(new long[] {0, 1, 2, 3, 5, 6}, remove(arr, 4)));
+        assertTrue(Arrays.equals(new long[] {0, 1, 2, 3, 4, 5}, remove(arr, 6)));
         assertTrue(Arrays.equals(new long[0], remove(new long[]{1}, 0)));
     }
 
@@ -123,12 +123,12 @@ public class GridArraysSelfTest extends GridCommonAbstractTest {
      */
     @Test
     public void testRemove() {
-        Integer[] arr = {0,1,2,3,4,5,6};
+        Integer[] arr = {0, 1, 2, 3, 4, 5, 6};
 
-        assertTrue(Arrays.equals(new Integer[]{1,2,3,4,5,6}, remove(arr, 0)));
-        assertTrue(Arrays.equals(new Integer[]{0,2,3,4,5,6}, remove(arr, 1)));
-        assertTrue(Arrays.equals(new Integer[]{0,1,2,3,5,6}, remove(arr, 4)));
-        assertTrue(Arrays.equals(new Integer[]{0,1,2,3,4,5}, remove(arr, 6)));
+        assertTrue(Arrays.equals(new Integer[] {1, 2, 3, 4, 5, 6}, remove(arr, 0)));
+        assertTrue(Arrays.equals(new Integer[] {0, 2, 3, 4, 5, 6}, remove(arr, 1)));
+        assertTrue(Arrays.equals(new Integer[] {0, 1, 2, 3, 5, 6}, remove(arr, 4)));
+        assertTrue(Arrays.equals(new Integer[] {0, 1, 2, 3, 4, 5}, remove(arr, 6)));
         assertTrue(Arrays.equals(new Integer[0], remove(new Integer[]{1}, 0)));
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapPerformanceAbstractTest.java
index d5c21b5..34b7f10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapPerformanceAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapPerformanceAbstractTest.java
@@ -61,7 +61,7 @@ public abstract class GridOffHeapMapPerformanceAbstractTest extends GridCommonAb
     protected long mem = 12L * 1024L * 1024L * 1024L;
 
     /** */
-    protected long dur = 60 * 1000;//2 * 60 * 60 * 1000;
+    protected long dur = 60 * 1000; //2 * 60 * 60 * 1000;
 
     /**
      *
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
index db3f597..36f9e5d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
@@ -485,7 +485,7 @@ public class GridToStringBuilderSelfTest extends GridCommonAbstractTest {
 
         String testClsStrOf = GridToStringBuilder.toString(TestClass1.class, testCls);
 
-        String testClsStrOfR = testClsStrOf.replaceAll("... and 1 more","");
+        String testClsStrOfR = testClsStrOf.replaceAll("... and 1 more", "");
 
         info(testClsStr);
         info(testClsStrOf);
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java
index 084859c..30751ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java
@@ -35,7 +35,7 @@ public class GridBoundedConcurrentOrderedMapSelfTest extends GridCommonAbstractT
      */
     @Test
     public void testEvictionSingleElement() {
-        SortedMap<Integer,String> m = new GridBoundedConcurrentOrderedMap<>(1);
+        SortedMap<Integer, String> m = new GridBoundedConcurrentOrderedMap<>(1);
 
         m.put(0, "0");
 
@@ -56,7 +56,7 @@ public class GridBoundedConcurrentOrderedMapSelfTest extends GridCommonAbstractT
      */
     @Test
     public void testEvictionListener() {
-        GridBoundedConcurrentOrderedMap<Integer,String> m = new GridBoundedConcurrentOrderedMap<>(1);
+        GridBoundedConcurrentOrderedMap<Integer, String> m = new GridBoundedConcurrentOrderedMap<>(1);
 
         final AtomicInteger evicted = new AtomicInteger();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
index c5fefb7..fd47c9e 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
@@ -115,8 +115,8 @@ public class GridContinuousOperationsLoadTest {
                 if (useQry) {
                     ContinuousQuery<Object, Object> qry = new ContinuousQuery<>();
 
-                    qry.setLocalListener(new CacheEntryUpdatedListener<Object,Object>() {
-                        @Override public void onUpdated(Iterable<CacheEntryEvent<?,?>> evts) {
+                    qry.setLocalListener(new CacheEntryUpdatedListener<Object, Object>() {
+                        @Override public void onUpdated(Iterable<CacheEntryEvent<?, ?>> evts) {
                             if (cbSleepMs > 0) {
                                 try {
                                     U.sleep(cbSleepMs);
@@ -126,13 +126,13 @@ public class GridContinuousOperationsLoadTest {
                                 }
                             }
 
-                            for (CacheEntryEvent<?,?> ignored : evts)
+                            for (CacheEntryEvent<?, ?> ignored : evts)
                                 cbCntr.incrementAndGet();
                         }
                     });
 
-                    qry.setRemoteFilter(new CacheEntryEventSerializableFilter<Object,Object>() {
-                        @Override public boolean evaluate(CacheEntryEvent<?,?> evt) {
+                    qry.setRemoteFilter(new CacheEntryEventSerializableFilter<Object, Object>() {
+                        @Override public boolean evaluate(CacheEntryEvent<?, ?> evt) {
                             if (filterSleepMs > 0) {
                                 try {
                                     U.sleep(filterSleepMs);
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
index 28d56fe..0855226 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
@@ -425,7 +425,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
         for (int i = 0; i < inBools.length; i++)
             assertTrue(Arrays.equals(inBools[i], outBools[i]));
 
-        int[] inInts = new int[] {1,2,3,4,5,6,7};
+        int[] inInts = new int[] {1, 2, 3, 4, 5, 6, 7};
 
         int[] outInts = unmarshal(marshal(inInts));
 
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
index 462fbf5..70304a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
@@ -427,7 +427,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme
     private <T> void sendOrdered(
             final IgniteMessaging igniteMsg,
             final List<T> msgs,
-            final IgniteBiInClosure<List<T>,List<Thread>> cls
+            final IgniteBiInClosure<List<T>, List<Thread>> cls
     ) throws Exception {
         final CountDownLatch latch = new CountDownLatch(msgs.size());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
index d68265d..914a140 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
@@ -110,7 +110,7 @@ public class GridP2PTestJob extends ComputeJobAdapter {
             cls = Class.forName("java.math.BigInteger");
         }
         catch (ClassNotFoundException e) {
-            log.error("Mandatory class can't be loaded: [java.math.BigInteger]",e);
+            log.error("Mandatory class can't be loaded: [java.math.BigInteger]", e);
 
             return -5;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java
index 6c33bea..b205a48 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java
@@ -99,7 +99,7 @@ public class PlatformEventsWriteEventTask extends ComputeTaskAdapter<Long, Objec
                 IgniteUuid igniteUuid = new IgniteUuid(uuid, 3);
 
                 ctx.writeEvent(writer, new CacheEvent("cacheName", node, node, "msg", evtType, 1, true, 2,
-                    igniteUuid, "txLabel",3, 4, true, 5, true, uuid, "cloClsName", "taskName"));
+                    igniteUuid, "txLabel", 3, 4, true, 5, true, uuid, "cloClsName", "taskName"));
 
                 //noinspection unchecked
                 ctx.writeEvent(writer, new CacheQueryExecutedEvent(node, msg, evtType, "qryType", "cacheName",
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
index 6d203b1..a0c6d0b 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
@@ -78,7 +78,7 @@ public class TcpCommunicationSpiDropNodesTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         super.beforeTestsStarted();
 
-        System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,"true");
+        System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java
index 95e3f50..d4aac51 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java
@@ -214,7 +214,7 @@ public class TcpDiscoveryNodeJoinAndFailureTest extends GridCommonAbstractTest {
 
         specialIpFinder0 = new TcpDiscoveryVmIpFinder(false);
 
-        ((TcpDiscoveryVmIpFinder)specialIpFinder0).setAddresses(Arrays.asList("127.0.0.1:47501","127.0.0.1:47503"));
+        ((TcpDiscoveryVmIpFinder)specialIpFinder0).setAddresses(Arrays.asList("127.0.0.1:47501", "127.0.0.1:47503"));
 
         specialIpFinder1 = new TcpDiscoveryVmIpFinder(false);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 6d871f2..facf22b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -1103,7 +1103,7 @@ public final class GridTestUtils {
      * @return Future with task result.
      */
     public static IgniteInternalFuture runAsync(final Runnable task) {
-        return runAsync(task,"async-runnable-runner");
+        return runAsync(task, "async-runnable-runner");
     }
 
     /**
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 a0a8830..8fec5ba 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
@@ -732,7 +732,7 @@ public abstract class GridAbstractTest extends JUnitAssertAware {
     private void cleanUpTestEnviroment() throws Exception {
         long dur = System.currentTimeMillis() - ts;
 
-        U.quietAndInfo(log(),">>> Stopping test: " + testDescription() + " in " + dur + " ms <<<");
+        U.quietAndInfo(log(), ">>> Stopping test: " + testDescription() + " in " + dur + " ms <<<");
         printJvmMemoryStatistic();
 
         try {
@@ -1300,7 +1300,7 @@ public abstract class GridAbstractTest extends JUnitAssertAware {
      */
     protected Ignite startRemoteGrid(String igniteInstanceName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
         throws Exception {
-        return startRemoteGrid(igniteInstanceName, cfg, ctx,true);
+        return startRemoteGrid(igniteInstanceName, cfg, ctx, true);
     }
 
     /**
@@ -2430,7 +2430,7 @@ public abstract class GridAbstractTest extends JUnitAssertAware {
 
             if (t != null) {
                 if (t instanceof AssumptionViolatedException)
-                    U.quietAndInfo(log,"Test ignored [test=" + testDescription() + ", msg=" + t.getMessage() + "]");
+                    U.quietAndInfo(log, "Test ignored [test=" + testDescription() + ", msg=" + t.getMessage() + "]");
                 else {
                     U.error(log, "Test failed [test=" + testDescription() +
                         ", duration=" + (System.currentTimeMillis() - ts) + "]", t);
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/test/VariationsIteratorTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/test/VariationsIteratorTest.java
index a21cb6c..fa88a9e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/test/VariationsIteratorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/test/VariationsIteratorTest.java
@@ -80,13 +80,13 @@ public class VariationsIteratorTest {
     @Test
     public void test4() throws Exception {
         Object[][] arr = new Object[][]{
-            {0,1,2},
-            {0,1},
-            {0,1,2,4},
-            {0,1},
+            {0, 1, 2},
+            {0, 1},
+            {0, 1, 2, 4},
+            {0, 1},
             {0},
             {0},
-            {0,1,2,4},
+            {0, 1, 2, 4},
         };
 
         checkIterator(arr);
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite7.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite7.java
index 6f4270e..3c0abd9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite7.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite7.java
@@ -56,8 +56,8 @@ public class IgniteCacheMvccTestSuite7 {
         ignoredTests.add(PageEvictionMultinodeMixedRegionsTest.class);
 
         // Other non-tx tests.
-        ignoredTests.add(CheckpointBufferDeadlockTest.class);//
-        ignoredTests.add(AuthenticationConfigurationClusterTest.class);//
+        ignoredTests.add(CheckpointBufferDeadlockTest.class); //
+        ignoredTests.add(AuthenticationConfigurationClusterTest.class); //
         ignoredTests.add(AuthenticationProcessorSelfTest.class);
         ignoredTests.add(AuthenticationOnNotActiveClusterTest.class);
         ignoredTests.add(AuthenticationProcessorNodeRestartTest.class);
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java
index 6afe7cb..1b3153b 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java
@@ -125,22 +125,22 @@ public class GridLongListSelfTest {
      */
     @Test
     public void testRemove() {
-        GridLongList list = asList(1,2,3,4,5,6);
+        GridLongList list = asList(1, 2, 3, 4, 5, 6);
 
         assertEquals(2, list.removeValue(0, 3));
-        assertEquals(asList(1,2,4,5,6), list);
+        assertEquals(asList(1, 2, 4, 5, 6), list);
 
         assertEquals(-1, list.removeValue(1, 1));
         assertEquals(-1, list.removeValue(0, 3));
 
         assertEquals(4, list.removeValue(0, 6));
-        assertEquals(asList(1,2,4,5), list);
+        assertEquals(asList(1, 2, 4, 5), list);
 
         assertEquals(2, list.removeIndex(1));
-        assertEquals(asList(1,4,5), list);
+        assertEquals(asList(1, 4, 5), list);
 
         assertEquals(1, list.removeIndex(0));
-        assertEquals(asList(4,5), list);
+        assertEquals(asList(4, 5), list);
     }
 
     /**
diff --git a/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterTest.java b/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterTest.java
index f3627b7..896dc67 100644
--- a/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterTest.java
+++ b/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterTest.java
@@ -176,7 +176,7 @@ public class IgniteWalConverterTest extends GridCommonAbstractTest {
             U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_MARSHALLER_PATH, false),
             false,
             null,
-            null, null, null, null, true,true, emptyList()
+            null, null, null, null, true, true, emptyList()
         );
 
         convert(out, arg);
@@ -239,7 +239,7 @@ public class IgniteWalConverterTest extends GridCommonAbstractTest {
             null,
             false,
             null,
-            null, null, null, null, true,true, emptyList()
+            null, null, null, null, true, true, emptyList()
         );
 
         convert(out, arg);
@@ -355,7 +355,7 @@ public class IgniteWalConverterTest extends GridCommonAbstractTest {
             U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_MARSHALLER_PATH, false),
             false,
             null,
-            null, null, null, null, true,true, emptyList()
+            null, null, null, null, true, true, emptyList()
         );
 
         convert(out, arg);
@@ -459,7 +459,7 @@ public class IgniteWalConverterTest extends GridCommonAbstractTest {
             U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_MARSHALLER_PATH, false),
             false,
             null,
-            null, null, null, null, true,true, emptyList()
+            null, null, null, null, true, true, emptyList()
         );
 
         convert(out, arg);
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/AlwaysTruePredicate.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/AlwaysTruePredicate.java
index d48bdda..5c44e42 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/AlwaysTruePredicate.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/AlwaysTruePredicate.java
@@ -25,6 +25,6 @@ import org.apache.ignite.lang.IgniteBiPredicate;
 public class AlwaysTruePredicate implements IgniteBiPredicate<Object, Object> {
     /** */
     @Override public boolean apply(Object k, Object v) {
-        return new CacheDeploymentAlwaysTruePredicate().apply(k,v);
+        return new CacheDeploymentAlwaysTruePredicate().apply(k, v);
     }
 }
diff --git a/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java b/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
index f12035b..36000f1 100644
--- a/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
+++ b/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
@@ -179,7 +179,7 @@ public class HibernateCacheProxy implements IgniteInternalCache<Object, Object>
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<Collection<CacheEntry<Object,Object>>> getEntriesAsync(
+    @Override public IgniteInternalFuture<Collection<CacheEntry<Object, Object>>> getEntriesAsync(
         @Nullable Collection keys
     ) {
         return delegate.get().getEntriesAsync(transform(keys));
@@ -706,7 +706,7 @@ public class HibernateCacheProxy implements IgniteInternalCache<Object, Object>
     }
 
     /** {@inheritDoc} */
-    @Override public Iterator<Cache.Entry<Object,Object>> scanIterator(
+    @Override public Iterator<Cache.Entry<Object, Object>> scanIterator(
         boolean keepBinary,
         @Nullable IgniteBiPredicate p
     ) throws IgniteCheckedException {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 4701e8a..237f191 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -153,7 +153,7 @@ public class H2TreeIndex extends H2TreeIndexBase {
     private final GridMessageListener msgLsnr;
 
     /** */
-    private final CIX2<ClusterNode,Message> locNodeHnd = new CIX2<ClusterNode,Message>() {
+    private final CIX2<ClusterNode, Message> locNodeHnd = new CIX2<ClusterNode, Message>() {
         @Override public void applyx(ClusterNode locNode, Message msg) {
             onMessage0(locNode.id(), msg);
         }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/AbstractH2LeafIO.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/AbstractH2LeafIO.java
index 058b5bc..60cbf8c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/AbstractH2LeafIO.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/AbstractH2LeafIO.java
@@ -54,7 +54,7 @@ public abstract class AbstractH2LeafIO extends BPlusLeafIO<H2Row> implements H2R
     }
 
     /** {@inheritDoc} */
-    @Override public H2Row getLookupRow(BPlusTree<H2Row,?> tree, long pageAddr, int idx)
+    @Override public H2Row getLookupRow(BPlusTree<H2Row, ?> tree, long pageAddr, int idx)
         throws IgniteCheckedException {
         long link = getLink(pageAddr, idx);
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java
index ee9daa4..0f94874 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlAstUtils.java
@@ -114,7 +114,7 @@ public final class DmlAstUtils {
 
                 args[i] = arr;
 
-                GridSqlColumn newCol = new GridSqlColumn(null, from, null,"TABLE", colName);
+                GridSqlColumn newCol = new GridSqlColumn(null, from, null, "TABLE", colName);
 
                 newCol.resultType(cols[i].resultType());
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java
index cc5a0ad..1632353 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java
@@ -60,7 +60,7 @@ public class GridH2MetaTable extends TableBase {
 
     /** */
     private final Set<Session> fakeExclusiveSet = Collections.newSetFromMap(
-        new ConcurrentHashMap<Session,Boolean>());
+        new ConcurrentHashMap<Session, Boolean>());
 
     /**
      * @param data Data.
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/CollocationModel.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/CollocationModel.java
index e68edf2..f10e45c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/CollocationModel.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/CollocationModel.java
@@ -804,7 +804,7 @@ public final class CollocationModel {
         // We have to clear this cache because normally sub-query plan cost does not depend on anything
         // other than index condition masks and sort order, but in our case it can depend on order
         // of previous table filters.
-        Map<Object,ViewIndex> viewIdxCache = ses.getViewIndexCache(true);
+        Map<Object, ViewIndex> viewIdxCache = ses.getViewIndexCache(true);
 
         if (!viewIdxCache.isEmpty())
             viewIdxCache.clear();
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedJoinContext.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedJoinContext.java
index 6469a89..3420827 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedJoinContext.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedJoinContext.java
@@ -100,7 +100,7 @@ public class DistributedJoinContext {
      * @return Partitions map.
      */
     @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
-    public Map<UUID,int[]> partitionsMap() {
+    public Map<UUID, int[]> partitionsMap() {
         return partsMap;
     }
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedLookupBatch.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedLookupBatch.java
index 5dbb38c..625997c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedLookupBatch.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/join/DistributedLookupBatch.java
@@ -57,7 +57,7 @@ public class DistributedLookupBatch implements IndexLookupBatch {
     private final H2TreeIndex idx;
 
     /** */
-    private final GridCacheContext<?,?> cctx;
+    private final GridCacheContext<?, ?> cctx;
 
     /** */
     private final boolean ucast;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index beadf28..276694e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -697,7 +697,7 @@ public class GridSqlQuerySplitter {
         GridSqlSelect select = model.ast();
 
         Set<GridSqlAlias> tblAliases = U.newIdentityHashSet();
-        Map<String,GridSqlAlias> cols = new HashMap<>();
+        Map<String, GridSqlAlias> cols = new HashMap<>();
 
         // Collect all the tables for push down.
         for (int i = begin; i <= end; i++) {
@@ -737,7 +737,7 @@ public class GridSqlQuerySplitter {
      */
     private void pushDownJoins(
         Set<GridSqlAlias> tblAliases,
-        Map<String,GridSqlAlias> cols,
+        Map<String, GridSqlAlias> cols,
         SplitterQueryModel model,
         int begin,
         int end,
@@ -901,7 +901,7 @@ public class GridSqlQuerySplitter {
     @SuppressWarnings("IfMayBeConditional")
     private void pushDownSelectColumns(
         Set<GridSqlAlias> tblAliases,
-        Map<String,GridSqlAlias> cols,
+        Map<String, GridSqlAlias> cols,
         GridSqlAlias wrapAlias,
         GridSqlSelect select
     ) {
@@ -945,7 +945,7 @@ public class GridSqlQuerySplitter {
      */
     private void pushDownColumnsInExpression(
         Set<GridSqlAlias> tblAliases,
-        Map<String,GridSqlAlias> cols,
+        Map<String, GridSqlAlias> cols,
         GridSqlAlias wrapAlias,
         GridSqlAst parent,
         int childIdx
@@ -969,7 +969,7 @@ public class GridSqlQuerySplitter {
      */
     private void pushDownColumn(
         Set<GridSqlAlias> tblAliases,
-        Map<String,GridSqlAlias> cols,
+        Map<String, GridSqlAlias> cols,
         GridSqlAlias wrapAlias,
         GridSqlAst parent,
         int childIdx
@@ -1050,7 +1050,7 @@ public class GridSqlQuerySplitter {
      */
     private void pushDownWhereConditions(
         Set<GridSqlAlias> tblAliases,
-        Map<String,GridSqlAlias> cols,
+        Map<String, GridSqlAlias> cols,
         GridSqlAlias wrapAlias,
         GridSqlSelect select
     ) {
@@ -1324,7 +1324,7 @@ public class GridSqlQuerySplitter {
      * @return Map of columns with types.
      */
     @SuppressWarnings("IfMayBeConditional")
-    private LinkedHashMap<String,?> collectColumns(List<GridSqlAst> cols) {
+    private LinkedHashMap<String, ?> collectColumns(List<GridSqlAst> cols) {
         LinkedHashMap<String, GridSqlType> res = new LinkedHashMap<>(cols.size(), 1f, false);
 
         for (int i = 0; i < cols.size(); i++) {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractReducer.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractReducer.java
index c1e32b8..bf392e5 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractReducer.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractReducer.java
@@ -254,7 +254,7 @@ public abstract class AbstractReducer implements Reducer {
 
             initLastPages(nodeId, res);
 
-            ConcurrentMap<ReduceSourceKey,Integer> lp = lastPages;
+            ConcurrentMap<ReduceSourceKey, Integer> lp = lastPages;
 
             if (lp == null)
                 return; // It was not initialized --> wait for last page flag.
@@ -288,7 +288,7 @@ public abstract class AbstractReducer implements Reducer {
         if (allRows < 0 || res.page() != 0)
             return;
 
-        ConcurrentMap<ReduceSourceKey,Integer> lp = lastPages;
+        ConcurrentMap<ReduceSourceKey, Integer> lp = lastPages;
 
         if (lp == null && !LAST_PAGES_UPDATER.compareAndSet(this, null, lp = new ConcurrentHashMap<>()))
             lp = lastPages;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 4e7b163..8da8831 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -205,7 +205,7 @@ public class GridMapQueryExecutor {
     public void onQueryRequest(final ClusterNode node, final GridH2QueryRequest req) throws IgniteCheckedException {
         int[] qryParts = req.queryPartitions();
 
-        final Map<UUID,int[]> partsMap = req.partitions();
+        final Map<UUID, int[]> partsMap = req.partitions();
 
         final int[] parts = qryParts == null ? (partsMap == null ? null : partsMap.get(ctx.localNodeId())) : qryParts;
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 2cab5d0..376902d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -145,7 +145,7 @@ public class GridReduceQueryExecutor {
     private final Lock fakeTblsLock = new ReentrantLock();
 
     /** */
-    private final CIX2<ClusterNode,Message> locNodeHnd = new CIX2<ClusterNode,Message>() {
+    private final CIX2<ClusterNode, Message> locNodeHnd = new CIX2<ClusterNode, Message>() {
         @Override public void applyx(ClusterNode locNode, Message msg) {
             assert msg instanceof GridQueryNextPageRequest || msg instanceof GridH2QueryRequest ||
                 msg instanceof GridH2DmlRequest || msg instanceof GridQueryCancelRequest : msg.getClass();
@@ -309,7 +309,7 @@ public class GridReduceQueryExecutor {
      * @param cacheId Cache ID.
      * @return Cache context.
      */
-    private GridCacheContext<?,?> cacheContext(Integer cacheId) {
+    private GridCacheContext<?, ?> cacheContext(Integer cacheId) {
         GridCacheContext<?, ?> cctx = ctx.cache().context().cacheContext(cacheId);
 
         if (cctx == null)
@@ -1176,7 +1176,7 @@ public class GridReduceQueryExecutor {
 
         Map<UUID, int[]> res = U.newHashMap(m.size());
 
-        for (Map.Entry<ClusterNode,IntArray> entry : m.entrySet())
+        for (Map.Entry<ClusterNode, IntArray> entry : m.entrySet())
             res.put(entry.getKey().id(), toArray(entry.getValue()));
 
         return res;
@@ -1202,13 +1202,13 @@ public class GridReduceQueryExecutor {
             data.create = true;
 
             if (!explain) {
-                LinkedHashMap<String,?> colsMap = qry.columns();
+                LinkedHashMap<String, ?> colsMap = qry.columns();
 
                 assert colsMap != null;
 
                 ArrayList<Column> cols = new ArrayList<>(colsMap.size());
 
-                for (Map.Entry<String,?> e : colsMap.entrySet()) {
+                for (Map.Entry<String, ?> e : colsMap.entrySet()) {
                     String alias = e.getKey();
                     GridSqlType type = (GridSqlType)e.getValue();
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndex.java
index 9b4e983..59304f2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndex.java
@@ -304,7 +304,7 @@ public abstract class ReduceIndex extends BaseIndex {
         if (allRows < 0 || res.page() != 0)
             return;
 
-        ConcurrentMap<ReduceSourceKey,Integer> lp = lastPages;
+        ConcurrentMap<ReduceSourceKey, Integer> lp = lastPages;
 
         if (lp == null && !LAST_PAGES_UPDATER.compareAndSet(this, null, lp = new ConcurrentHashMap<>()))
             lp = lastPages;
@@ -330,7 +330,7 @@ public abstract class ReduceIndex extends BaseIndex {
 
             initLastPages(nodeId, res);
 
-            ConcurrentMap<ReduceSourceKey,Integer> lp = lastPages;
+            ConcurrentMap<ReduceSourceKey, Integer> lp = lastPages;
 
             if (lp == null)
                 return; // It was not initialized --> wait for last page flag.
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReducePartitionMapper.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReducePartitionMapper.java
index 394bbb5..84fa47d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReducePartitionMapper.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReducePartitionMapper.java
@@ -129,7 +129,7 @@ public class ReducePartitionMapper {
      * @param cacheId Cache ID.
      * @return Cache context.
      */
-    private GridCacheContext<?,?> cacheContext(Integer cacheId) {
+    private GridCacheContext<?, ?> cacheContext(Integer cacheId) {
         GridCacheContext<?, ?> cctx = ctx.cache().context().cacheContext(cacheId);
 
         if (cctx == null)
@@ -389,7 +389,7 @@ public class ReducePartitionMapper {
     @SuppressWarnings("unchecked")
     private Map<ClusterNode, IntArray> partitionedUnstableDataNodes(List<Integer> cacheIds) {
         // If the main cache is replicated, just replace it with the first partitioned.
-        GridCacheContext<?,?> cctx = findFirstPartitioned(cacheIds);
+        GridCacheContext<?, ?> cctx = findFirstPartitioned(cacheIds);
 
         final int partsCnt = cctx.affinity().partitions();
 
@@ -581,7 +581,7 @@ public class ReducePartitionMapper {
         if (F.isEmpty(nodes))
             return null; // Retry.
 
-        for (;i < cacheIds.size(); i++) {
+        for (; i < cacheIds.size(); i++) {
             GridCacheContext<?, ?> extraCctx = cacheContext(cacheIds.get(i));
 
             if (extraCctx.isLocal())
@@ -617,7 +617,7 @@ public class ReducePartitionMapper {
      * @param cctx Cache context.
      * @return Owning nodes or {@code null} if we can't find owners for some partitions.
      */
-    private Set<ClusterNode> replicatedUnstableDataNodes(GridCacheContext<?,?> cctx) {
+    private Set<ClusterNode> replicatedUnstableDataNodes(GridCacheContext<?, ?> cctx) {
         assert cctx.isReplicated() : cctx.name() + " must be replicated";
 
         String cacheName = cctx.name();
@@ -699,7 +699,7 @@ public class ReducePartitionMapper {
      * @param cacheIds Cache IDs.
      * @return The first partitioned cache context.
      */
-    public GridCacheContext<?,?> findFirstPartitioned(List<Integer> cacheIds) {
+    public GridCacheContext<?, ?> findFirstPartitioned(List<Integer> cacheIds) {
         for (int i = 0; i < cacheIds.size(); i++) {
             GridCacheContext<?, ?> cctx = cacheContext(cacheIds.get(i));
 
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 8c1dd93..53193b9 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
@@ -986,7 +986,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      * @param locPart Local partition.
      * @return Cache size representation object.
      */
-    private CacheSize calcCacheSize(CacheGroupContext grpCtx,GridDhtLocalPartition locPart) {
+    private CacheSize calcCacheSize(CacheGroupContext grpCtx, GridDhtLocalPartition locPart) {
         try {
             if (validateCtx.isCancelled())
                 return new CacheSize(null, emptyMap());
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 e1a747a..0e892d3 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
@@ -362,7 +362,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest {
 
         this.capture = new GridStringLogger(false, this.log);
 
-        GridTestUtils.setFieldValue(ignite.context().query(), GridProcessorAdapter.class,"log", capture);
+        GridTestUtils.setFieldValue(ignite.context().query(), GridProcessorAdapter.class, "log", capture);
 
         return ignite;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index db976e8..ce072ed 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -99,7 +99,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
      * @return Cache configuration.
      */
     private static CacheConfiguration createCache(String name, CacheMode mode, Class<?> clsK, Class<?> clsV) {
-        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cc = defaultCacheConfiguration();
 
         cc.setName(name);
         cc.setCacheMode(mode);
@@ -220,7 +220,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
      */
     @Test
     public void testApiQueries() throws Exception {
-        IgniteCache<Object,Object> c = ignite.cache(PART_CACHE_NAME);
+        IgniteCache<Object, Object> c = ignite.cache(PART_CACHE_NAME);
 
         c.query(new SqlFieldsQuery("select cast(? as varchar) from FactPurchase").setArgs("aaa")).getAll();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index 3d4fa1b..d772147 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -46,7 +46,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
 
         cfg.setNetworkTimeout(2000);
 
-        CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
         cacheCfg.setCacheMode(REPLICATED);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
index 723e329..236bd0f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
@@ -53,7 +53,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
+        CacheConfiguration<?, ?> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
 
         ccfg.setName("offheap-cache");
         ccfg.setCacheMode(CacheMode.PARTITIONED);
@@ -91,7 +91,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest {
     public void testPerformance() throws Exception {
         Random rnd = new GridRandom();
 
-        final IgniteCache<Long,Person> c = ignite.cache("offheap-cache");
+        final IgniteCache<Long, Person> c = ignite.cache("offheap-cache");
 
         X.println("___ PUT start");
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 721be37..2c96afb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -45,7 +45,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cc = defaultCacheConfiguration();
 
         cc.setCacheMode(PARTITIONED);
         cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
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 7b8544e..a290e9c 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
@@ -493,7 +493,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
         cache.put(1, 1);
         cache.put(2, 2);
 
-        QueryCursor<Cache.Entry<Integer,Integer>> qry =
+        QueryCursor<Cache.Entry<Integer, Integer>> qry =
             cache.query(new SqlQuery<Integer, Integer>(Integer.class, "_key between 2 and 1"));
 
         assertTrue(qry.getAll().isEmpty());
@@ -1324,7 +1324,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
         for (int i = 0; i < 50; i++)
             cache.put(i, i);
 
-        QueryCursor<Cache.Entry<Integer, Integer>> q = cache.query(new ScanQuery<>(new IgniteBiPredicate<Integer,Integer>() {
+        QueryCursor<Cache.Entry<Integer, Integer>> q = cache.query(new ScanQuery<>(new IgniteBiPredicate<Integer, Integer>() {
             @Override public boolean apply(Integer k, Integer v) {
                 assertNotNull(k);
                 assertNotNull(v);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
index e2441e0..cc8cb60 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
@@ -63,7 +63,7 @@ public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -95,7 +95,7 @@ public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest {
      * @param collocated Colocated.
      * @return Result.
      */
-    private static List<List<?>> query(IgniteCache<AffinityUuid,Purchase> c, boolean collocated) {
+    private static List<List<?>> query(IgniteCache<AffinityUuid, Purchase> c, boolean collocated) {
         return c.query(new SqlFieldsQuery(QRY).setArgs(30, 5).setCollocated(collocated)).getAll();
     }
 
@@ -104,7 +104,7 @@ public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest {
      */
     @Test
     public void testColocatedQueryRight() {
-        IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(DEFAULT_CACHE_NAME);
+        IgniteCache<AffinityUuid, Purchase> c = ignite(0).cache(DEFAULT_CACHE_NAME);
 
         Random rnd = new GridRandom(SEED);
 
@@ -132,7 +132,7 @@ public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest {
      */
     @Test
     public void testColocatedQueryWrong() {
-        IgniteCache<AffinityUuid,Purchase> c = ignite(0).cache(DEFAULT_CACHE_NAME);
+        IgniteCache<AffinityUuid, Purchase> c = ignite(0).cache(DEFAULT_CACHE_NAME);
 
         Random rnd = new GridRandom(SEED);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
index f8ea014..c1e9bf6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
@@ -117,9 +117,9 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
         GridRandom rnd = new GridRandom();
         Ignite ignite = ignite(0);
 
-        IgniteCache<Integer,A> a = ignite.cache("a");
-        IgniteCache<Integer,B> b = ignite.cache("b");
-        IgniteCache<Integer,C> c = ignite.cache("c");
+        IgniteCache<Integer, A> a = ignite.cache("a");
+        IgniteCache<Integer, B> b = ignite.cache("b");
+        IgniteCache<Integer, C> c = ignite.cache("c");
 
         for (int i = 0; i < 100; i++) {
             a.put(i, insert(s, new A(rnd.nextInt(50), rnd.nextInt(100), rnd.nextInt(150))));
@@ -199,9 +199,9 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
     public void testJoins() throws Exception {
         Ignite ignite = ignite(0);
 
-        IgniteCache<Integer,A> a = ignite.cache("a");
-        IgniteCache<Integer,B> b = ignite.cache("b");
-        IgniteCache<Integer,C> c = ignite.cache("c");
+        IgniteCache<Integer, A> a = ignite.cache("a");
+        IgniteCache<Integer, B> b = ignite.cache("b");
+        IgniteCache<Integer, C> c = ignite.cache("c");
 
         Statement s = conn.createStatement();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
index edf6d53..73e941d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
@@ -36,7 +36,7 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cache = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cache = defaultCacheConfiguration();
 
         cache.setCacheMode(PARTITIONED);
         cache.setBackups(1);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
index 9f8308e..8ce6e78 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
@@ -38,7 +38,7 @@ public class IgniteCacheLargeResultSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
index 82f30be..c71a6d6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
@@ -48,7 +48,7 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -81,7 +81,7 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest {
         final int KEYS_CNT = 3000;
         final int THREADS_CNT = 250;
 
-        final IgniteCache<Integer,Integer> c = startGrid().cache(DEFAULT_CACHE_NAME);
+        final IgniteCache<Integer, Integer> c = startGrid().cache(DEFAULT_CACHE_NAME);
 
         for (int i = 0; i < KEYS_CNT; i++) {
             c.put(i, i);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
index 8d0656e..16f7eb3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
@@ -42,7 +42,7 @@ public class IgniteCacheOffheapIndexScanTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> cacheCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
+        CacheConfiguration<?, ?> cacheCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
 
         cacheCfg.setCacheMode(LOCAL);
         cacheCfg.setIndexedTypes(
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java
index 8da928d..1ca9bdb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java
@@ -148,7 +148,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest {
     public void testLoadCacheFiltered() throws Exception {
         IgniteCache<Integer, ValueObject> cache = grid().cache(DEFAULT_CACHE_NAME);
 
-        cache.loadCache(new P2<Integer,ValueObject>() {
+        cache.loadCache(new P2<Integer, ValueObject>() {
             @Override public boolean apply(Integer key, ValueObject val) {
                 return key >= 5;
             }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 69a28d6..c80bd75 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -83,7 +83,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends AbstractIndexingCommo
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration() {
-        CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
index 345c3e3..1f716fa 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
@@ -48,7 +48,7 @@ public class IgniteCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstract
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
-        CacheConfiguration<?,?> ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
+        CacheConfiguration<?, ?> ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
         ccfg.setCacheMode(PARTITIONED);
         ccfg.setNearConfiguration(null);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java
index e6f32cc..4932665 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java
@@ -190,7 +190,7 @@ public class IgniteCacheClientQueryReplicatedNodeRestartSelfTest extends GridCom
      * @param c Cache.
      * @param client If it must be a client cache.
      */
-    private void assertClient(IgniteCache<?,?> c, boolean client) {
+    private void assertClient(IgniteCache<?, ?> c, boolean client) {
         assertTrue(((IgniteCacheProxy)c).context().affinityNode() == !client);
     }
 
@@ -228,7 +228,7 @@ public class IgniteCacheClientQueryReplicatedNodeRestartSelfTest extends GridCom
             int j = 0;
 
             for (String cacheName : F.asList("co", "pr", "pe", "pu")) {
-                IgniteCache<?,?> cache = grid(i).cache(cacheName);
+                IgniteCache<?, ?> cache = grid(i).cache(cacheName);
 
                 assertClient(cache, false);
 
@@ -242,14 +242,14 @@ public class IgniteCacheClientQueryReplicatedNodeRestartSelfTest extends GridCom
         int j = 0;
 
         for (String cacheName : F.asList("co", "pr", "pe", "pu")) {
-            IgniteCache<?,?> cache = grid(GRID_CNT - 1).cache(cacheName);
+            IgniteCache<?, ?> cache = grid(GRID_CNT - 1).cache(cacheName);
 
             assertClient(cache, true);
 
             assertEquals(cacheSize.get(j++).intValue(), cache.size());
         }
 
-        final IgniteCache<?,?> clientCache = grid(GRID_CNT - 1).cache("pu");
+        final IgniteCache<?, ?> clientCache = grid(GRID_CNT - 1).cache("pu");
 
         IgniteInternalFuture<?> fut1 = multithreadedAsync(new CAX() {
             @Override public void applyx() throws IgniteCheckedException {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
index 2c672e1..68f7833 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
@@ -123,7 +123,7 @@ public class IgniteCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTe
 
                     Set<Integer> keys = new HashSet<>();
 
-                    for (Cache.Entry<Integer,Integer> entry : res)
+                    for (Cache.Entry<Integer, Integer> entry : res)
                         keys.add(entry.getKey());
 
                     if (KEY_CNT > keys.size()) {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
index 27ea7d5..5310cb0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
@@ -235,7 +235,7 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest
                         final IgniteEx grid = grid(g);
 
                         if (rnd.nextBoolean()) { // Partitioned query.
-                            final IgniteCache<?,?> cache = grid.cache("pu");
+                            final IgniteCache<?, ?> cache = grid.cache("pu");
 
                             final SqlFieldsQuery qry = new SqlFieldsQuery(PARTITIONED_QRY);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
index 00f5add..224e65b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
@@ -196,7 +196,7 @@ public class H2ConnectionLeaksSelfTest extends AbstractIndexingCommonTest {
 
         sql(grid(0), "CREATE TABLE TEST_F(ID INT PRIMARY KEY, TS TIMESTAMP)");
 
-        sql(grid(0),"INSERT INTO TEST_F VALUES (?, CURRENT_TIMESTAMP())", 0);
+        sql(grid(0), "INSERT INTO TEST_F VALUES (?, CURRENT_TIMESTAMP())", 0);
 
         checkThereAreNotUsedConnections();
 
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 3b9a076..316eba4 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
@@ -917,7 +917,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest {
      */
     @Test
     public void testDropTableFromClient() throws Exception {
-        execute(grid(0),"CREATE TABLE IF NOT EXISTS \"Person\" (\"id\" int, \"city\" varchar," +
+        execute(grid(0), "CREATE TABLE IF NOT EXISTS \"Person\" (\"id\" int, \"city\" varchar," +
             " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " +
             "\"template=cache\"");
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java
index 2286ba4..9eafb60 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java
@@ -109,7 +109,7 @@ public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest {
         Map<String, Integer> precision = new HashMap<>();
         Map<String, Integer> scale = new HashMap<>();
 
-        precision.put("amount",PRECISION);
+        precision.put("amount", PRECISION);
         scale.put("amount", SCALE);
 
         queryEntity.setFieldsPrecision(precision);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java
index fb62417..5fb718b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java
@@ -202,7 +202,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM
 
         IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
 
-        cache.put(1,1);
+        cache.put(1, 1);
 
         Semaphore sem = new Semaphore(0);
 
@@ -240,8 +240,8 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM
 
         assert crd.local() && crd.initialized();
 
-        cache.put(1,2);
-        cache.put(1,3);
+        cache.put(1, 2);
+        cache.put(1, 3);
 
         sem.release(2);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java
index e543176..b807f89 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java
@@ -303,9 +303,9 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest
 
         awaitPartitionMapExchange();
 
-        IgniteCache<?,?> clientCache = client.cache(DEFAULT_CACHE_NAME);
-        IgniteCache<?,?> cache1 = node1.cache(DEFAULT_CACHE_NAME);
-        IgniteCache<?,?> cache2 = node2.cache(DEFAULT_CACHE_NAME);
+        IgniteCache<?, ?> clientCache = client.cache(DEFAULT_CACHE_NAME);
+        IgniteCache<?, ?> cache1 = node1.cache(DEFAULT_CACHE_NAME);
+        IgniteCache<?, ?> cache2 = node2.cache(DEFAULT_CACHE_NAME);
 
         AtomicInteger keyGen = new AtomicInteger();
         Affinity affinity = affinity(clientCache);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxModesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxModesTest.java
index 765dec3..dd831cd 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxModesTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxModesTest.java
@@ -85,7 +85,7 @@ public class CacheMvccSqlTxModesTest extends CacheMvccAbstractTest {
         IgniteCache<Object, Object> mvccCache = node.createCache(new CacheConfiguration<>("mvcc-cache")
             .setAtomicityMode(TRANSACTIONAL_SNAPSHOT).setIndexedTypes(Integer.class, Integer.class));
 
-        mvccCache.put(1,1);
+        mvccCache.put(1, 1);
 
         GridTestUtils.assertThrows(log, new Callable<Void>() {
             @Override public Void call() throws Exception {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java
index 36aa1fc..7b1fe65 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSqlTxQueriesAbstractTest.java
@@ -1801,7 +1801,7 @@ public abstract class CacheMvccSqlTxQueriesAbstractTest extends CacheMvccAbstrac
 
         cache.putAll(vals);
 
-        SqlFieldsQuery qry = new SqlFieldsQuery("UPDATE Integer set _val=2").setPartitions(1,2);
+        SqlFieldsQuery qry = new SqlFieldsQuery("UPDATE Integer set _val=2").setPartitions(1, 2);
 
         List<List<?>> all = cache.query(qry).getAll();
 
@@ -1848,7 +1848,7 @@ public abstract class CacheMvccSqlTxQueriesAbstractTest extends CacheMvccAbstrac
 
         cache.putAll(vals);
 
-        SqlFieldsQuery qry = new SqlFieldsQuery("UPDATE Integer set _val=(SELECT 2 FROM DUAL)").setPartitions(1,2);
+        SqlFieldsQuery qry = new SqlFieldsQuery("UPDATE Integer set _val=(SELECT 2 FROM DUAL)").setPartitions(1, 2);
 
         List<List<?>> all = cache.query(qry).getAll();
 
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 da8d4f3..dc0f24e 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
@@ -89,9 +89,9 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
             checkNode.cache(DEFAULT_CACHE_NAME);
 
         cache.putAll(F.asMap(
-            1,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
-            2,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
-            3,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
+            1, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
+            2, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
+            3, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
 
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1), cache.get(1));
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2), cache.get(2));
@@ -143,9 +143,9 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
             checkNode.cache(DEFAULT_CACHE_NAME);
 
         cache.putAll(F.asMap(
-            1,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
-            2,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
-            3,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
+            1, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
+            2, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
+            3, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
 
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1), cache.get(1));
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2), cache.get(2));
@@ -192,9 +192,9 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
             checkNode.cache(DEFAULT_CACHE_NAME);
 
         cache.putAll(F.asMap(
-            1,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
-            2,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
-            3,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
+            1, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
+            2, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
+            3, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
 
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1), cache.get(1));
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2), cache.get(2));
@@ -427,9 +427,9 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
             checkNode.cache(DEFAULT_CACHE_NAME);
 
         cache.putAll(F.asMap(
-            1,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
-            2,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
-            3,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
+            1, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
+            2, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
+            3, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
 
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1), cache.get(1));
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2), cache.get(2));
@@ -477,9 +477,9 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
             checkNode.cache(DEFAULT_CACHE_NAME);
 
         cache.putAll(F.asMap(
-            1,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
-            2,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
-            3,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
+            1, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
+            2, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
+            3, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
 
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1), cache.get(1));
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2), cache.get(2));
@@ -797,7 +797,7 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
 
         IgniteCache<Object, Object> cache = checkNode.cache(DEFAULT_CACHE_NAME);
 
-        cache.putAll(F.asMap(1,1,2,2,3,3));
+        cache.putAll(F.asMap(1, 1, 2, 2, 3, 3));
 
         assertEquals(1, cache.get(1));
         assertEquals(2, cache.get(2));
@@ -840,9 +840,9 @@ public abstract class CacheMvccSqlTxQueriesWithReducerAbstractTest extends Cache
         IgniteCache<Object, Object> cache = checkNode.cache(DEFAULT_CACHE_NAME);
 
         cache.putAll(F.asMap(
-            1,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
-            2,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
-            3,new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
+            1, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1),
+            2, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2),
+            3, new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(3)));
 
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(1), cache.get(1));
         assertEquals(new CacheMvccSqlTxQueriesAbstractTest.MvccTestSqlIndexValue(2), cache.get(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 e5abbd8..ed87d68 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
@@ -337,7 +337,7 @@ public class MvccRepeatableReadBulkOpsTest extends CacheMvccAbstractTest {
 
                     assertEquals(initialMap, getEntries(cache1, allKeys, readModeAfter));
 
-                    checkContains(cache1, true,allKeys);
+                    checkContains(cache1, true, allKeys);
 
                     tx.commit();
                 }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java
index 49a1cd8..af0181e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java
@@ -80,13 +80,13 @@ public class IgniteDbSingleNodeWithIndexingPutGetTest extends IgniteDbSingleNode
     public void testGroupIndexes2() {
         IgniteEx ig = grid(0);
 
-        IgniteCache<Integer,Abc> cache = ig.cache("abc");
+        IgniteCache<Integer, Abc> cache = ig.cache("abc");
 
         long cnt = 10_000;
 
-        Map<Integer,AtomicLong> as = new TreeMap<>();
-        Map<Integer,AtomicLong> bs = new TreeMap<>();
-        Map<Integer,AtomicLong> cs = new TreeMap<>();
+        Map<Integer, AtomicLong> as = new TreeMap<>();
+        Map<Integer, AtomicLong> bs = new TreeMap<>();
+        Map<Integer, AtomicLong> cs = new TreeMap<>();
 
         Random rnd = ThreadLocalRandom.current();
 
@@ -134,7 +134,7 @@ public class IgniteDbSingleNodeWithIndexingPutGetTest extends IgniteDbSingleNode
      * @param cache Cache.
      * @param field Field name.
      */
-    private static void check(Map<Integer,AtomicLong> xs, IgniteCache<Integer,Abc> cache, String field) {
+    private static void check(Map<Integer, AtomicLong> xs, IgniteCache<Integer, Abc> cache, String field) {
         String qry = "select " + field + ", count(*) from Abc group by " + field + " order by " + field;
 
         List<List<?>> res = cache.query(new SqlFieldsQuery(qry)).getAll();
@@ -143,7 +143,7 @@ public class IgniteDbSingleNodeWithIndexingPutGetTest extends IgniteDbSingleNode
 
         int i = 0;
 
-        for (Map.Entry<Integer,AtomicLong> entry : xs.entrySet()) {
+        for (Map.Entry<Integer, AtomicLong> entry : xs.entrySet()) {
 //            X.println("    " + field + ": " + entry);
 
             int key = entry.getKey();
@@ -167,7 +167,7 @@ public class IgniteDbSingleNodeWithIndexingPutGetTest extends IgniteDbSingleNode
      * @param key Key.
      * @param inc Increment.
      */
-    private static void add(Map<Integer,AtomicLong> xs, int key, boolean inc) {
+    private static void add(Map<Integer, AtomicLong> xs, int key, boolean inc) {
         AtomicLong cntr = xs.get(key);
 
         if (cntr == null) {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCacheGroupsCompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCacheGroupsCompareQueryTest.java
index 5875ee19..3661cf4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCacheGroupsCompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCacheGroupsCompareQueryTest.java
@@ -35,7 +35,7 @@ public class IgniteCacheGroupsCompareQueryTest extends BaseH2CompareQueryTest {
      * @return Cache configuration.
      */
     @Override protected CacheConfiguration cacheConfiguration(String name, CacheMode mode, Class<?> clsK, Class<?> clsV) {
-        CacheConfiguration<?,?> cc = super.cacheConfiguration(name, mode, clsK, clsV);
+        CacheConfiguration<?, ?> cc = super.cacheConfiguration(name, mode, clsK, clsV);
 
         if (ORG.equals(name) || PERS.equals(name) || PURCH.equals(name))
             cc.setGroupName("group");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlParameterizedQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlParameterizedQueryTest.java
index 2044b04..a0e6224 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlParameterizedQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlParameterizedQueryTest.java
@@ -98,7 +98,7 @@ public class IgniteSqlParameterizedQueryTest extends AbstractIndexingCommonTest
 
         QueryCursor<List<?>> cursor = cache.query(qry);
         List<List<?>> results = cursor.getAll();
-        assertEquals("Search by field '" + field + "' returns incorrect row count!",1, results.size());
+        assertEquals("Search by field '" + field + "' returns incorrect row count!", 1, results.size());
         List<?> row0 = results.get(0);
         return row0.get(0);
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
index b9eae41..0c7b98e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
@@ -504,7 +504,7 @@ public class IgniteSqlRoutingTest extends AbstractIndexingCommonTest {
     }
 
     /** Run query and check that only one node did generate 'query executed' event for it. */
-    private List<List<?>> runQueryEnsureUnicast(IgniteCache<?,?> cache, SqlFieldsQuery qry, int nodeCnt) throws Exception {
+    private List<List<?>> runQueryEnsureUnicast(IgniteCache<?, ?> cache, SqlFieldsQuery qry, int nodeCnt) throws Exception {
         try (EventCounter evtCounter = new EventCounter(nodeCnt)) {
             List<List<?>> result = cache.query(qry).getAll();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8bc1f63..7f83c36 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -387,9 +387,9 @@ public class IgniteSqlSplitterSelfTest extends AbstractIndexingCommonTest {
     /**
      */
     private void doTestReplicatedTablesUsingPartitionedCache(int segments, boolean client, boolean replicatedOnlyFlag) {
-        IgniteCache<Integer,Value> p = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("p", true,
+        IgniteCache<Integer, Value> p = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("p", true,
             Integer.class, Value.class).setQueryParallelism(segments));
-        IgniteCache<Integer,Value> r = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("r", false,
+        IgniteCache<Integer, Value> r = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("r", false,
             Integer.class, Value.class));
 
         try {
@@ -435,9 +435,9 @@ public class IgniteSqlSplitterSelfTest extends AbstractIndexingCommonTest {
     /**
      */
     private void doTestPartitionedTablesUsingReplicatedCache(int segments, boolean client) {
-        IgniteCache<Integer,Value> p = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("p", true,
+        IgniteCache<Integer, Value> p = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("p", true,
             Integer.class, Value.class).setQueryParallelism(segments));
-        IgniteCache<Integer,Value> r = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("r", false,
+        IgniteCache<Integer, Value> r = ignite(client ? CLIENT : 0).getOrCreateCache(cacheConfig("r", false,
             Integer.class, Value.class));
 
         try {
@@ -522,9 +522,9 @@ public class IgniteSqlSplitterSelfTest extends AbstractIndexingCommonTest {
     @SuppressWarnings("SuspiciousMethodCalls")
     @Test
     public void testExists() {
-        IgniteCache<Integer,Person2> x = ignite(0).getOrCreateCache(cacheConfig("x", true,
+        IgniteCache<Integer, Person2> x = ignite(0).getOrCreateCache(cacheConfig("x", true,
             Integer.class, Person2.class));
-        IgniteCache<Integer,Person2> y = ignite(0).getOrCreateCache(cacheConfig("y", true,
+        IgniteCache<Integer, Person2> y = ignite(0).getOrCreateCache(cacheConfig("y", true,
             Integer.class, Person2.class));
 
         try {
@@ -566,7 +566,7 @@ public class IgniteSqlSplitterSelfTest extends AbstractIndexingCommonTest {
      */
     @Test
     public void testSortedMergeIndex() throws Exception {
-        IgniteCache<Integer,Value> c = ignite(0).getOrCreateCache(cacheConfig("v", true,
+        IgniteCache<Integer, Value> c = ignite(0).getOrCreateCache(cacheConfig("v", true,
             Integer.class, Value.class));
 
         try {
@@ -1704,7 +1704,7 @@ public class IgniteSqlSplitterSelfTest extends AbstractIndexingCommonTest {
      * @param enforceJoinOrder Enforce join order.
      */
     private void doTestDistributedJoins(
-        IgniteCache<?,?> qryCache,
+        IgniteCache<?, ?> qryCache,
         IgniteCache<Integer, Person2> c1,
         IgniteCache<Integer, Organization> c2,
         int orgs,
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LocalQueryLazyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LocalQueryLazyTest.java
index 86f4f24..a950edf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LocalQueryLazyTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/LocalQueryLazyTest.java
@@ -136,7 +136,7 @@ public class LocalQueryLazyTest extends AbstractIndexingCommonTest {
 
         awaitPartitionMapExchange(true, true, null);
 
-        try (FieldsQueryCursor cur = sql(g0,"SELECT * FROM test")) {
+        try (FieldsQueryCursor cur = sql(g0, "SELECT * FROM test")) {
             Iterator<List<?>> it = cur.iterator();
 
             it.next();
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 af9ced4..a31bead 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
@@ -190,7 +190,7 @@ public class MemLeakOnSqlWithClientReconnectTest extends AbstractIndexingCommonT
      */
     private void runQuery(IgniteEx ign, int iters, boolean repl) {
         for (int i = 0; i < iters; ++i)
-            sql(ign, repl ? REPL_SCHEMA : PART_SCHEMA,"SELECT * FROM test").getAll();
+            sql(ign, repl ? REPL_SCHEMA : PART_SCHEMA, "SELECT * FROM test").getAll();
     }
 
     /**
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java
index bea6599..4ec5685 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java
@@ -137,7 +137,7 @@ public class RunningQueriesTest extends AbstractIndexingCommonTest {
         IgniteCache<Integer, Integer> cache = ignite.getOrCreateCache(new CacheConfiguration<Integer, Integer>()
             .setName(DEFAULT_CACHE_NAME)
             .setQueryEntities(Collections.singletonList(new QueryEntity(Integer.class, Integer.class)))
-            .setIndexedTypes(Integer.class,Integer.class)
+            .setIndexedTypes(Integer.class, Integer.class)
         );
 
         cache.put(100000, 0);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationTypesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationTypesTest.java
index 800ac21..2fd6643 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationTypesTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlFieldTypeValidationTypesTest.java
@@ -106,14 +106,14 @@ public class SqlFieldTypeValidationTypesTest extends AbstractIndexingCommonTest
         res.add(new Object[] {TestEnum.class, TestEnum.A, "C", false});
         res.add(new Object[] {TestEnum.class, TestEnum.A, "C", true});
 
-        res.add(new Object[] {Integer[].class, new Integer[] {0,1}, new String[] {"0", "1"}, false});
-        res.add(new Object[] {Integer[].class, new Integer[] {0,1}, new String[] {"0", "1"}, true});
+        res.add(new Object[] {Integer[].class, new Integer[] {0, 1}, new String[] {"0", "1"}, false});
+        res.add(new Object[] {Integer[].class, new Integer[] {0, 1}, new String[] {"0", "1"}, true});
 
-        res.add(new Object[] {int[].class, new Integer[] {0,1}, new String[] {"0", "1"}, false});
-        res.add(new Object[] {int[].class, new Integer[] {0,1}, new String[] {"0", "1"}, true});
+        res.add(new Object[] {int[].class, new Integer[] {0, 1}, new String[] {"0", "1"}, false});
+        res.add(new Object[] {int[].class, new Integer[] {0, 1}, new String[] {"0", "1"}, true});
 
-        res.add(new Object[] {int[].class, new Object[] {0,1}, new Object[] {"0", "1"}, false});
-        res.add(new Object[] {int[].class, new Object[] {0,1}, new Object[] {"0", "1"}, true});
+        res.add(new Object[] {int[].class, new Object[] {0, 1}, new Object[] {"0", "1"}, false});
+        res.add(new Object[] {int[].class, new Object[] {0, 1}, new Object[] {"0", "1"}, true});
 
         return res;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
index a037e19..e27a5e5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
@@ -568,7 +568,7 @@ public class SqlSystemViewsSelfTest extends AbstractIndexingCommonTest {
             new CacheConfiguration<>(DEFAULT_CACHE_NAME).setIndexedTypes(Integer.class, String.class)
         );
 
-        cache.put(100,"200");
+        cache.put(100, "200");
 
         String sql = "SELECT SQL, QUERY_ID, SCHEMA_NAME, LOCAL, START_TIME, DURATION FROM " +
             systemSchemaName() + ".SQL_QUERIES";
@@ -616,7 +616,7 @@ public class SqlSystemViewsSelfTest extends AbstractIndexingCommonTest {
 
         assertEquals(1, cache.query(new SqlFieldsQuery(sql)).getAll().size());
 
-        cache.put(100,"200");
+        cache.put(100, "200");
 
         QueryCursor notClosedQryCursor = cache.query(new SqlQuery<>(String.class, "_key=100"));
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlQueryMinMaxTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlQueryMinMaxTest.java
index e5319e2..f4d9b14 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlQueryMinMaxTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlQueryMinMaxTest.java
@@ -211,13 +211,13 @@ public class IgniteSqlQueryMinMaxTest extends AbstractIndexingCommonTest {
             assertEquals(count / groupSize, result.size());
 
             for (int idx = 0; idx < result.size(); ++idx) {
-                assertEquals(idx, result.get(idx).get(0));//groupVal
+                assertEquals(idx, result.get(idx).get(0)); //groupVal
                 int min = idx * groupSize;
                 int max = (idx + 1) * groupSize - 1;
-                assertEquals(min, result.get(idx).get(1));//min(idxVal)
-                assertEquals(max, result.get(idx).get(2));//max(idxVal)
-                assertEquals(min, result.get(idx).get(3));//min(nonIdxVal)
-                assertEquals(max, result.get(idx).get(4));//max(nonIdxVal)
+                assertEquals(min, result.get(idx).get(1)); //min(idxVal)
+                assertEquals(max, result.get(idx).get(2)); //max(idxVal)
+                assertEquals(min, result.get(idx).get(3)); //min(nonIdxVal)
+                assertEquals(max, result.get(idx).get(4)); //max(nonIdxVal)
             }
         }
     }
@@ -239,11 +239,11 @@ public class IgniteSqlQueryMinMaxTest extends AbstractIndexingCommonTest {
 
             List<List<?>> result = cursor.getAll();
             assertEquals(1, result.size());
-            assertEquals(0, result.get(0).get(0));//groupVal
-            assertEquals(0, result.get(0).get(1));//min(idxVal)
-            assertEquals(groupSize - 1, result.get(0).get(2));//max(idxVal)
-            assertEquals(0, result.get(0).get(3));//min(nonIdxVal)
-            assertEquals(groupSize - 1, result.get(0).get(4));//max(nonIdxVal)
+            assertEquals(0, result.get(0).get(0)); //groupVal
+            assertEquals(0, result.get(0).get(1)); //min(idxVal)
+            assertEquals(groupSize - 1, result.get(0).get(2)); //max(idxVal)
+            assertEquals(0, result.get(0).get(3)); //min(nonIdxVal)
+            assertEquals(groupSize - 1, result.get(0).get(4)); //max(nonIdxVal)
 
             cursor = cache.query(new SqlFieldsQuery(
                     "select groupVal, min(idxVal), max(idxVal), min(nonIdxVal), max(nonIdxVal) " +
@@ -251,11 +251,11 @@ public class IgniteSqlQueryMinMaxTest extends AbstractIndexingCommonTest {
 
             result = cursor.getAll();
             assertEquals(1, result.size());
-            assertEquals((count - 1) / groupSize, result.get(0).get(0));//groupVal
-            assertEquals(count - groupSize, result.get(0).get(1));//min(idxVal)
-            assertEquals(count - 1, result.get(0).get(2));//max(idxVal)
-            assertEquals(count - groupSize, result.get(0).get(3));//min(nonIdxVal)
-            assertEquals(count - 1, result.get(0).get(4));//max(nonIdxVal)
+            assertEquals((count - 1) / groupSize, result.get(0).get(0)); //groupVal
+            assertEquals(count - groupSize, result.get(0).get(1)); //min(idxVal)
+            assertEquals(count - 1, result.get(0).get(2)); //max(idxVal)
+            assertEquals(count - groupSize, result.get(0).get(3)); //min(nonIdxVal)
+            assertEquals(count - 1, result.get(0).get(4)); //max(nonIdxVal)
         }
     }
 
@@ -289,16 +289,16 @@ public class IgniteSqlQueryMinMaxTest extends AbstractIndexingCommonTest {
                 int revMin = count - max - 1;
                 int revMax = count - min - 1;
 
-                assertEquals(revMin, result.get(idx).get(1));//min(a._key)
-                assertEquals(revMax, result.get(idx).get(2));//max(a._key)
-                assertEquals(revMin, result.get(idx).get(3));//min(a._val)
-                assertEquals(revMax, result.get(idx).get(4));//max(a._val)
-                assertEquals(revMin, result.get(idx).get(5));//min(b._key)
-                assertEquals(revMax, result.get(idx).get(6));//max(b_key)
-                assertEquals(min, result.get(idx).get(7));//min(b.idxVal)
-                assertEquals(max, result.get(idx).get(8));//max(b.idxVal),
-                assertEquals(min, result.get(idx).get(9));//min(b.nonIdxVal)
-                assertEquals(max, result.get(idx).get(10));//max(b.nonIdxVal)
+                assertEquals(revMin, result.get(idx).get(1)); //min(a._key)
+                assertEquals(revMax, result.get(idx).get(2)); //max(a._key)
+                assertEquals(revMin, result.get(idx).get(3)); //min(a._val)
+                assertEquals(revMax, result.get(idx).get(4)); //max(a._val)
+                assertEquals(revMin, result.get(idx).get(5)); //min(b._key)
+                assertEquals(revMax, result.get(idx).get(6)); //max(b_key)
+                assertEquals(min, result.get(idx).get(7)); //min(b.idxVal)
+                assertEquals(max, result.get(idx).get(8)); //max(b.idxVal),
+                assertEquals(min, result.get(idx).get(9)); //min(b.nonIdxVal)
+                assertEquals(max, result.get(idx).get(10)); //max(b.nonIdxVal)
             }
 
             //join a.key = b.val, non-collocated
@@ -319,16 +319,16 @@ public class IgniteSqlQueryMinMaxTest extends AbstractIndexingCommonTest {
                 int revMin = count - max - 1;
                 int revMax = count - min - 1;
 
-                assertEquals(min, result.get(idx).get(1));//min(a._key)
-                assertEquals(max, result.get(idx).get(2));//max(a._key)
-                assertEquals(min, result.get(idx).get(3));//min(a._val)
-                assertEquals(max, result.get(idx).get(4));//max(a._val)
-                assertEquals(revMin, result.get(idx).get(5));//min(b._key)
-                assertEquals(revMax, result.get(idx).get(6));//max(b_key)
-                assertEquals(min, result.get(idx).get(7));//min(b.idxVal)
-                assertEquals(max, result.get(idx).get(8));//max(b.idxVal),
-                assertEquals(min, result.get(idx).get(9));//min(b.nonIdxVal)
-                assertEquals(max, result.get(idx).get(10));//max(b.nonIdxVal)
+                assertEquals(min, result.get(idx).get(1)); //min(a._key)
+                assertEquals(max, result.get(idx).get(2)); //max(a._key)
+                assertEquals(min, result.get(idx).get(3)); //min(a._val)
+                assertEquals(max, result.get(idx).get(4)); //max(a._val)
+                assertEquals(revMin, result.get(idx).get(5)); //min(b._key)
+                assertEquals(revMax, result.get(idx).get(6)); //max(b_key)
+                assertEquals(min, result.get(idx).get(7)); //min(b.idxVal)
+                assertEquals(max, result.get(idx).get(8)); //max(b.idxVal),
+                assertEquals(min, result.get(idx).get(9)); //min(b.nonIdxVal)
+                assertEquals(max, result.get(idx).get(10)); //max(b.nonIdxVal)
             }
         }
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
index 2818599..6f58aaf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
@@ -104,7 +104,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         IgniteEx server = startGrid(0);
         server.cluster().active(true);
 
-        CacheConfiguration<Object,Object> ccfg = new CacheConfiguration<>(cacheName);
+        CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(cacheName);
         ccfg.setAffinity(new RendezvousAffinityFunction(false, 1));
         ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
         ccfg.setIndexedTypes(
@@ -126,7 +126,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
             )
         );
 
-        IgniteCache<Object,Object> cache = server.createCache(ccfg);
+        IgniteCache<Object, Object> cache = server.createCache(ccfg);
 
         cache.put(1L, "bla-bla");
         cache.put(2L, new TestData(777L));
@@ -194,13 +194,13 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         IgniteEx server = startGrid(0);
         server.cluster().active(true);
 
-        CacheConfiguration<Long,Long> ccfg = new CacheConfiguration<>(cacheName);
+        CacheConfiguration<Long, Long> ccfg = new CacheConfiguration<>(cacheName);
         ccfg.setIndexedTypes(Long.class, Long.class);
         ccfg.setAtomicityMode(enableMvcc ?
             CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT :
             CacheAtomicityMode.TRANSACTIONAL);
 
-        IgniteCache<Long,Long> cache = server.createCache(ccfg);
+        IgniteCache<Long, Long> cache = server.createCache(ccfg);
 
         long accounts = 100;
         long initialBalance = 100;
@@ -208,7 +208,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         for (long i = 0; i < accounts; i++)
             cache.put(i, initialBalance);
 
-        assertEquals(accounts * initialBalance,((Number)
+        assertEquals(accounts * initialBalance, ((Number)
             cache.query(new SqlFieldsQuery("select sum(_val) from Long use index()")
                 ).getAll().get(0).get(0)).longValue());
         assertTrue(CacheDataTree.isLastFindWithDataPageScan());
@@ -314,18 +314,18 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
 
         IgniteEx client = startClientGrid(1);
 
-        CacheConfiguration<Long,TestData> ccfg = new CacheConfiguration<>(cacheName);
+        CacheConfiguration<Long, TestData> ccfg = new CacheConfiguration<>(cacheName);
         ccfg.setIndexedTypes(Long.class, TestData.class);
         ccfg.setSqlFunctionClasses(QueryDataPageScanTest.class);
 
-        IgniteCache<Long,TestData> clientCache = client.createCache(ccfg);
+        IgniteCache<Long, TestData> clientCache = client.createCache(ccfg);
 
         final int keysCnt = 1000;
 
         for (long i = 0; i < keysCnt; i++)
             clientCache.put(i, new TestData(i));
 
-        IgniteCache<Long,TestData> serverCache = server.cache(cacheName);
+        IgniteCache<Long, TestData> serverCache = server.cache(cacheName);
 
         doTestScanQuery(clientCache, keysCnt);
         doTestScanQuery(serverCache, keysCnt);
@@ -340,13 +340,13 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         doTestLazySql(serverCache, keysCnt);
     }
 
-    private void doTestLazySql(IgniteCache<Long,TestData> cache, int keysCnt) {
+    private void doTestLazySql(IgniteCache<Long, TestData> cache, int keysCnt) {
         checkLazySql(cache, false, keysCnt);
         checkLazySql(cache, true, keysCnt);
         checkLazySql(cache, null, keysCnt);
     }
 
-    private void checkLazySql(IgniteCache<Long,TestData> cache, Boolean dataPageScanEnabled, int keysCnt) {
+    private void checkLazySql(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled, int keysCnt) {
         CacheDataTree.isLastFindWithDataPageScan();
 
         DirectPageScanIndexing.expectedDataPageScanEnabled = dataPageScanEnabled;
@@ -388,7 +388,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         }
     }
 
-    private void doTestDml(IgniteCache<Long,TestData> cache) {
+    private void doTestDml(IgniteCache<Long, TestData> cache) {
         // SQL query (data page scan must be enabled by default).
         DirectPageScanIndexing.callsCnt.set(0);
         int callsCnt = 0;
@@ -406,7 +406,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         assertEquals(++callsCnt, DirectPageScanIndexing.callsCnt.get());
     }
 
-    private void checkDml(IgniteCache<Long,TestData> cache, Boolean dataPageScanEnabled) {
+    private void checkDml(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled) {
         DirectPageScanIndexing.expectedDataPageScanEnabled = dataPageScanEnabled;
 
         assertEquals(0L, cache.query(new SqlFieldsQuery(
@@ -424,7 +424,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
             assertTrue(CacheDataTree.isLastFindWithDataPageScan());
     }
 
-    private void doTestSqlQuery(IgniteCache<Long,TestData> cache) {
+    private void doTestSqlQuery(IgniteCache<Long, TestData> cache) {
         // SQL query (data page scan must be enabled by default).
         DirectPageScanIndexing.callsCnt.set(0);
         int callsCnt = 0;
@@ -442,7 +442,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         assertEquals(++callsCnt, DirectPageScanIndexing.callsCnt.get());
     }
 
-    private void checkSqlQuery(IgniteCache<Long,TestData> cache, Boolean dataPageScanEnabled) {
+    private void checkSqlQuery(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled) {
         DirectPageScanIndexing.expectedDataPageScanEnabled = dataPageScanEnabled;
 
         assertTrue(cache.query(new SqlQuery<>(TestData.class,
@@ -454,7 +454,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         checkSqlLastFindDataPageScan(dataPageScanEnabled);
     }
 
-    private void doTestScanQuery(IgniteCache<Long,TestData> cache, int keysCnt) {
+    private void doTestScanQuery(IgniteCache<Long, TestData> cache, int keysCnt) {
         // Scan query (data page scan must be disabled by default).
         TestPredicate.callsCnt.set(0);
         int callsCnt = 0;
@@ -476,7 +476,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
         assertEquals(callsCnt += keysCnt, TestPredicate.callsCnt.get());
     }
 
-    private void checkScanQuery(IgniteCache<Long,TestData> cache, Boolean dataPageScanEnabled, Boolean expLastDataPageScan) {
+    private void checkScanQuery(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled, Boolean expLastDataPageScan) {
         assertTrue(cache.query(new ScanQuery<>(new TestPredicate())).getAll().isEmpty());
         assertEquals(expLastDataPageScan, CacheDataTree.isLastFindWithDataPageScan());
     }
@@ -522,7 +522,7 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
 
     /**
      */
-    static class TestPredicate implements IgniteBiPredicate<Long,TestData> {
+    static class TestPredicate implements IgniteBiPredicate<Long, TestData> {
         /** */
         static final AtomicInteger callsCnt = new AtomicInteger();
 
@@ -592,8 +592,8 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
             age = in.readInt();
         }
 
-        static LinkedHashMap<String,String> getFields() {
-            LinkedHashMap<String,String> m = new LinkedHashMap<>();
+        static LinkedHashMap<String, String> getFields() {
+            LinkedHashMap<String, String> m = new LinkedHashMap<>();
 
             m.put("age", "INT");
             m.put("name", "VARCHAR");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
index 276e49f..4935047 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -77,7 +77,7 @@ public abstract class AbstractH2CompareQueryTest extends AbstractIndexingCommonT
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration(String name, CacheMode mode, Class<?> clsK, Class<?> clsV) {
-        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
+        CacheConfiguration<?, ?> cc = defaultCacheConfiguration();
 
         cc.setName(name);
         cc.setCacheMode(mode);
@@ -350,8 +350,8 @@ public abstract class AbstractH2CompareQueryTest extends AbstractIndexingCommonT
 
                 // X.println("Result size: " + rowsWithCnt1.size());
 
-                Iterator<Map.Entry<String,Integer>> iter1 = rowsWithCnt1.entrySet().iterator();
-                Iterator<Map.Entry<String,Integer>> iter2 = rowsWithCnt2.entrySet().iterator();
+                Iterator<Map.Entry<String, Integer>> iter1 = rowsWithCnt1.entrySet().iterator();
+                Iterator<Map.Entry<String, Integer>> iter2 = rowsWithCnt2.entrySet().iterator();
 
                 int uSize = rowsWithCnt1.size();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 95cc60a..3546df6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -223,7 +223,7 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
      */
     @Test
     public void testSelectStar() {
-        assertEquals(1, cachePers.query(new SqlQuery<AffinityKey<?>,Person>(
+        assertEquals(1, cachePers.query(new SqlQuery<AffinityKey<?>, Person>(
             Person.class, "\t\r\n  select  \n*\t from Person limit 1")).getAll().size());
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 145a781..4a8b06e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -453,7 +453,7 @@ public class GridQueryParsingTest extends AbstractIndexingCommonTest {
     public void testParseCreateIndex() throws Exception {
         assertCreateIndexEquals(
             buildCreateIndex(null, "Person", "sch1", false, QueryIndexType.SORTED,
-            QueryIndex.DFLT_INLINE_SIZE,"name", true),
+            QueryIndex.DFLT_INLINE_SIZE, "name", true),
             "create index on Person (name)");
 
         assertCreateIndexEquals(
@@ -474,7 +474,7 @@ public class GridQueryParsingTest extends AbstractIndexingCommonTest {
         // When we specify schema for the table and don't specify it for the index, resulting schema is table's
         assertCreateIndexEquals(
             buildCreateIndex("idx", "Person", "sch1", true, QueryIndexType.SORTED,
-            QueryIndex.DFLT_INLINE_SIZE,"name", false),
+            QueryIndex.DFLT_INLINE_SIZE, "name", false),
             "create index if not exists idx on sch1.Person (name dEsC)");
 
         assertCreateIndexEquals(
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 632817a..073594c 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
@@ -236,7 +236,7 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
             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.
+                        new Date(o.date.getTime() + 12 * 60 * 60 * 1000)); // Plus a half of day.
 
                     add(c);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/NoneOrSinglePartitionsQueryOptimizationsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/NoneOrSinglePartitionsQueryOptimizationsTest.java
index 1d54df7..754f132 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/NoneOrSinglePartitionsQueryOptimizationsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/NoneOrSinglePartitionsQueryOptimizationsTest.java
@@ -452,9 +452,9 @@ public class NoneOrSinglePartitionsQueryOptimizationsTest extends GridCommonAbst
         IgniteInternalFuture res = GridTestUtils.runAsync(() -> {
             QueryCursor cursor = orgCache.query(new SqlFieldsQuery(sqlQry).setArgs(args));
 
-            Iterable iter = U.field(cursor,"iterExec");
+            Iterable iter = U.field(cursor, "iterExec");
 
-            Iterator innerIter = U.field(iter.iterator(),"iter");
+            Iterator innerIter = U.field(iter.iterator(), "iter");
 
             if (expMergeTbl)
                 assertTrue(innerIter instanceof H2ResultSetIterator);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/TableViewSubquerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/TableViewSubquerySelfTest.java
index 98d5265..44457b5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/TableViewSubquerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/TableViewSubquerySelfTest.java
@@ -69,7 +69,7 @@ public class TableViewSubquerySelfTest extends AbstractIndexingCommonTest {
             "WITH \"TEMPLATE=partitioned, cache_name=%s\""; //, WRAP_VALUE=false
 
         try (FieldsQueryCursor<List<?>> cur = initCache.query(
-            new SqlFieldsQuery(String.format(creationQry,cacheName)))) {
+            new SqlFieldsQuery(String.format(creationQry, cacheName)))) {
             assertNotNull(cur);
 
             List<List<?>> rows = cur.getAll();
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetBuilder.java
index 32054af..1fc50d7 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetBuilder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/DatasetBuilder.java
@@ -76,5 +76,5 @@ public interface DatasetBuilder<K, V> {
      * Returns new instance of DatasetBuilder using conjunction of internal filter and {@code filterToAdd}.
      * @param filterToAdd Additional filter.
      */
-    public DatasetBuilder<K,V> withFilter(IgniteBiPredicate<K,V> filterToAdd);
+    public DatasetBuilder<K, V> withFilter(IgniteBiPredicate<K, V> filterToAdd);
 }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/bootstrapping/BootstrappedDatasetBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/bootstrapping/BootstrappedDatasetBuilder.java
index aa47d6f..3cda0fe 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/bootstrapping/BootstrappedDatasetBuilder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/impl/bootstrapping/BootstrappedDatasetBuilder.java
@@ -38,7 +38,7 @@ import org.apache.ignite.ml.structures.LabeledVector;
  * @param <K> Type of a key in {@code upstream} data.
  * @param <V> Type of a value in {@code upstream} data.
  */
-public class BootstrappedDatasetBuilder<K,V> implements PartitionDataBuilder<K,V, EmptyContext, BootstrappedDatasetPartition> {
+public class BootstrappedDatasetBuilder<K, V> implements PartitionDataBuilder<K, V, EmptyContext, BootstrappedDatasetPartition> {
     /** Serial version uid. */
     private static final long serialVersionUID = 8146220902914010559L;
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java
index 3c12ba0..baba27f 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/MLLogger.java
@@ -51,7 +51,7 @@ public interface MLLogger {
      * @param verboseLevel Verbose level.
      * @param mdl Model.
      */
-    public <K, V> IgniteModel<K,V> log(VerboseLevel verboseLevel, IgniteModel<K, V> mdl);
+    public <K, V> IgniteModel<K, V> log(VerboseLevel verboseLevel, IgniteModel<K, V> mdl);
 
     /**
      * Log line with formatting.
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/PreprocessingTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/PreprocessingTrainer.java
index fe48173..a714932 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/PreprocessingTrainer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/PreprocessingTrainer.java
@@ -140,7 +140,7 @@ public interface PreprocessingTrainer<K, V> {
      * @param basePreprocessor Preprocessor.
      * @return Learning environment.
      */
-    public default LearningEnvironment learningEnvironment(Preprocessor<K,V> basePreprocessor) {
+    public default LearningEnvironment learningEnvironment(Preprocessor<K, V> basePreprocessor) {
         LearningEnvironment env = LearningEnvironmentBuilder.defaultBuilder().buildForTrainer();
         env.initDeployingContext(basePreprocessor);
         return env;
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
index ca71898..138a920 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/normalization/NormalizationPreprocessor.java
@@ -87,7 +87,7 @@ public final class NormalizationPreprocessor<K, V> implements Preprocessor<K, V>
      * @param zero Zero value for fold operation.
      * @return Folded value of this vector.
      */
-    private double foldMap(Vector vec, IgniteBiFunction<Double,Double,Double> foldFun, IgniteDoubleFunction<Double> mapFun, double zero) {
+    private double foldMap(Vector vec, IgniteBiFunction<Double, Double, Double> foldFun, IgniteDoubleFunction<Double> mapFun, double zero) {
         for (int i = 0; i < vec.size(); i++)
             zero = foldFun.apply(zero, mapFun.apply(vec.get(i)));
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/TrainTestDatasetSplitter.java b/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/TrainTestDatasetSplitter.java
index 39ee749..b54d315 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/TrainTestDatasetSplitter.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/TrainTestDatasetSplitter.java
@@ -80,7 +80,7 @@ public class TrainTestDatasetSplitter<K, V> implements Serializable {
      * pair to a point on the segment (0, 1) and an interval inside that segment (for example (0, 0.2)). After that this
      * filter will pass all entries whose mappings lie in the specified interval.
      */
-    class DatasetSplitFilter implements IgniteBiPredicate<K,V> {
+    class DatasetSplitFilter implements IgniteBiPredicate<K, V> {
         /** */
         private static final long serialVersionUID = 2247757751655582254L;
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/mapper/SHA256UniformMapper.java b/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/mapper/SHA256UniformMapper.java
index 3e7b311..0903762 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/mapper/SHA256UniformMapper.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/selection/split/mapper/SHA256UniformMapper.java
@@ -31,7 +31,7 @@ import java.util.Random;
  * @param <K> Type of a key.
  * @param <V> Type of a value.
  */
-public class SHA256UniformMapper<K, V> implements UniformMapper<K,V> {
+public class SHA256UniformMapper<K, V> implements UniformMapper<K, V> {
     /** */
     private static final long serialVersionUID = -8179630783617088803L;
 
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 6d647d6..18ba697 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
@@ -69,7 +69,7 @@ public class LocalDatasetBuilderTest {
         for (int i = 0; i < 100; i++)
             data.put(i, i);
 
-        LocalDatasetBuilder<Integer, Integer> builder = new LocalDatasetBuilder<>(data, (k, v) -> k % 2 == 0,10);
+        LocalDatasetBuilder<Integer, Integer> builder = new LocalDatasetBuilder<>(data, (k, v) -> k % 2 == 0, 10);
 
         LocalDataset<Serializable, TestPartitionData> dataset = buildDataset(builder);
 
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
index 0a779c2..4a1e6f2 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
@@ -185,7 +185,7 @@ public class BlasTest {
         double beta = 0.0;
         DenseMatrix c = new DenseMatrix(new double[][] {{1.0, 2.0}, {2.0, 3.0}});
 
-        DenseMatrix exp = (DenseMatrix)a.times(b);//.times(alpha).plus(c.times(beta));
+        DenseMatrix exp = (DenseMatrix)a.times(b); //.times(alpha).plus(c.times(beta));
 
         Blas.gemm(alpha, a, b, beta, c);
 
@@ -204,7 +204,7 @@ public class BlasTest {
         double beta = 0.0;
         DenseMatrix c = new DenseMatrix(new double[][] {{1.0, 2.0}, {2.0, 3.0}});
 
-        Matrix exp = a.times(b);//.times(alpha).plus(c.times(beta));
+        Matrix exp = a.times(b); //.times(alpha).plus(c.times(beta));
 
         Blas.gemm(alpha, a, b, beta, c);
 
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
index 72371c9..77cda7e 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java
@@ -79,7 +79,7 @@ class VectorImplementationsFixtures {
     private static class SparseLocalVectorFixture extends VectorSizesExtraFixture<Integer> {
         /** */
         SparseLocalVectorFixture() {
-            super("SparseLocalVector", (x,y) -> new SparseVector(x), "access mode",
+            super("SparseLocalVector", (x, y) -> new SparseVector(x), "access mode",
                 new Integer[] {StorageConstants.SEQUENTIAL_ACCESS_MODE, StorageConstants.RANDOM_ACCESS_MODE, null});
         }
     }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesModelTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesModelTest.java
index 45e35a6..7d6d494 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesModelTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesModelTest.java
@@ -31,7 +31,7 @@ public class DiscreteNaiveBayesModelTest {
         double second = 2;
         double[][][] probabilities = new double[][][] {
             {{.5, .5}, {.2, .3, .5}, {2. / 3., 1. / 3.}, {.4, .1, .5}, {.5, .5}},
-            {{0, 1}, {1. / 7, 2. / 7, 4. / 7}, {4. / 7, 3. / 7}, {2. / 7, 3. / 7, 2. / 7}, {4. / 7, 3. / 7,}}
+            {{0, 1}, {1. / 7, 2. / 7, 4. / 7}, {4. / 7, 3. / 7}, {2. / 7, 3. / 7, 2. / 7}, {4. / 7, 3. / 7}}
         };
 
         double[] classProbabilities = new double[] {6. / 13, 7. / 13};
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesTrainerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesTrainerTest.java
index 55d12a1..89e18b7 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesTrainerTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesTrainerTest.java
@@ -137,7 +137,7 @@ public class DiscreteNaiveBayesTrainerTest extends TrainerTest {
     public void testReturnsCorrectPriorProbabilities() {
         double[][][] expectedPriorProbabilites = new double[][][] {
             {{.5, .5}, {.5, .5}, {2. / 3., 1. / 3.}, {.5, .5}, {.5, .5}},
-            {{0, 1}, {3. / 7, 4. / 7}, {4. / 7, 3. / 7}, {2. / 7, 5. / 7}, {4. / 7, 3. / 7,}}
+            {{0, 1}, {3. / 7, 4. / 7}, {4. / 7, 3. / 7}, {2. / 7, 5. / 7}, {4. / 7, 3. / 7}}
         };
 
         DiscreteNaiveBayesModel mdl = trainer.fit(
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/gini/GiniImpurityMeasureCalculatorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/gini/GiniImpurityMeasureCalculatorTest.java
index dd5105a..63d3f6c 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/gini/GiniImpurityMeasureCalculatorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/gini/GiniImpurityMeasureCalculatorTest.java
@@ -65,18 +65,18 @@ public class GiniImpurityMeasureCalculatorTest {
         // Check Gini calculated for the first column.
         assertArrayEquals(new double[]{Double.NEGATIVE_INFINITY, 0, 1, 2, 3}, impurity[0].getX(), 1e-10);
         assertEquals(-2.500, impurity[0].getY()[0].impurity(), 1e-3);
-        assertEquals(-4.000, impurity[0].getY()[1].impurity(),1e-3);
-        assertEquals(-3.000, impurity[0].getY()[2].impurity(),1e-3);
-        assertEquals(-2.666, impurity[0].getY()[3].impurity(),1e-3);
-        assertEquals(-2.500, impurity[0].getY()[4].impurity(),1e-3);
+        assertEquals(-4.000, impurity[0].getY()[1].impurity(), 1e-3);
+        assertEquals(-3.000, impurity[0].getY()[2].impurity(), 1e-3);
+        assertEquals(-2.666, impurity[0].getY()[3].impurity(), 1e-3);
+        assertEquals(-2.500, impurity[0].getY()[4].impurity(), 1e-3);
 
         // Check Gini calculated for the second column.
         assertArrayEquals(new double[]{Double.NEGATIVE_INFINITY, 0, 1, 2, 3}, impurity[1].getX(), 1e-10);
-        assertEquals(-2.500, impurity[1].getY()[0].impurity(),1e-3);
-        assertEquals(-2.666, impurity[1].getY()[1].impurity(),1e-3);
-        assertEquals(-3.000, impurity[1].getY()[2].impurity(),1e-3);
-        assertEquals(-2.666, impurity[1].getY()[3].impurity(),1e-3);
-        assertEquals(-2.500, impurity[1].getY()[4].impurity(),1e-3);
+        assertEquals(-2.500, impurity[1].getY()[0].impurity(), 1e-3);
+        assertEquals(-2.666, impurity[1].getY()[1].impurity(), 1e-3);
+        assertEquals(-3.000, impurity[1].getY()[2].impurity(), 1e-3);
+        assertEquals(-2.666, impurity[1].getY()[3].impurity(), 1e-3);
+        assertEquals(-2.500, impurity[1].getY()[4].impurity(), 1e-3);
     }
 
     /** */
@@ -97,10 +97,10 @@ public class GiniImpurityMeasureCalculatorTest {
         // Check Gini calculated for the first column.
         assertArrayEquals(new double[]{Double.NEGATIVE_INFINITY, 0, 1, 2, 3}, impurity[0].getX(), 1e-10);
         assertEquals(-3.400, impurity[0].getY()[0].impurity(), 1e-3);
-        assertEquals(-5.000, impurity[0].getY()[1].impurity(),1e-3);
-        assertEquals(-4.000, impurity[0].getY()[2].impurity(),1e-3);
-        assertEquals(-3.500, impurity[0].getY()[3].impurity(),1e-3);
-        assertEquals(-3.400, impurity[0].getY()[4].impurity(),1e-3);
+        assertEquals(-5.000, impurity[0].getY()[1].impurity(), 1e-3);
+        assertEquals(-4.000, impurity[0].getY()[2].impurity(), 1e-3);
+        assertEquals(-3.500, impurity[0].getY()[3].impurity(), 1e-3);
+        assertEquals(-3.400, impurity[0].getY()[4].impurity(), 1e-3);
     }
 
     /** */
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/mse/MSEImpurityMeasureCalculatorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/mse/MSEImpurityMeasureCalculatorTest.java
index 87468e0..aa09781 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/mse/MSEImpurityMeasureCalculatorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/impurity/mse/MSEImpurityMeasureCalculatorTest.java
@@ -60,17 +60,17 @@ public class MSEImpurityMeasureCalculatorTest {
         // Test MSE calculated for the first column.
         assertArrayEquals(new double[]{Double.NEGATIVE_INFINITY, 0, 1, 2, 3}, impurity[0].getX(), 1e-10);
         assertEquals(1.000, impurity[0].getY()[0].impurity(), 1e-3);
-        assertEquals(0.666, impurity[0].getY()[1].impurity(),1e-3);
-        assertEquals(1.000, impurity[0].getY()[2].impurity(),1e-3);
-        assertEquals(0.666, impurity[0].getY()[3].impurity(),1e-3);
-        assertEquals(1.000, impurity[0].getY()[4].impurity(),1e-3);
+        assertEquals(0.666, impurity[0].getY()[1].impurity(), 1e-3);
+        assertEquals(1.000, impurity[0].getY()[2].impurity(), 1e-3);
+        assertEquals(0.666, impurity[0].getY()[3].impurity(), 1e-3);
+        assertEquals(1.000, impurity[0].getY()[4].impurity(), 1e-3);
 
         // Test MSE calculated for the second column.
         assertArrayEquals(new double[]{Double.NEGATIVE_INFINITY, 0, 1, 2, 3}, impurity[1].getX(), 1e-10);
-        assertEquals(1.000, impurity[1].getY()[0].impurity(),1e-3);
-        assertEquals(0.666, impurity[1].getY()[1].impurity(),1e-3);
-        assertEquals(0.000, impurity[1].getY()[2].impurity(),1e-3);
-        assertEquals(0.666, impurity[1].getY()[3].impurity(),1e-3);
-        assertEquals(1.000, impurity[1].getY()[4].impurity(),1e-3);
+        assertEquals(1.000, impurity[1].getY()[0].impurity(), 1e-3);
+        assertEquals(0.666, impurity[1].getY()[1].impurity(), 1e-3);
+        assertEquals(0.000, impurity[1].getY()[2].impurity(), 1e-3);
+        assertEquals(0.666, impurity[1].getY()[3].impurity(), 1e-3);
+        assertEquals(1.000, impurity[1].getY()[4].impurity(), 1e-3);
     }
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/GiniFeatureHistogramTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/GiniFeatureHistogramTest.java
index 10456b3..6400dc3 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/GiniFeatureHistogramTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/GiniFeatureHistogramTest.java
@@ -153,8 +153,8 @@ public class GiniFeatureHistogramTest extends ImpurityHistogramTest {
         List<GiniHistogram> partitions2 = new ArrayList<>();
         int cntOfPartitions = rnd.nextInt(1000);
         for (int i = 0; i < cntOfPartitions; i++) {
-            partitions1.add(new GiniHistogram(sampleId,lblMapping, bucketMeta1));
-            partitions2.add(new GiniHistogram(sampleId,lblMapping, bucketMeta2));
+            partitions1.add(new GiniHistogram(sampleId, lblMapping, bucketMeta1));
+            partitions2.add(new GiniHistogram(sampleId, lblMapping, bucketMeta2));
         }
 
         int datasetSize = rnd.nextInt(10000);
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/ImpurityHistogramTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/ImpurityHistogramTest.java
index 2a8774e..0d5dc45 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/ImpurityHistogramTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/data/impurity/ImpurityHistogramTest.java
@@ -82,8 +82,8 @@ public class ImpurityHistogramTest {
      * @param partitions Partitions.
      */
     <T extends Histogram<BootstrappedVector, T>> void checkSums(T exp, List<T> partitions) {
-        T leftSum = partitions.stream().reduce((x,y) -> x.plus(y)).get();
-        T rightSum = partitions.stream().reduce((x,y) -> y.plus(x)).get();
+        T leftSum = partitions.stream().reduce((x, y) -> x.plus(y)).get();
+        T rightSum = partitions.stream().reduce((x, y) -> y.plus(x)).get();
         assertTrue(exp.isEqualTo(leftSum));
         assertTrue(exp.isEqualTo(rightSum));
     }
diff --git a/modules/opencensus/src/test/java/org/apache/ignite/internal/processors/monitoring/opencensus/OpenCensusSqlNativeTracingTest.java b/modules/opencensus/src/test/java/org/apache/ignite/internal/processors/monitoring/opencensus/OpenCensusSqlNativeTracingTest.java
index b5feb66..f7f7138 100644
--- a/modules/opencensus/src/test/java/org/apache/ignite/internal/processors/monitoring/opencensus/OpenCensusSqlNativeTracingTest.java
+++ b/modules/opencensus/src/test/java/org/apache/ignite/internal/processors/monitoring/opencensus/OpenCensusSqlNativeTracingTest.java
@@ -578,7 +578,7 @@ public class OpenCensusSqlNativeTracingTest extends AbstractTracingTest {
      * @param fetchRequired Whether query need to fetch data before cache update.
      */
     private void checkDmlQuerySpans(String qry, boolean fetchRequired, int expCacheUpdates) throws Exception {
-        SpanId rootSpan = executeAndCheckRootSpan(qry, TEST_SCHEMA, false,false,false);
+        SpanId rootSpan = executeAndCheckRootSpan(qry, TEST_SCHEMA, false, false, false);
 
         checkChildSpan(SQL_QRY_PARSE, rootSpan);
 
@@ -609,7 +609,7 @@ public class OpenCensusSqlNativeTracingTest extends AbstractTracingTest {
      * @return Id of the the child span.
      */
     protected SpanId checkChildSpan(SpanType type, SpanId parentSpan) {
-        return checkSpan(type, parentSpan,1, null).get(0);
+        return checkSpan(type, parentSpan, 1, null).get(0);
     }
 
     /**
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
index 624b4e8..42135bf 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
@@ -300,7 +300,7 @@ public class GridSpringResourceInjectionSelfTest extends GridCommonAbstractTest
 
                 return null;
             }
-        }, grid, NoSuchBeanDefinitionException.class,"No qualifying bean of type 'org.apache.ignite.internal.processors.resource" +
+        }, grid, NoSuchBeanDefinitionException.class, "No qualifying bean of type 'org.apache.ignite.internal.processors.resource" +
             ".GridSpringResourceInjectionSelfTest$AnotherDummyResourceBean' available");
     }
 
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/UriDeploymentFileScanner.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/UriDeploymentFileScanner.java
index ce53525..a908761 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/UriDeploymentFileScanner.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/UriDeploymentFileScanner.java
@@ -124,7 +124,7 @@ public class UriDeploymentFileScanner implements UriDeploymentScanner {
     private static String getFileUri(String name) {
         assert name != null;
 
-        name = name.replace("\\","/");
+        name = name.replace("\\", "/");
 
         return "file://" + (name.charAt(0) == '/' ? "" : '/') + name;
     }
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java
index 2f917b2..a3720e1 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java
@@ -203,7 +203,7 @@ public abstract class IgniteCacheAbstractBenchmark<K, V> extends IgniteAbstractB
      * Preload data before benchmarking.
      */
     protected void preload() {
-        IgniteSemaphore semaphore = ignite().semaphore("preloadSemaphore",1,true,true);
+        IgniteSemaphore semaphore = ignite().semaphore("preloadSemaphore", 1, true, true);
 
         semaphore.acquire();
 
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java
index 02e9d36..19ce3df 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java
@@ -266,7 +266,7 @@ public class ZkIgnitePaths {
      * @return Event zk path.
      */
     String joinEventDataPathForJoined(long evtId) {
-        return join(evtsPath,"fj-" + evtId);
+        return join(evtsPath, "fj-" + evtId);
     }
 
     /**
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestUtil.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestUtil.java
index 53a5528..93bbba8 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestUtil.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestUtil.java
@@ -43,7 +43,7 @@ public class ZookeeperDiscoverySpiTestUtil {
      * @param customProps Custom configuration properties for every server.
      * @return Test cluster.
      */
-    public static TestingCluster createTestingCluster(int instances, @Nullable Map<String,Object>[] customProps) {
+    public static TestingCluster createTestingCluster(int instances, @Nullable Map<String, Object>[] customProps) {
         String tmpDir;
 
         tmpDir = System.getenv("TMPFS_ROOT") != null
@@ -61,7 +61,7 @@ public class ZookeeperDiscoverySpiTestUtil {
                     throw new IgniteException("Failed to create directory for test Zookeeper server: " + file.getAbsolutePath());
             }
 
-            Map<String,Object> props = customProps != null ? customProps[i] : null;
+            Map<String, Object> props = customProps != null ? customProps[i] : null;
 
             specs.add(new InstanceSpec(file, -1, -1, -1, true, -1, -1, 500, props));
         }