You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by mm...@apache.org on 2020/04/26 19:30:55 UTC

[ignite] branch master updated: IGNITE-12939: Add WhitespacesAround support for the checkstyle (#7726)

This is an automated email from the ASF dual-hosted git repository.

mmuzaf 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 2a85925  IGNITE-12939: Add WhitespacesAround support for the checkstyle (#7726)
2a85925 is described below

commit 2a85925f1705fbad36b5421c0ca5cf9de9a29658
Author: Maxim Muzafarov <mm...@apache.org>
AuthorDate: Sun Apr 26 22:30:30 2020 +0300

    IGNITE-12939: Add WhitespacesAround support for the checkstyle (#7726)
---
 checkstyle/checkstyle.xml                          | 10 +++++
 .../hibernate/HibernateL2CacheExample.java         |  4 +-
 .../ignite/examples/datagrid/hibernate/Post.java   |  2 +-
 .../ignite/examples/datagrid/hibernate/User.java   |  2 +-
 .../failover/ComputeFailoverExample.java           |  2 +-
 .../examples/datastructures/IgniteLockExample.java |  4 +-
 .../ignite/examples/ml/util/SandboxMLCache.java    |  6 +--
 .../ignite/examples/spark/SharedRDDExample.java    |  2 +-
 .../ignite/gridify/GridifySetToValueTarget.java    |  4 +-
 .../GridifySetToXXXNonSpringAopSelfTest.java       |  2 +-
 .../gridify/GridifySetToXXXSpringAopSelfTest.java  |  2 +-
 .../ignite/gridify/NonSpringAopSelfTest.java       |  2 +-
 .../apache/ignite/gridify/SpringAopSelfTest.java   |  2 +-
 .../org/apache/ignite/gridify/TestAopTarget.java   | 16 +++----
 .../ignite/gridify/TestAopTargetInterface.java     | 16 +++----
 .../org/apache/ignite/p2p/P2PGridifySelfTest.java  |  4 +-
 .../java/org/test/gridify/ExternalAopTarget.java   | 16 +++----
 .../test/gridify/ExternalNonSpringAopSelfTest.java |  2 +-
 .../ignite/spi/checkpoint/s3/S3CheckpointSpi.java  |  2 +-
 .../SmallHashSetsVsReadOnlyViewBenchmark.java      |  6 +--
 .../GridDhtPartitionsStateValidatorBenchmark.java  |  2 +-
 .../misc/JmhPartitionUpdateCounterBenchmark.java   |  2 +-
 .../jmh/notify/JmhWaitStategyBenchmark.java        |  2 +-
 .../jol/GridAffinityAssignmentJolBenchmark.java    |  8 ++--
 .../benchmarks/jol/GridMetricsJolBenchmark.java    | 24 +++++------
 .../apache/ignite/tests/load/LoadTestDriver.java   |  2 +-
 .../apache/ignite/tests/load/PersonGenerator.java  |  2 +-
 .../ignite/internal/client/ClientStopNodeTask.java |  2 +-
 .../client/integration/ClientAbstractSelfTest.java |  2 +-
 .../client/router/TcpRouterAbstractSelfTest.java   |  4 +-
 .../client/util/ClientConsistentHashSelfTest.java  |  2 +-
 .../apache/ignite/internal/jdbc2/JdbcBlobTest.java |  4 +-
 .../internal/jdbc2/JdbcConnectionSelfTest.java     |  2 +-
 .../internal/jdbc2/JdbcMetadataSelfTest.java       |  4 +-
 .../internal/jdbc2/JdbcResultSetSelfTest.java      |  2 +-
 .../internal/jdbc2/JdbcStatementSelfTest.java      |  4 +-
 .../thin/JdbcThinConnectionTimeoutSelfTest.java    |  2 +-
 .../ignite/jdbc/thin/JdbcThinErrorsSelfTest.java   |  2 +-
 .../jdbc/thin/JdbcThinLocalQueriesSelfTest.java    |  2 +-
 .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java |  8 ++--
 .../thin/JdbcThinMissingLongArrayResultsTest.java  |  2 +-
 .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java     | 14 +++---
 .../jdbc/thin/JdbcThinResultSetSelfTest.java       |  2 +-
 .../jdbc/thin/JdbcThinStatementSelfTest.java       |  4 +-
 .../thin/JdbcThinStatementTimeoutSelfTest.java     |  4 +-
 .../thin/JdbcThinStreamingAbstractSelfTest.java    |  2 +-
 .../thin/JdbcThinTransactionsLeaksMvccTest.java    |  4 +-
 .../loadtests/client/ClientCacheBenchmark.java     |  8 ++--
 .../ignite/codegen/MessageCodeGenerator.java       | 12 +++---
 .../junits/IgniteCompatibilityAbstractTest.java    |  2 +-
 .../compress/CompressionProcessorImpl.java         |  8 ++--
 .../java/org/apache/ignite/cache/CacheManager.java | 14 +++---
 .../java/org/apache/ignite/cache/QueryEntity.java  |  2 +-
 .../local/LocalIgfsSecondaryFileSystem.java        |  4 +-
 .../ignite/internal/GridEventConsumeHandler.java   |  2 +-
 .../org/apache/ignite/internal/IgniteKernal.java   |  4 +-
 .../org/apache/ignite/internal/IgnitionEx.java     | 12 +++---
 .../internal/MarshallerMappingFileStore.java       |  2 +-
 .../ignite/internal/binary/BinaryPrimitives.java   |  2 +-
 .../apache/ignite/internal/binary/BinaryUtils.java |  4 +-
 .../ignite/internal/binary/BinaryWriterExImpl.java |  4 +-
 .../client/GridClientPartitionAffinity.java        |  2 +-
 .../connection/GridClientNioTcpConnection.java     |  6 +--
 .../GridClientZipOptimizedMarshaller.java          |  4 +-
 .../ignite/internal/client/thin/ClientUtils.java   |  4 +-
 .../ignite/internal/cluster/IgniteClusterImpl.java |  2 +-
 .../ignite/internal/commandline/StateCommand.java  |  2 +-
 .../internal/commandline/cache/CacheCommands.java  |  2 +-
 .../internal/commandline/cache/CacheViewer.java    |  2 +-
 .../internal/jdbc/thin/JdbcThinConnection.java     |  4 +-
 .../internal/jdbc/thin/JdbcThinResultSet.java      |  6 +--
 .../org/apache/ignite/internal/jdbc2/JdbcBlob.java |  6 +--
 .../internal/jdbc2/JdbcDatabaseMetadata.java       |  2 +-
 .../ignite/internal/jdbc2/JdbcStatement.java       |  4 +-
 .../managers/communication/GridIoManager.java      | 10 ++---
 .../internal/managers/discovery/DiscoCache.java    |  4 +-
 .../managers/discovery/GridDiscoveryManager.java   |  6 +--
 .../managers/encryption/GridEncryptionManager.java |  2 +-
 .../optimized/OptimizedObjectInputStream.java      |  4 +-
 .../optimized/OptimizedObjectOutputStream.java     |  2 +-
 .../internal/metric/IoStatisticsHolderCache.java   |  2 +-
 .../internal/mxbean/IgniteStandardMXBean.java      |  2 +-
 .../ignite/internal/pagemem/PageIdUtils.java       |  2 +-
 .../internal/pagemem/wal/record/WALRecord.java     |  2 +-
 .../delta/MetaPageUpdatePartitionDataRecord.java   |  2 +-
 .../processors/affinity/GridAffinityProcessor.java |  2 +-
 .../authentication/UserManagementOperation.java    |  2 +-
 .../internal/processors/cache/CacheEntryImpl0.java |  2 +-
 .../processors/cache/CacheEvictableEntryImpl.java  |  2 +-
 .../processors/cache/CacheGroupContext.java        |  2 +-
 .../processors/cache/CacheMetricsImpl.java         |  8 ++--
 .../cache/CacheWeakQueryIteratorsHolder.java       |  4 +-
 .../processors/cache/ClusterCachesInfo.java        |  2 +-
 .../cache/DynamicCacheChangeRequest.java           |  2 +-
 .../processors/cache/ExchangeDiscoveryEvents.java  |  2 +-
 .../processors/cache/GridCacheCompoundFuture.java  |  2 +-
 .../cache/GridCacheCompoundIdentityFuture.java     |  2 +-
 .../processors/cache/GridCacheContext.java         |  4 +-
 .../cache/GridCacheDefaultAffinityKeyMapper.java   |  2 +-
 .../cache/GridCacheDeploymentManager.java          |  2 +-
 .../processors/cache/GridCacheFutureAdapter.java   |  2 +-
 .../processors/cache/GridCacheGateway.java         |  2 +-
 .../processors/cache/GridCacheIoManager.java       |  2 +-
 .../internal/processors/cache/GridCacheMvcc.java   |  4 +-
 .../cache/GridCachePartitionExchangeManager.java   |  9 ++--
 .../processors/cache/GridCacheProcessor.java       |  4 +-
 .../processors/cache/GridCacheSharedContext.java   |  2 +-
 .../processors/cache/GridCacheTtlManager.java      |  2 +-
 .../internal/processors/cache/GridCacheUtils.java  |  2 +-
 .../cache/GridDeferredAckMessageSender.java        |  2 +-
 .../cache/IgniteCacheOffheapManagerImpl.java       |  4 +-
 .../processors/cache/IgniteCacheProxyImpl.java     |  4 +-
 .../cache/PartitionUpdateCounterVolatileImpl.java  |  2 +-
 .../cache/ValidationOnNodeJoinUtils.java           |  2 +-
 .../internal/processors/cache/WalStateManager.java |  6 +--
 .../binary/CacheObjectBinaryProcessorImpl.java     |  8 ++--
 .../dht/CacheDistributedGetFutureAdapter.java      |  2 +-
 .../cache/distributed/dht/GridDhtCacheAdapter.java |  2 +-
 .../cache/distributed/dht/GridDhtLockFuture.java   |  2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java      |  2 +-
 .../dht/GridDhtTxAbstractEnlistFuture.java         |  6 +--
 .../distributed/dht/GridDhtTxEnlistFuture.java     |  2 +-
 .../distributed/dht/GridDhtTxFinishRequest.java    |  2 +-
 .../dht/GridDhtTxQueryAbstractEnlistFuture.java    |  2 +-
 .../dht/GridPartitionedSingleGetFuture.java        |  2 +-
 .../dht/PartitionUpdateCountersMessage.java        |  6 +--
 .../distributed/dht/atomic/GridDhtAtomicCache.java | 10 ++---
 .../dht/atomic/GridDhtAtomicUpdateResponse.java    |  2 +-
 .../atomic/GridNearAtomicSingleUpdateFuture.java   |  4 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java     |  4 +-
 .../dht/atomic/GridNearAtomicUpdateResponse.java   |  2 +-
 .../cache/distributed/dht/atomic/UpdateErrors.java |  2 +-
 .../dht/colocated/GridDhtColocatedCache.java       |  8 ++--
 .../dht/colocated/GridDhtColocatedLockFuture.java  |  4 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java |  2 +-
 .../dht/preloader/latch/ExchangeLatchManager.java  |  2 +-
 .../dht/topology/PartitionsEvictManager.java       | 14 +++---
 .../cache/distributed/near/GridNearLockFuture.java |  8 ++--
 .../distributed/near/GridNearLockRequest.java      |  4 +-
 .../near/GridNearTxAbstractEnlistFuture.java       |  4 +-
 .../distributed/near/GridNearTxEnlistRequest.java  |  2 +-
 .../cache/distributed/near/GridNearTxLocal.java    |  2 +-
 .../near/GridNearTxQueryResultsEnlistRequest.java  |  2 +-
 .../internal/processors/cache/mvcc/MvccUtils.java  |  2 +-
 .../processors/cache/mvcc/txlog/TxLog.java         |  2 +-
 .../cache/persistence/CacheDataRowAdapter.java     |  2 +-
 .../cache/persistence/DataRegionMetricsImpl.java   |  4 +-
 .../cache/persistence/DataStorageMetricsImpl.java  |  6 +--
 .../persistence/DataStorageMetricsSnapshot.java    |  2 +-
 .../GridCacheDatabaseSharedManager.java            |  6 +--
 .../cache/persistence/GridCacheOffheapManager.java |  2 +-
 .../IgniteCacheDatabaseSharedManager.java          |  4 +-
 .../cache/persistence/RecoveryDebug.java           |  2 +-
 .../persistence/checkpoint/CheckpointEntry.java    |  2 +-
 .../pagelocktracker/PageLockTracker.java           |  8 ++--
 .../pagelocktracker/PageLockTrackerManager.java    |  2 +-
 .../store/OffHeapPageMetaInfoStore.java            |  2 +-
 .../cache/persistence/file/EncryptedFileIO.java    |  2 +-
 .../cache/persistence/file/FileIOFactory.java      |  2 +-
 .../persistence/file/FilePageStoreManager.java     | 10 ++---
 .../cache/persistence/file/FilePageStoreV2.java    |  2 +-
 .../cache/persistence/freelist/PagesList.java      |  4 +-
 .../metastorage/MetastorageRowStoreEntry.java      |  2 +-
 .../cache/persistence/pagemem/FullPageIdTable.java |  2 +-
 .../cache/persistence/pagemem/PageMemoryImpl.java  |  4 +-
 .../snapshot/IgniteCacheSnapshotManager.java       |  2 +-
 .../cache/persistence/tree/BPlusTree.java          | 50 +++++++++++-----------
 .../persistence/tree/io/AbstractDataPageIO.java    |  6 +--
 .../cache/persistence/tree/io/BPlusIO.java         |  8 ++--
 .../cache/persistence/tree/io/BPlusLeafIO.java     |  2 +-
 .../cache/persistence/tree/io/DataPageIO.java      |  2 +-
 .../cache/persistence/tree/io/TrackingPageIO.java  |  2 +-
 .../persistence/tree/reuse/ReuseListImpl.java      |  2 +-
 .../persistence/wal/FileWriteAheadLogManager.java  |  4 +-
 .../persistence/wal/SegmentedRingByteBuffer.java   |  4 +-
 .../wal/filehandle/AbstractFileHandle.java         |  2 +-
 .../wal/reader/IgniteWalIteratorFactory.java       |  2 +-
 .../query/GridCacheDistributedQueryManager.java    |  4 +-
 .../cache/store/GridCacheStoreManagerAdapter.java  |  2 +-
 .../cache/store/GridCacheWriteBehindStore.java     |  6 +--
 .../cache/transactions/IgniteTxAdapter.java        |  4 +-
 .../cache/transactions/IgniteTxEntry.java          |  2 +-
 .../IgniteTxImplicitSingleStateImpl.java           |  4 +-
 .../cache/transactions/IgniteTxManager.java        |  2 +-
 .../processors/cache/tree/AbstractDataInnerIO.java |  2 +-
 .../processors/cache/tree/CacheDataTree.java       |  2 +-
 .../cache/tree/mvcc/data/MvccDataRow.java          |  2 +-
 .../cache/tree/mvcc/data/MvccUpdateDataRow.java    | 10 ++---
 .../processors/cache/verify/ContentionClosure.java |  2 +-
 .../cache/verify/IdleVerifyException.java          |  2 +-
 .../processors/cluster/BaselineTopology.java       |  8 ++--
 .../cluster/BaselineTopologyHistory.java           |  2 +-
 .../cluster/DiscoveryDataClusterState.java         |  4 +-
 .../cluster/GridClusterStateProcessor.java         |  2 +-
 .../processors/cluster/GridUpdateNotifier.java     |  6 +--
 .../processors/datastreamer/DataStreamerImpl.java  |  4 +-
 .../datastructures/AtomicDataStructureProxy.java   |  2 +-
 .../datastructures/DataStructuresProcessor.java    |  2 +-
 .../datastructures/GridCacheAnnotationHelper.java  |  4 +-
 .../datastructures/GridCacheAtomicLongImpl.java    |  2 +-
 .../GridCacheAtomicSequenceImpl.java               |  2 +-
 .../datastructures/GridCacheLockImpl.java          | 34 +++++++--------
 .../datastructures/GridCacheLockState.java         |  2 +-
 .../datastructures/GridCacheSemaphoreImpl.java     |  4 +-
 .../datastructures/GridCacheSetImpl.java           |  2 +-
 .../processors/igfs/IgfsFragmentizerManager.java   |  2 +-
 .../internal/processors/igfs/IgfsMetaManager.java  |  6 +--
 .../igfs/secondary/local/LocalFileSystemUtils.java |  2 +-
 .../marshaller/GridMarshallerMappingProcessor.java |  2 +-
 .../internal/processors/metric/MetricRegistry.java |  2 +-
 .../processors/odbc/ClientListenerNioListener.java |  2 +-
 .../odbc/ClientListenerNioServerBuffer.java        |  5 +--
 .../processors/odbc/ClientListenerProcessor.java   |  2 +-
 .../processors/odbc/jdbc/JdbcColumnMetaV2.java     |  2 +-
 .../odbc/jdbc/JdbcConnectionContext.java           |  2 +-
 .../odbc/jdbc/JdbcMetaColumnsResult.java           |  2 +-
 .../odbc/jdbc/JdbcMetaIndexesResult.java           |  2 +-
 .../processors/odbc/jdbc/JdbcMetaParamsResult.java |  2 +-
 .../odbc/jdbc/JdbcMetaPrimaryKeysResult.java       |  2 +-
 .../processors/odbc/jdbc/JdbcMetaTablesResult.java |  2 +-
 .../processors/odbc/jdbc/JdbcQueryCursor.java      |  2 +-
 .../processors/odbc/jdbc/JdbcQueryFetchResult.java |  2 +-
 .../odbc/jdbc/JdbcQueryMetadataResult.java         |  2 +-
 .../internal/processors/odbc/jdbc/JdbcRequest.java |  2 +-
 .../odbc/odbc/OdbcConnectionContext.java           |  2 +-
 .../processors/odbc/odbc/OdbcQueryCloseResult.java |  2 +-
 .../processors/odbc/odbc/OdbcQueryFetchResult.java |  2 +-
 .../odbc/odbc/OdbcQueryMoreResultsResult.java      |  2 +-
 .../processors/odbc/odbc/OdbcRequestHandler.java   |  4 +-
 .../processors/platform/PlatformProcessorImpl.java |  4 +-
 .../platform/binary/PlatformBinaryProcessor.java   |  2 +-
 .../processors/platform/cache/PlatformCache.java   |  2 +-
 .../cache/PlatformCacheEntryProcessorImpl.java     |  2 +-
 .../platform/callback/PlatformCallbackGateway.java |  5 ++-
 .../ClientClusterGroupGetNodeIdsRequest.java       |  9 ++--
 .../ClientClusterGroupGetNodesDetailsResponse.java |  5 +--
 .../platform/cluster/PlatformClusterGroup.java     |  2 +-
 .../platform/dotnet/PlatformDotNetCacheStore.java  |  2 +-
 .../platform/messaging/PlatformMessaging.java      |  2 +-
 .../platform/services/PlatformServices.java        |  4 +-
 .../processors/platform/utils/PlatformUtils.java   |  2 +-
 .../query/GridQueryFieldsResultAdapter.java        |  2 +-
 .../processors/query/GridQueryProcessor.java       |  4 +-
 .../processors/query/GridRunningQueryInfo.java     |  2 +-
 .../internal/processors/query/QueryUtils.java      |  8 ++--
 .../processors/query/RunningQueryManager.java      |  2 +-
 .../processors/query/TableInformation.java         |  2 +-
 .../messages/GridQueryNextPageResponse.java        |  2 +-
 .../query/messages/GridQueryKillResponse.java      |  2 +-
 .../processors/rest/GridRestProcessor.java         |  2 +-
 .../client/message/GridClientStateRequest.java     |  2 +-
 .../version/GridVersionCommandHandler.java         |  2 +-
 .../protocols/tcp/GridTcpMemcachedNioListener.java |  2 +-
 .../security/NoOpIgniteSecurityProcessor.java      |  2 +-
 .../processors/task/GridTaskProcessor.java         |  2 +-
 .../internal/processors/task/GridTaskWorker.java   |  2 +-
 .../org/apache/ignite/internal/sql/SqlParser.java  |  2 +-
 .../apache/ignite/internal/util/GridArrays.java    |  4 +-
 .../internal/util/GridMultiCollectionWrapper.java  |  2 +-
 .../ignite/internal/util/GridStringBuilder.java    |  2 +-
 .../apache/ignite/internal/util/IgniteUtils.java   | 21 ++++-----
 .../ignite/internal/util/StripedExecutor.java      | 10 ++---
 .../internal/util/future/GridFutureAdapter.java    | 10 ++---
 .../ignite/internal/util/io/GridFilenameUtils.java |  4 +-
 .../util/io/GridReversedLinesFileReader.java       | 18 ++++----
 .../ipc/shmem/IpcSharedMemoryServerEndpoint.java   |  2 +-
 .../util/lang/GridMetadataAwareAdapter.java        |  2 +-
 .../internal/util/lang/GridNodePredicate.java      |  2 +-
 .../util/nodestart/IgniteNodeStartUtils.java       |  2 +-
 .../internal/visor/VisorDataTransferObject.java    |  2 +-
 .../VisorCacheResetLostPartitionsTaskArg.java      |  2 +-
 ...orFindAndDeleteGarbageInPersistenceClosure.java |  2 +-
 .../internal/visor/debug/VisorThreadInfo.java      |  2 +-
 .../diagnostic/VisorPageLocksTrackerArgs.java      |  2 +-
 .../ignite/internal/visor/misc/VisorWalTask.java   | 12 +++---
 .../internal/visor/misc/VisorWalTaskArg.java       |  2 +-
 .../node/VisorCacheRebalanceCollectorTask.java     |  2 +-
 .../visor/node/VisorLifecycleConfiguration.java    |  2 +-
 .../internal/visor/node/VisorSuppressedError.java  |  2 +-
 .../internal/visor/query/VisorQueryUtils.java      |  2 +-
 .../ignite/messaging/MessagingListenActor.java     |  2 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java     |  2 +-
 .../plugin/security/AuthenticationContext.java     |  2 +-
 .../spi/ExponentialBackoffTimeoutStrategy.java     |  2 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java    |  2 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java     |  6 +--
 .../spi/communication/tcp/TcpCommunicationSpi.java |  2 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java       |  2 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java       | 16 +++----
 .../ignite/spi/discovery/tcp/TcpDiscoveryImpl.java |  2 +-
 .../tcp/internal/DiscoveryDataPacket.java          |  2 +-
 .../tcp/internal/TcpDiscoveryStatistics.java       |  2 +-
 .../encryption/keystore/KeystoreEncryptionSpi.java |  4 +-
 .../ignite/spi/systemview/jmx/SystemViewMBean.java |  4 +-
 .../apache/ignite/startup/cmdline/AboutDialog.java |  2 +-
 .../ignite/cache/IgniteWarmupClosureSelfTest.java  |  2 +-
 .../ignite/cache/ResetLostPartitionTest.java       |  2 +-
 .../jdbc/CacheJdbcPojoStoreAbstractSelfTest.java   |  8 ++--
 ...CacheJdbcPojoStoreBinaryMarshallerSelfTest.java |  4 +-
 ...StoreBinaryMarshallerWithSqlEscapeSelfTest.java |  2 +-
 .../cache/store/jdbc/CacheJdbcPojoStoreTest.java   |  4 +-
 .../org/apache/ignite/client/FunctionalTest.java   |  2 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java      |  2 +-
 .../apache/ignite/igfs/IgfsTestInputGenerator.java |  2 +-
 .../internal/ClusterNodeMetricsSelfTest.java       |  2 +-
 ...rocessorCheckGlobalStateComputeRequestTest.java |  6 +--
 .../DiagnosticLogForPartitionStatesTest.java       |  2 +-
 .../internal/GridCancelUnusedJobSelfTest.java      |  2 +-
 .../GridFailoverCustomTopologySelfTest.java        |  4 +-
 .../ignite/internal/GridGetOrStartSelfTest.java    |  4 +-
 .../internal/GridJobCollisionCancelSelfTest.java   |  2 +-
 .../ignite/internal/GridJobContextSelfTest.java    |  2 +-
 .../GridMultipleVersionsDeploymentSelfTest.java    |  2 +-
 .../internal/GridNonHistoryMetricsSelfTest.java    |  2 +-
 .../internal/IgniteClientReconnectCacheTest.java   |  4 +-
 ...teConnectionConcurrentReserveAndRemoveTest.java |  2 +-
 .../internal/binary/BinaryEnumsSelfTest.java       | 11 +++--
 .../binary/BinaryObjectExceptionSelfTest.java      |  4 +-
 .../encryption/AbstractEncryptionTest.java         |  2 +-
 .../encryption/EncryptedCacheBigEntryTest.java     |  2 +-
 .../encryption/EncryptedCacheCreateTest.java       |  4 +-
 .../EncryptedCachePreconfiguredRestartTest.java    |  2 +-
 .../GridIoManagerFileTransmissionSelfTest.java     |  2 +-
 .../GridDiscoveryManagerAttributesSelfTest.java    |  2 +-
 .../optimized/OptimizedMarshallerTest.java         |  4 +-
 .../optimized/OptimizedObjectStreamSelfTest.java   |  8 ++--
 .../internal/metric/CacheMetricsAddRemoveTest.java |  4 +-
 .../ignite/internal/metric/JmxExporterSpiTest.java | 10 ++---
 .../ignite/internal/metric/LogExporterSpiTest.java |  2 +-
 .../ignite/internal/metric/MetricsSelfTest.java    | 22 +++++-----
 .../ignite/internal/metric/SystemViewSelfTest.java | 22 +++++-----
 .../affinity/GridAffinityAssignmentV2Test.java     |  4 +-
 .../GridHistoryAffinityAssignmentTest.java         |  2 +-
 .../cache/ActiveOnStartPropertyTest.java           |  2 +-
 .../cache/AutoActivationPropertyTest.java          |  4 +-
 .../cache/CacheGroupsMetricsRebalanceTest.java     |  4 +-
 .../cache/CacheIgniteOutOfMemoryExceptionTest.java |  2 +-
 .../cache/ClusterStateOnStartPropertyTest.java     | 12 +++---
 .../cache/CrossCacheTxRandomOperationsTest.java    |  4 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java    |  4 +-
 .../cache/GridCacheAbstractLocalStoreSelfTest.java |  2 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java    |  4 +-
 ...idCacheAbstractUsersAffinityMapperSelfTest.java |  2 +-
 ...acheAtomicEntryProcessorDeploymentSelfTest.java |  4 +-
 .../cache/GridCacheBasicStoreAbstractTest.java     |  2 +-
 .../GridCacheConcurrentGetCacheOnClientTest.java   |  2 +-
 .../cache/GridCacheConcurrentMapSelfTest.java      |  2 +-
 .../GridCacheConcurrentTxMultiNodeLoadTest.java    |  2 +-
 .../cache/GridCacheGenericTestStore.java           |  2 +-
 .../GridCacheInterceptorAbstractSelfTest.java      |  6 +--
 .../cache/GridCacheOffheapUpdateSelfTest.java      |  2 +-
 .../cache/GridCacheOnCopyFlagAbstractSelfTest.java |  4 +-
 .../GridCacheQuerySqlFieldInlineSizeSelfTest.java  |  8 ++--
 .../cache/GridEvictionPolicyMBeansTest.java        |  2 +-
 .../cache/IgniteCacheAbstractStopBusySelfTest.java |  8 ++--
 .../IgniteCacheConfigurationTemplateTest.java      |  2 +-
 .../IgniteCacheExpireAndUpdateConsistencyTest.java |  2 +-
 .../processors/cache/IgniteCacheGroupsTest.java    | 14 +++---
 .../cache/IgniteCacheInvokeAbstractTest.java       |  2 +-
 .../cache/IgniteCachePeekModesAbstractTest.java    |  8 ++--
 .../IgniteClientCacheInitializationFailTest.java   |  2 +-
 .../cache/IgniteMarshallerCacheFSRestoreTest.java  |  2 +-
 .../cache/IgnitePutAllLargeBatchSelfTest.java      |  2 +-
 .../IgniteStartCacheInTransactionSelfTest.java     | 12 +++---
 .../IgniteTopologyValidatorGridSplitCacheTest.java |  2 +-
 ...acheAbstractDataStructuresFailoverSelfTest.java | 12 +++---
 .../GridCacheMultiNodeDataStructureTest.java       |  2 +-
 .../IgniteClientDataStructuresAbstractTest.java    |  2 +-
 ...IgniteExchangeLatchManagerDiscoHistoryTest.java |  4 +-
 .../datastructures/IgniteLockAbstractSelfTest.java | 31 +++++++-------
 .../IgnitePartitionedQueueNoBackupsTest.java       |  3 +-
 .../CacheDataLossOnPartitionMoveTest.java          |  2 +-
 ...abledTransactionalWriteReadRestartSelfTest.java |  2 +-
 .../distributed/CachePageWriteLockUnlockTest.java  |  2 +-
 .../CachePartitionLostWhileClearingTest.java       |  2 +-
 .../GridCacheMultiNodeLockAbstractTest.java        |  2 +-
 ...GridCacheMultithreadedFailoverAbstractTest.java |  2 +-
 ...PartitionEvictionDuringReadThroughSelfTest.java |  4 +-
 .../IgniteCacheConnectionRecoveryTest.java         |  2 +-
 ...niteCacheMessageRecoveryIdleConnectionTest.java |  2 +-
 .../dht/CacheGetReadFromBackupFailoverTest.java    |  2 +-
 ...ionedOnlyP2PEnabledByteArrayValuesSelfTest.java |  2 +-
 .../dht/IgniteCacheMultiTxLockSelfTest.java        |  2 +-
 .../dht/IgniteCachePutRetryAbstractSelfTest.java   |  2 +-
 .../PartitionsEvictManagerAbstractTest.java        |  2 +-
 .../near/GridCacheNearMetricsSelfTest.java         |  6 +--
 ...rtitionedP2PEnabledByteArrayValuesSelfTest.java |  2 +-
 ...nedAffinityExcludeNeighborsPerformanceTest.java |  4 +-
 .../near/GridCachePartitionedEvictionSelfTest.java |  2 +-
 .../GridCacheRebalancingSyncCheckDataTest.java     |  2 +-
 ...eRebalanceOnCachesStoppingOrDestroyingTest.java |  2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java       |  4 +-
 .../IgniteCacheStoreNodeRestartAbstractTest.java   |  2 +-
 .../GridCacheFastNodeLeftForTransactionTest.java   |  2 +-
 .../cache/mvcc/CacheMvccAbstractTest.java          |  4 +-
 .../cache/mvcc/CacheMvccTransactionsTest.java      |  6 +--
 .../cache/mvcc/CacheMvccTxFailoverTest.java        |  4 +-
 .../IgnitePdsDestroyCacheAbstractTest.java         |  4 +-
 .../persistence/IgnitePdsTaskCancelingTest.java    |  2 +-
 ...ocalWalModeChangeDuringRebalancingSelfTest.java |  2 +-
 .../IgniteAbsentEvictionNodeOutOfBaselineTest.java |  4 +-
 .../db/IgnitePdsPartitionPreloadTest.java          |  2 +-
 .../db/checkpoint/CheckpointStartLoggingTest.java  | 10 ++---
 .../db/checkpoint/ProgressWatchdog.java            |  6 +--
 .../db/file/IgnitePdsThreadInterruptionTest.java   |  2 +-
 ...ailIsReachedDuringIterationOverArchiveTest.java |  2 +-
 .../db/wal/IgniteWalFlushFailoverTest.java         |  2 +-
 ...eWalFlushMultiNodeFailoverAbstractSelfTest.java |  4 +-
 .../db/wal/IgniteWalSerializerVersionTest.java     |  2 +-
 .../db/wal/WalRecoveryTxLogicalRecordsTest.java    |  4 +-
 .../db/wal/crc/IgniteDataIntegrityTests.java       |  4 +-
 .../db/wal/crc/IgnitePureJavaCrcCompatibility.java |  2 +-
 ...teWithoutArchiverWalIteratorInvalidCrcTest.java |  2 +-
 .../db/wal/reader/IgniteWalReaderTest.java         |  4 +-
 .../PageLockTrackerManagerTest.java                |  6 +--
 .../pagemem/BPlusTreePageMemoryImplTest.java       |  6 +--
 .../persistence/pagemem/FullPageIdTableTest.java   |  2 +-
 .../persistence/pagemem/PageMemoryImplTest.java    |  2 +-
 .../standbycluster/AbstractNodeJoinTemplate.java   | 18 ++++----
 .../IgniteChangeGlobalStateCacheTest.java          |  2 +-
 .../IgniteChangeGlobalStateDataStructureTest.java  |  2 +-
 .../IgniteChangeGlobalStateServiceTest.java        |  2 +-
 .../IgniteChangeGlobalStateTest.java               |  2 +-
 .../extended/GridActivateExtensionTest.java        |  6 +--
 ...InActiveNodeToActiveClusterWithPersistence.java |  2 +-
 .../persistence/tree/io/TrackingPageIOTest.java    |  4 +-
 ...acheContinuousQueryAsyncFilterListenerTest.java |  4 +-
 .../CacheContinuousQueryVariationsTest.java        |  4 +-
 .../GridCacheContinuousQueryAbstractSelfTest.java  |  4 +-
 ...CacheWriteBehindStoreMultithreadedSelfTest.java |  2 +-
 ...cheClientWriteBehindStoreNonCoalescingTest.java |  4 +-
 .../cache/transactions/DepthFirstSearchTest.java   | 18 ++++----
 .../transactions/PartitionUpdateCounterTest.java   |  4 +-
 .../TxCrossCachePartitionConsistencyTest.java      |  4 +-
 ...acheRemoteMultiplePartitionReservationTest.java |  2 +-
 .../TxDataConsistencyOnCommitFailureTest.java      |  2 +-
 .../cache/transactions/TxDeadlockCauseTest.java    |  6 +--
 .../processors/cache/transactions/TxLabelTest.java |  2 +-
 .../cache/transactions/TxOnCachesStopTest.java     |  2 +-
 .../TxOptimisticDeadlockDetectionTest.java         |  2 +-
 .../transactions/TxOptimisticReadThroughTest.java  |  2 +-
 .../TxPartitionCounterStateAbstractTest.java       |  4 +-
 .../TxPartitionCounterStateConsistencyTest.java    |  8 ++--
 ...rtitionCounterStateOnePrimaryOneBackupTest.java |  2 +-
 .../TxRecoveryWithConcurrentRollbackTest.java      |  4 +-
 .../cache/transactions/TxRollbackAsyncTest.java    |  2 +-
 .../TxRollbackOnMapOnInvalidTopologyTest.java      |  2 +-
 .../transactions/TxRollbackOnTimeoutTest.java      |  4 +-
 .../TxRollbackOnTopologyChangeTest.java            |  4 +-
 .../TxWithSmallTimeoutAndContentionOneKeyTest.java |  4 +-
 .../processors/database/BPlusTreeSelfTest.java     | 10 ++---
 .../database/IgniteDbDynamicCacheSelfTest.java     |  2 +-
 .../datastreamer/DataStreamerImplSelfTest.java     | 18 ++++----
 .../datastreamer/DataStreamerStopCacheTest.java    |  2 +-
 .../diagnostic/DiagnosticProcessorTest.java        |  2 +-
 .../processors/igfs/IgfsAbstractSelfTest.java      | 16 +++----
 .../igfs/IgfsBackupFailoverSelfTest.java           | 12 +++---
 .../processors/igfs/IgfsDualAbstractSelfTest.java  |  4 +-
 ...calSecondaryFileSystemDualAbstractSelfTest.java |  2 +-
 .../IgfsLocalSecondaryFileSystemProxySelfTest.java |  6 +--
 .../IgfsLocalSecondaryFileSystemTestAdapter.java   |  2 +-
 ...IgfsNewLineDelimiterRecordResolverSelfTest.java |  2 +-
 .../jobmetrics/GridJobMetricsSelfTest.java         |  2 +-
 .../IgniteMessagingConfigVariationFullApiTest.java |  2 +-
 .../GridCacheAtomicCommandHandlerSelfTest.java     |  2 +-
 .../cache/GridCacheCommandHandlerSelfTest.java     |  2 +-
 .../AbstractRemoteSecurityContextCheckTest.java    |  2 +-
 .../client/AdditionalSecurityCheckTest.java        |  6 +--
 .../security/sandbox/AbstractSandboxTest.java      |  2 +-
 .../security/sandbox/ComputeSandboxTest.java       |  4 +-
 .../sandbox/DoPrivilegedOnRemoteNodeTest.java      |  6 +--
 .../sandbox/IgniteOperationsInsideSandboxTest.java |  2 +-
 .../sandbox/SecuritySubjectPermissionsTest.java    |  2 +-
 ...ceDeployment2ClassLoadersJdkMarshallerTest.java |  2 +-
 ...oyment2ClassLoadersOptimizedMarshallerTest.java |  2 +-
 .../ServiceDeploymentOnClientDisconnectTest.java   |  2 +-
 .../service/SystemCacheNotConfiguredTest.java      |  2 +-
 .../internal/sql/SqlParserKillQuerySelfTest.java   |  6 +--
 .../ignite/internal/util/IgniteUtilsSelfTest.java  | 14 +++---
 .../util/collection/AbstractBaseIntMapTest.java    |  2 +-
 .../internal/util/collection/BitSetIntSetTest.java |  2 +-
 ...GridUnsafeDataInputOutputByteOrderSelfTest.java | 14 +++---
 .../util/ipc/shmem/IpcSharedMemoryFakeClient.java  |  2 +-
 .../util/ipc/shmem/IpcSharedMemoryNodeStartup.java |  2 +-
 .../ignite/internal/util/nio/GridNioSelfTest.java  |  2 +-
 .../tostring/CircularStringBuilderSelfTest.java    |  2 +-
 .../util/tostring/GridToStringBuilderSelfTest.java | 10 ++---
 .../lang/GridMetadataAwareAdapterLoadTest.java     |  2 +-
 .../lang/utils/GridConsistentHashSelfTest.java     |  2 +-
 .../utils/IgniteOffheapReadWriteLockSelfTest.java  |  2 +-
 .../loadtests/cache/GridCacheAbstractLoadTest.java |  2 +-
 .../direct/multisplit/GridMultiSplitsLoadTest.java |  2 +-
 .../direct/stealing/GridStealingLoadTest.java      |  2 +-
 .../direct/stealing/GridStealingLoadTestTask.java  |  2 +-
 .../ignite/loadtests/dsi/GridDsiRequest.java       |  2 +-
 .../ignite/loadtests/dsi/GridDsiResponse.java      |  2 +-
 .../ignite/loadtests/dsi/GridDsiSession.java       |  2 +-
 .../lang/GridConcurrentLinkedHashMapBenchmark.java |  6 +--
 .../loadtests/nio/GridNioBenchmarkClient.java      |  8 ++--
 .../messaging/IgniteMessagingSendAsyncTest.java    |  2 +-
 .../p2p/GridP2PRemoteClassLoadersSelfTest.java     |  4 +-
 .../ignite/platform/PlatformDeployServiceTask.java |  2 +-
 .../ignite/services/ServiceThreadPoolSelfTest.java |  2 +-
 ...ridSessionCancelSiblingsFromFutureSelfTest.java |  2 +-
 .../GridSessionCancelSiblingsFromJobSelfTest.java  |  2 +-
 .../GridSessionCancelSiblingsFromTaskSelfTest.java |  2 +-
 .../GridSessionFutureWaitJobAttributeSelfTest.java |  2 +-
 ...GridSessionFutureWaitTaskAttributeSelfTest.java |  2 +-
 .../GridSessionSetFutureAttributeSelfTest.java     |  2 +-
 ...SharedFsCheckpointSpiMultiThreadedSelfTest.java |  4 +-
 ...FsCheckpointSpiMultipleDirectoriesSelfTest.java |  2 +-
 .../GridSharedFsCheckpointSpiSelfTest.java         |  2 +-
 .../tcp/TcpCommunicationSpiFaultyClientTest.java   |  2 +-
 .../local/GridLocalDeploymentSpiSelfTest.java      |  4 +-
 .../IgniteClientReconnectMassiveShutdownTest.java  |  2 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java         |  2 +-
 .../tcp/TcpDiscoveryWithWrongServerTest.java       |  2 +-
 .../stream/socket/SocketStreamerSelfTest.java      |  6 +--
 .../ignite/testframework/GridJarClassLoader.java   |  2 +-
 .../apache/ignite/testframework/GridTestUtils.java |  2 +-
 .../testframework/junits/GridAbstractTest.java     |  2 +-
 .../junits/GridTestKernalContext.java              |  2 +-
 .../junits/IgniteConfigVariationsAbstractTest.java |  4 +-
 .../junits/cache/TestThreadLocalCacheSession.java  |  2 +-
 .../junits/common/GridCommonAbstractTest.java      |  8 ++--
 .../junits/multijvm/IgniteNodeRunner.java          |  8 ++--
 .../junits/multijvm/IgniteProcessProxy.java        |  2 +-
 .../junits/spi/GridSpiAbstractConfigTest.java      |  2 +-
 .../test/ConfigVariationsTestSuiteBuilderTest.java |  4 +-
 .../ignite/util/GridSnapshotLockSelfTest.java      |  4 +-
 .../utils/ProcessSensitiveDataUtils.java           |  2 +-
 .../file/AlignedBuffersDirectFileIO.java           |  4 +-
 .../file/AlignedBuffersDirectFileIOFactory.java    |  2 +-
 .../file/LinuxNativeIoPluginProvider.java          |  2 +-
 .../uri/tasks/GridUriDeploymentDependency1.java    |  2 +-
 .../uri/tasks/GridUriDeploymentDependency2.java    |  2 +-
 .../uri/tasks/GridUriDeploymentDependency9.java    |  5 +--
 .../hadoop/impl/fs/HadoopRawLocalFileSystem.java   |  6 +--
 .../hadoop/impl/igfs/HadoopIgfsOutputStream.java   |  2 +-
 .../hadoop/impl/igfs/HadoopIgfsWrapper.java        |  2 +-
 .../processors/hadoop/impl/v2/HadoopV2Job.java     |  2 +-
 .../hadoop/impl/v2/HadoopV2JobResourceManager.java |  2 +-
 .../hadoop/impl/v2/HadoopV2TaskContext.java        |  2 +-
 .../hadoop/jobtracker/HadoopJobTracker.java        |  4 +-
 .../hadoop/shuffle/HadoopShuffleJob.java           |  2 +-
 .../collections/HadoopConcurrentHashMultimap.java  |  2 +-
 .../hadoop/shuffle/collections/HadoopSkipList.java |  2 +-
 .../shuffle/direct/HadoopDirectDataOutput.java     |  2 +-
 .../hadoop/taskexecutor/HadoopRunnableTask.java    |  4 +-
 .../processors/hadoop/impl/HadoopSortingTest.java  |  2 +-
 .../impl/HadoopTasksVersionsAbstractTest.java      |  2 +-
 .../processors/hadoop/impl/HadoopTeraSortTest.java |  2 +-
 .../processors/hadoop/impl/HadoopTestUtils.java    |  2 +-
 .../hadoop/impl/igfs/Hadoop1OverIgfsProxyTest.java |  2 +-
 .../HibernateL2CacheConfigurationSelfTest.java     |  2 +-
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  6 +--
 .../CacheHibernateStoreFactorySelfTest.java        |  4 +-
 .../HibernateL2CacheConfigurationSelfTest.java     |  2 +-
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  6 +--
 .../CacheHibernateStoreFactorySelfTest.java        |  2 +-
 .../HibernateL2CacheConfigurationSelfTest.java     |  2 +-
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  6 +--
 .../CacheHibernateStoreFactorySelfTest.java        |  2 +-
 .../cache/hibernate/HibernateCacheProxy.java       |  2 +-
 .../cache/query/RegisteredQueryCursor.java         |  2 +-
 .../internal/processors/query/h2/H2Connection.java |  2 +-
 .../processors/query/h2/H2TableDescriptor.java     |  6 +--
 .../internal/processors/query/h2/H2Utils.java      |  8 ++--
 .../processors/query/h2/IgniteH2Indexing.java      | 16 +++----
 .../processors/query/h2/MapH2QueryInfo.java        |  2 +-
 .../processors/query/h2/QueryParserCacheEntry.java |  2 +-
 .../processors/query/h2/ReduceH2QueryInfo.java     |  2 +-
 .../processors/query/h2/SchemaManager.java         |  6 +--
 .../query/h2/affinity/PartitionExtractor.java      |  2 +-
 .../query/h2/database/H2PkHashIndex.java           |  2 +-
 .../processors/query/h2/database/H2Tree.java       |  2 +-
 .../processors/query/h2/database/H2TreeIndex.java  |  2 +-
 .../inlinecolumn/AbstractInlineIndexColumn.java    |  2 +-
 .../inlinecolumn/BytesInlineIndexColumn.java       |  2 +-
 .../processors/query/h2/dml/DmlAstUtils.java       |  2 +-
 .../internal/processors/query/h2/dml/DmlUtils.java |  2 +-
 .../processors/query/h2/dml/UpdatePlanBuilder.java |  2 +-
 .../processors/query/h2/opt/GridH2IndexBase.java   |  6 +--
 .../query/h2/opt/GridH2RowDescriptor.java          |  2 +-
 .../processors/query/h2/opt/GridH2Table.java       |  4 +-
 .../query/h2/opt/GridLuceneDirectory.java          |  2 +-
 .../query/h2/opt/GridLuceneInputStream.java        |  2 +-
 .../processors/query/h2/sql/GridSqlAlias.java      |  2 +-
 .../processors/query/h2/sql/GridSqlColumn.java     |  2 +-
 .../query/h2/sql/GridSqlQueryParser.java           |  2 +-
 .../query/h2/sql/GridSqlQuerySplitter.java         | 10 ++---
 .../query/h2/sql/SplitterQueryModel.java           |  4 +-
 .../query/h2/twostep/AbstractReducer.java          |  4 +-
 .../query/h2/twostep/GridMapQueryExecutor.java     |  4 +-
 .../processors/query/h2/twostep/ReduceIndex.java   | 12 +++---
 .../query/h2/twostep/ReducePartitionMapper.java    |  4 +-
 .../query/h2/twostep/ReduceQueryRun.java           | 10 ++---
 .../processors/query/h2/twostep/SortedReducer.java |  8 ++--
 .../query/h2/twostep/msg/GridH2DmlRequest.java     |  2 +-
 .../query/h2/twostep/msg/GridH2QueryRequest.java   |  2 +-
 .../metric/SqlStatisticsUserQueriesFastTest.java   |  4 +-
 .../cache/BinarySerializationQuerySelfTest.java    |  2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java    |  4 +-
 ...ridCacheFullTextQueryMultithreadedSelfTest.java |  2 +-
 .../cache/GridCacheOffheapIndexGetSelfTest.java    |  2 +-
 .../IgniteBinaryObjectFieldsQuerySelfTest.java     |  2 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java    |  6 +--
 .../IgniteCacheConfigVariationsQueryTest.java      |  2 +-
 .../processors/cache/IgniteCacheGroupsSqlTest.java |  2 +-
 ...oinPartitionedAndReplicatedCollocationTest.java |  4 +-
 .../cache/IgniteCacheLargeResultSelfTest.java      |  4 +-
 .../cache/IgniteCacheOffheapIndexScanTest.java     |  2 +-
 .../cache/IgniteCacheQueryH2IndexingLeakTest.java  |  4 +-
 .../IgniteCacheQueryMultiThreadedSelfTest.java     |  4 +-
 .../cache/IgniteCacheUnionDuplicatesTest.java      |  2 +-
 ...eDistributedPartitionQueryAbstractSelfTest.java |  2 +-
 ...acheDistributedQueryDefaultTimeoutSelfTest.java |  2 +-
 ...tributedQueryStopOnCancelOrTimeoutSelfTest.java |  2 +-
 .../IgniteCachePartitionedFieldsQuerySelfTest.java |  4 +-
 ...cheQueryNodeRestartDistributedJoinSelfTest.java |  2 +-
 .../IgniteCacheQueryNodeRestartTxSelfTest.java     |  2 +-
 .../cache/encryption/EncryptedSqlTableTest.java    |  4 +-
 .../cache/index/BasicJavaTypesIndexTest.java       |  2 +-
 .../cache/index/BasicSqlTypesIndexTest.java        |  2 +-
 .../index/DynamicIndexAbstractBasicSelfTest.java   |  2 +-
 .../DynamicIndexAbstractConcurrentSelfTest.java    |  2 +-
 .../cache/index/H2DynamicTableSelfTest.java        |  5 ++-
 .../processors/cache/index/H2RowCacheSelfTest.java |  6 +--
 .../processors/cache/index/LongIndexNameTest.java  |  2 +-
 .../index/StopNodeOnRebuildIndexFailureTest.java   |  6 +--
 ...niteCacheLocalQueryCancelOrTimeoutSelfTest.java |  2 +-
 .../cache/local/IgniteCacheLocalQuerySelfTest.java |  4 +-
 .../cache/metric/SqlViewExporterSpiTest.java       |  2 +-
 .../mvcc/CacheMvccBasicContinuousQueryTest.java    |  2 +-
 .../CacheMvccSelectForUpdateQueryBasicTest.java    |  2 +-
 .../cache/mvcc/CacheMvccSqlLockTimeoutTest.java    |  2 +-
 .../mvcc/CacheMvccSqlTxQueriesAbstractTest.java    |  2 +-
 .../cache/mvcc/CacheMvccSqlUpdateCountersTest.java |  6 +--
 .../cache/mvcc/MvccRepeatableReadBulkOpsTest.java  |  4 +-
 .../mvcc/MvccRepeatableReadOperationsTest.java     |  6 +--
 .../db/IgniteCacheGroupsWithRestartsTest.java      |  2 +-
 .../processors/client/IgniteDataStreamerTest.java  |  4 +-
 ...actQueryTableLockAndConnectionPoolSelfTest.java |  8 ++--
 .../processors/query/DisabledSqlFunctionsTest.java |  2 +-
 .../query/IgniteSqlEntryCacheModeAgnosticTest.java |  4 +-
 .../query/IgniteSqlKeyValueFieldsTest.java         |  4 +-
 .../query/IgniteSqlNotNullConstraintTest.java      |  2 +-
 .../query/IgniteSqlParameterizedQueryTest.java     |  2 +-
 .../processors/query/IgniteSqlRoutingTest.java     |  2 +-
 .../query/IgniteSqlSchemaIndexingTest.java         |  2 +-
 .../query/IgniteSqlSegmentedIndexSelfTest.java     |  4 +-
 .../IgniteSqlSkipReducerOnUpdateDmlSelfTest.java   |  2 +-
 .../query/IgniteSqlSplitterSelfTest.java           |  4 +-
 .../processors/query/RunningQueriesTest.java       |  2 +-
 .../processors/query/SqlIllegalSchemaSelfTest.java |  2 +-
 .../SqlIncompatibleDataTypeExceptionTest.java      | 10 ++---
 .../processors/query/SqlSystemViewsSelfTest.java   |  4 +-
 .../query/h2/GridIndexRebuildSelfTest.java         |  2 +-
 .../H2ResultSetIteratorNullifyOnEndSelfTest.java   |  2 +-
 .../query/h2/IgniteSqlBigIntegerKeyTest.java       |  2 +-
 .../query/h2/IgniteSqlQueryMinMaxTest.java         |  2 +-
 ...ountTableStatisticsSurvivesNodeRestartTest.java |  2 +-
 .../query/h2/RowCountTableStatisticsUsageTest.java |  2 +-
 .../query/h2/TableStatisticsAbstractTest.java      |  2 +-
 .../query/h2/sql/AbstractH2CompareQueryTest.java   |  2 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java       | 12 +++---
 .../query/h2/sql/H2CompareBigQueryTest.java        | 28 ++++++------
 .../twostep/AbstractPartitionPruningBaseTest.java  |  2 +-
 .../AndOperationExtractPartitionSelfTest.java      |  4 +-
 .../DisappearedCacheCauseRetryMessageSelfTest.java | 10 ++---
 ...DisappearedCacheWasNotFoundMessageSelfTest.java |  6 +--
 .../InOperationExtractPartitionSelfTest.java       |  2 +-
 .../h2/twostep/RetryCauseMessageSelfTest.java      |  2 +-
 .../h2/twostep/SqlDataTypeConversionTest.java      |  2 +-
 .../h2indexing/FetchingQueryCursorStressTest.java  |  8 ++--
 .../util/GridCommandHandlerBrokenIndexTest.java    |  4 +-
 ...ndHandlerIndexingClusterByClassWithSSLTest.java |  2 +-
 .../util/GridCommandHandlerIndexingTest.java       |  2 +-
 .../util/GridCommandHandlerIndexingUtils.java      |  2 +-
 .../org/apache/ignite/util/KillCommandsTests.java  |  2 +-
 .../cache/GridJtaLifecycleAwareSelfTest.java       |  5 ++-
 .../ignite/logger/log4j2/Log4j2LoggerSelfTest.java |  2 +-
 .../ignite/ml/clustering/gmm/GmmPartitionData.java |  2 +-
 .../WeightedPredictionsAggregator.java             |  6 +--
 .../ignite/ml/dataset/feature/BucketMeta.java      |  4 +-
 .../ignite/ml/dataset/feature/ObjectHistogram.java |  6 +--
 .../extractor/impl/BinaryObjectVectorizer.java     |  2 +-
 .../bootstrapping/BootstrappedDatasetBuilder.java  |  2 +-
 .../impl/cache/CacheBasedDatasetBuilder.java       |  9 ++--
 .../ignite/ml/dataset/primitive/SimpleDataset.java |  2 +-
 .../builder/data/SimpleDatasetDataBuilder.java     |  2 +-
 .../parallelism/ParallelismStrategy.java           |  2 +-
 .../java/org/apache/ignite/ml/math/Tracer.java     |  2 +-
 .../ignite/ml/math/isolve/lsqr/AbstractLSQR.java   |  2 +-
 .../storage/VectorizedViewMatrixStorage.java       |  2 +-
 .../compound/CompoundNaiveBayesModel.java          |  3 +-
 .../compound/CompoundNaiveBayesTrainer.java        |  7 ++-
 .../java/org/apache/ignite/ml/nn/MLPTrainer.java   |  4 +-
 .../apache/ignite/ml/nn/MultilayerPerceptron.java  |  6 +--
 .../binarization/BinarizationPreprocessor.java     |  2 +-
 .../ml/preprocessing/imputing/ImputerTrainer.java  | 26 +++++------
 .../normalization/NormalizationPreprocessor.java   |  4 +-
 .../selection/paramgrid/ParameterSetGenerator.java |  2 +-
 .../selection/split/TrainTestDatasetSplitter.java  |  2 +-
 .../ignite/ml/structures/LabeledVectorSet.java     | 17 ++++----
 .../structures/LabeledVectorSetTestTrainPair.java  |  4 +-
 .../preprocessing/LabeledDatasetLoader.java        |  2 +-
 .../ml/tree/DecisionTreeClassificationTrainer.java |  4 +-
 .../apache/ignite/ml/tree/data/TreeDataIndex.java  |  6 +--
 .../RandomForestClassifierTrainer.java             |  2 +-
 .../data/statistics/LeafValuesComputer.java        |  2 +-
 .../java/org/apache/ignite/ml/util/LRUCache.java   |  2 +-
 .../convergence/ConvergenceCheckerTest.java        |  2 +-
 .../mean/MeanAbsValueConvergenceCheckerTest.java   |  4 +-
 .../MedianOfMedianConvergenceCheckerTest.java      |  2 +-
 .../ml/environment/deploy/MLDeployingTest.java     |  2 +-
 .../vector/storage/AbstractStorageTest.java        |  6 +--
 .../encoding/FrequencyEncoderPreprocessorTest.java |  2 +-
 .../encoding/OneHotEncoderPreprocessorTest.java    |  6 +--
 .../encoding/StringEncoderPreprocessorTest.java    |  2 +-
 .../RandomForestRegressionTrainerTest.java         |  2 +-
 .../data/impurity/GiniFeatureHistogramTest.java    |  2 +-
 .../data/impurity/ImpurityHistogramTest.java       |  2 +-
 .../data/impurity/MSEHistogramTest.java            |  2 +-
 .../spark/JavaStandaloneIgniteRDDSelfTest.java     |  2 +-
 .../spark/JavaStandaloneIgniteRDDSelfTest.java     |  2 +-
 .../util/spring/IgniteSpringHelperImpl.java        |  2 +-
 .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java    |  4 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java      |  2 +-
 .../util/nodestart/StartNodeCallableImpl.java      |  2 +-
 .../tools/ant/beautifier/GridJavadocAntTask.java   |  2 +-
 .../uri/GridUriDeploymentJarVerifier.java          |  2 +-
 .../uri/GridUriDeploymentSpringDocument.java       |  2 +-
 .../uri/GridUriDeploymentSpringParser.java         |  2 +-
 .../deployment/uri/GridUriDeploymentUriParser.java |  4 +-
 .../scanners/http/UriDeploymentHttpScanner.java    |  2 +-
 .../scanners/http/GridHttpDeploymentSelfTest.java  |  2 +-
 .../agent/db/dialect/JdbcMetadataDialect.java      |  2 +-
 .../agent/db/dialect/MySQLMetadataDialect.java     |  2 +-
 .../agent/db/dialect/OracleMetadataDialect.java    |  4 +-
 .../demo/service/DemoCachesLoadService.java        |  2 +-
 .../ignite/console/demo/task/DemoComputeTask.java  |  2 +-
 .../console/agent/rest/RestExecutorSelfTest.java   |  2 +-
 .../ignite/cache/websession/WebSessionFilter.java  |  6 +--
 .../internal/websession/WebSessionSelfTest.java    |  8 ++--
 .../org/apache/ignite/yardstick/IgniteNode.java    |  2 +-
 .../yardstick/IgniteThinAbstractBenchmark.java     | 10 ++---
 .../cache/IgniteCacheAbstractBenchmark.java        |  4 +-
 .../yardstick/cache/IgnitePutTxLoadBenchmark.java  |  6 +--
 .../org/apache/ignite/yardstick/cache/Loader.java  |  4 +-
 .../dml/IgniteSqlInsertIndexedValue2Benchmark.java |  2 +-
 .../dml/IgniteSqlInsertIndexedValue8Benchmark.java |  2 +-
 .../cache/jdbc/JdbcAbstractBenchmark.java          |  2 +-
 .../yardstick/cache/jdbc/RdbmsBenchmark.java       |  2 +-
 .../load/IgniteCacheRandomOperationBenchmark.java  |  2 +-
 .../yardstick/cache/load/model/ModelUtil.java      |  2 +-
 .../ignite/yardstick/cache/model/History.java      |  2 +-
 .../ignite/yardstick/cache/model/Person8.java      |  2 +-
 .../yardstick/cache/model/Person8NotIndexed.java   |  2 +-
 .../yardstick/jdbc/AbstractJdbcBenchmark.java      |  6 +--
 .../yardstick/jdbc/DisjointRangeGenerator.java     |  2 +-
 .../yardstick/jdbc/JdbcSqlUpdateBenchmark.java     |  2 +-
 .../jdbc/vendors/BaseSelectRangeBenchmark.java     |  2 +-
 .../thin/cache/IgniteThinBenchmarkUtils.java       | 12 +++---
 .../ignite/yardstick/upload/CopyBenchmark.java     |  4 +-
 .../yardstickframework/probes/TotalTimeProbe.java  |  6 +--
 .../org/apache/ignite/yarn/ClusterProperties.java  |  2 +-
 .../zk/internal/ZookeeperDiscoveryImpl.java        |  4 +-
 ...ZookeeperDiscoveryCommunicationFailureTest.java |  2 +-
 .../ZookeeperDiscoverySpiSaslAuthAbstractTest.java |  2 +-
 .../zk/internal/ZookeeperDiscoverySpiTestBase.java |  2 +-
 .../internal/ZookeeperDiscoverySpiTestHelper.java  |  4 +-
 772 files changed, 1483 insertions(+), 1477 deletions(-)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index e832028..1fee7cd 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -40,6 +40,16 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 
+        <!-- Whitespaces: See: https://checkstyle.sourceforge.io/config_whitespace.html -->
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
+            <property name="allowEmptyCatches" value="true"/>
+        </module>
+
         <!--Modifiers Checks. See: http://checkstyle.sourceforge.net/config_modifier.html-->
         <module name="ModifierOrder"/>
 
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index e9c2360..2736f2c 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -267,7 +267,7 @@ public class HibernateL2CacheExample {
     private static String timestampsCacheName() {
         return isIgniteHibernate51orBelowEnabled() ?
             // Represents the name of timestamps region specific to hibernate 5.1 {@see HibernateTimestampsRegion}.
-            "org.hibernate.cache.spi.UpdateTimestampsCache":
+            "org.hibernate.cache.spi.UpdateTimestampsCache" :
             // Represents the name of timestamps region specific to hibernate 5.3 {@see IgniteTimestampsRegion}.
             "default-update-timestamps-region";
     }
@@ -280,7 +280,7 @@ public class HibernateL2CacheExample {
     private static String queryResultsCacheName() {
         return isIgniteHibernate51orBelowEnabled() ?
             // Represents the name of query results region specific to hibernate 5.1 {@see HibernateQueryResultsRegion}.
-            "org.hibernate.cache.internal.StandardQueryCache":
+            "org.hibernate.cache.internal.StandardQueryCache" :
             // Represents the name of query results region specific to hibernate 5.3 {@see IgniteQueryResultsRegion}.
             "default-query-results-region";
     }
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java
index 8e98835..1ee4ec1 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java
@@ -32,7 +32,7 @@ import javax.persistence.ManyToOne;
 class Post {
     /** ID. */
     @Id
-    @GeneratedValue(strategy=GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
 
     /** Author. */
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java
index d0486f5..df16924 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java
@@ -36,7 +36,7 @@ import org.hibernate.annotations.NaturalId;
 class User {
     /** ID. */
     @Id
-    @GeneratedValue(strategy=GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
 
     /** Login. */
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
index abf2bcf..6e07d81 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
@@ -47,7 +47,7 @@ public class ComputeFailoverExample {
      * @param args Command line arguments, none required.
      * @throws IgniteException If example execution failed.
      */
-    public static void main(String[] args) throws IgniteException{
+    public static void main(String[] args) throws IgniteException {
         try (Ignite ignite = Ignition.start(ComputeFailoverNodeStartup.configuration())) {
             if (!ExamplesUtils.checkMinTopologySize(ignite.cluster(), 2))
                 return;
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java
index ba035ae..ef73d6e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java
@@ -103,7 +103,7 @@ public class IgniteLockExample {
 
                 int count = cache.get(SYNC_NAME);
 
-                while(count > 0) {
+                while (count > 0) {
                     notDone.await();
 
                     count = cache.get(SYNC_NAME);
@@ -169,7 +169,7 @@ public class IgniteLockExample {
 
                     int val = cache.get(QUEUE_ID);
 
-                    while(val >= 100){
+                    while (val >= 100) {
                         System.out.println("Queue is full. Producer [nodeId=" + Ignition.ignite().cluster().localNode().id() +
                             " paused.");
 
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/SandboxMLCache.java b/examples/src/main/java/org/apache/ignite/examples/ml/util/SandboxMLCache.java
index 341a341..04aa7a3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/util/SandboxMLCache.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/util/SandboxMLCache.java
@@ -119,7 +119,7 @@ public class SandboxMLCache {
         int cnt = 0;
         while (scanner.hasNextLine()) {
             String row = scanner.nextLine();
-            if(dataset.hasHeader() && cnt == 0) {
+            if (dataset.hasHeader() && cnt == 0) {
                 cnt++;
                 continue;
             }
@@ -130,8 +130,8 @@ public class SandboxMLCache {
             NumberFormat format = NumberFormat.getInstance(Locale.FRANCE);
 
             for (int i = 0; i < cells.length; i++)
-                try{
-                    if(cells[i].isEmpty()) data[i] = Double.NaN;
+                try {
+                    if (cells[i].isEmpty()) data[i] = Double.NaN;
                     else data[i] = Double.valueOf(cells[i]);
                 } catch (NumberFormatException e) {
                     try {
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 97a2d22a..070ec0f 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
@@ -73,7 +73,7 @@ public class SharedRDDExample {
         // Define data to be stored in the Ignite RDD (cache).
         List<Integer> data = new ArrayList<>(20);
 
-        for (int i = 0; i<20; i++) {
+        for (int i = 0; i < 20; i++) {
             data.add(i);
         }
 
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
index d8120c7..847b762 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
@@ -164,7 +164,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
 
         long maximum = input.next();
 
-        while(input.hasNext()) {
+        while (input.hasNext()) {
             Long val = input.next();
 
             if (val > maximum)
@@ -191,7 +191,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
 
         long maximum = input.nextElement();
 
-        while(input.hasMoreElements()) {
+        while (input.hasMoreElements()) {
             Long val = input.nextElement();
 
             if (val > maximum)
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
index a73225b..c96355d 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
@@ -51,7 +51,7 @@ import org.junit.Test;
  *
  * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
-@GridCommonTest(group="AOP")
+@GridCommonTest(group = "AOP")
 public class GridifySetToXXXNonSpringAopSelfTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
index df9e40b..4239a56 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
@@ -52,7 +52,7 @@ import org.junit.Test;
  *
  * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
-@GridCommonTest(group="AOP")
+@GridCommonTest(group = "AOP")
 public class GridifySetToXXXSpringAopSelfTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
index 0e17746..f822f6d 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
@@ -43,7 +43,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonTest;
  *
  * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
-@GridCommonTest(group="AOP")
+@GridCommonTest(group = "AOP")
 public class NonSpringAopSelfTest extends AbstractAopTest {
     /** {@inheritDoc} */
     @Override protected Object target() {
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
index 2f238bf..777e823 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonTest;
 /**
  * Spring AOP test.
  */
-@GridCommonTest(group="AOP")
+@GridCommonTest(group = "AOP")
 public class SpringAopSelfTest extends AbstractAopTest {
     /** {@inheritDoc} */
     @Override protected Object target() {
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
index bc94402..4d37e89 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
@@ -30,7 +30,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTarget")
+    @Gridify(igniteInstanceName = "TestAopTarget")
     @Override public int gridifyDefault(String arg) {
         return Integer.parseInt(arg);
     }
@@ -39,7 +39,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTarget", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName = "TestAopTarget", taskClass = TestGridifyTask.class)
     @Override public int gridifyNonDefaultClass(String arg) {
         return Integer.parseInt(arg);
     }
@@ -49,7 +49,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName = "TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
     @Override public int gridifyNonDefaultName(String arg) {
         return Integer.parseInt(arg);
     }
@@ -58,7 +58,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTarget", taskName = "")
+    @Gridify(igniteInstanceName = "TestAopTarget", taskName = "")
     @Override public int gridifyNoName(String arg) {
         return 0;
     }
@@ -68,7 +68,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTarget")
+    @Gridify(igniteInstanceName = "TestAopTarget")
     @Override public int gridifyDefaultException(String arg) throws TestGridifyException {
         throw new TestGridifyException(arg);
     }
@@ -78,7 +78,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTarget")
+    @Gridify(igniteInstanceName = "TestAopTarget")
     @Override public int gridifyDefaultResource(String arg) throws TestGridifyException {
         int res = Integer.parseInt(arg);
 
@@ -95,7 +95,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTarget", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName = "TestAopTarget", taskClass = TestGridifyTask.class)
     @Override public int gridifyNonDefaultClassResource(String arg) throws TestGridifyException {
         assert getResource() != null;
 
@@ -108,7 +108,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName = "TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
     @Override public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException {
         assert getResource() != null;
 
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
index db9d6e7..ab252df 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
@@ -28,28 +28,28 @@ public interface TestAopTargetInterface extends Serializable {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface")
+    @Gridify(igniteInstanceName = "TestAopTargetInterface")
     public int gridifyDefault(String arg);
 
     /**
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName = "TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
     public int gridifyNonDefaultName(String arg);
 
     /**
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName = "TestAopTargetInterface", taskClass = TestGridifyTask.class)
     public int gridifyNonDefaultClass(String arg);
 
     /**
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface", taskName = "")
+    @Gridify(igniteInstanceName = "TestAopTargetInterface", taskName = "")
     public int gridifyNoName(String arg);
 
     /**
@@ -57,7 +57,7 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface")
+    @Gridify(igniteInstanceName = "TestAopTargetInterface")
     public int gridifyDefaultException(String arg) throws TestGridifyException;
 
     /**
@@ -65,7 +65,7 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface")
+    @Gridify(igniteInstanceName = "TestAopTargetInterface")
     public int gridifyDefaultResource(String arg) throws TestGridifyException;
 
     /**
@@ -73,7 +73,7 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName = "TestAopTargetInterface", taskClass = TestGridifyTask.class)
     public int gridifyNonDefaultClassResource(String arg) throws TestGridifyException;
 
     /**
@@ -81,6 +81,6 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName = "TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
     public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException;
 }
diff --git a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
index b6c767a..7a58010 100644
--- a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
@@ -94,7 +94,7 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest {
      * @return The same value as parameter has.
      */
     @Gridify(taskName = "org.apache.ignite.p2p.GridP2PTestTask",
-        igniteInstanceName="org.apache.ignite.p2p.GridP2PGridifySelfTest1")
+        igniteInstanceName = "org.apache.ignite.p2p.GridP2PGridifySelfTest1")
     public int executeGridify(int res) {
         return res;
     }
@@ -130,7 +130,7 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest {
      * @param res Result.
      * @return The same value as parameter has.
      */
-    @Gridify(igniteInstanceName="org.apache.ignite.p2p.GridP2PGridifySelfTest1")
+    @Gridify(igniteInstanceName = "org.apache.ignite.p2p.GridP2PGridifySelfTest1")
     public Integer executeGridifyResource(int res) {
         String path = "org/apache/ignite/p2p/p2p.properties";
 
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
index 0cca8ac..62c3547 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
@@ -30,7 +30,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return Argument parsed to integer.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget")
+    @Gridify(igniteInstanceName = "ExternalAopTarget")
     public int gridifyDefault(String arg) {
         return Integer.parseInt(arg);
     }
@@ -39,7 +39,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return Argument parsed to integer.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget", taskClass = ExternalGridifyTask.class)
+    @Gridify(igniteInstanceName = "ExternalAopTarget", taskClass = ExternalGridifyTask.class)
     public int gridifyNonDefaultClass(String arg) {
         return Integer.parseInt(arg);
     }
@@ -49,7 +49,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return Argument parsed to integer.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName = "ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
     public int gridifyNonDefaultName(String arg) {
         return Integer.parseInt(arg);
     }
@@ -58,7 +58,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return ALways 0.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget", taskName = "myTask", taskClass = ExternalGridifyTask.class)
+    @Gridify(igniteInstanceName = "ExternalAopTarget", taskName = "myTask", taskClass = ExternalGridifyTask.class)
     public int gridifyTaskClassAndTaskName(String arg) {
         assert arg != null;
 
@@ -70,7 +70,7 @@ public class ExternalAopTarget {
      * @return No-op.
      * @throws ExternalGridifyException Always.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget")
+    @Gridify(igniteInstanceName = "ExternalAopTarget")
     public int gridifyDefaultException(String arg) throws ExternalGridifyException {
         throw new ExternalGridifyException(arg);
     }
@@ -80,7 +80,7 @@ public class ExternalAopTarget {
      * @return Argument parsed to integer.
      * @throws ExternalGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget")
+    @Gridify(igniteInstanceName = "ExternalAopTarget")
     public int gridifyDefaultResource(String arg) throws ExternalGridifyException {
         getResource();
 
@@ -92,7 +92,7 @@ public class ExternalAopTarget {
      * @return Argument parsed to integer.
      * @throws ExternalGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget", taskClass = ExternalGridifyTask.class)
+    @Gridify(igniteInstanceName = "ExternalAopTarget", taskClass = ExternalGridifyTask.class)
     public int gridifyNonDefaultClassResource(String arg) throws ExternalGridifyException {
         getResource();
 
@@ -105,7 +105,7 @@ public class ExternalAopTarget {
      * @return Argument parsed to integer.
      * @throws ExternalGridifyException If failed.
      */
-    @Gridify(igniteInstanceName="ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName = "ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
     public int gridifyNonDefaultNameResource(String arg) throws ExternalGridifyException {
         getResource();
 
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
index 65224fe..41ba08d 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
@@ -51,7 +51,7 @@ import org.junit.Test;
  *
  * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
-@GridCommonTest(group="AOP")
+@GridCommonTest(group = "AOP")
 public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {
     /** */
     private DeploymentMode depMode = DeploymentMode.PRIVATE;
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index c10505b..00f66d8 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -757,7 +757,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi {
             assert newData != null;
 
             synchronized (mux) {
-                for(S3TimeData data : newData)
+                for (S3TimeData data : newData)
                     map.put(data.getKey(), data);
 
                 mux.notifyAll();
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/collections/SmallHashSetsVsReadOnlyViewBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/collections/SmallHashSetsVsReadOnlyViewBenchmark.java
index d130792..13d1c91 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/collections/SmallHashSetsVsReadOnlyViewBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/collections/SmallHashSetsVsReadOnlyViewBenchmark.java
@@ -83,7 +83,7 @@ public class SmallHashSetsVsReadOnlyViewBenchmark extends JmhAbstractBenchmark {
         for (int i = 0; i < SIZE; i++)
             nodes[i] = new Node(UUID.randomUUID());
 
-        for (int i= 0; i < PARTS; i++) {
+        for (int i = 0; i < PARTS; i++) {
             Collection<UUID> hashSet = new HashSet<>();
 
             for (int j = 0; j < SIZE; j++)
@@ -125,7 +125,7 @@ public class SmallHashSetsVsReadOnlyViewBenchmark extends JmhAbstractBenchmark {
 
         boolean contains = false;
 
-        for(UUID uuid : col)
+        for (UUID uuid : col)
             if (randomUuid.equals(uuid))
                 contains = true;
 
@@ -144,7 +144,7 @@ public class SmallHashSetsVsReadOnlyViewBenchmark extends JmhAbstractBenchmark {
 
         boolean contains = false;
 
-        for(UUID uuid : col)
+        for (UUID uuid : col)
             if (randomUuid.equals(uuid))
                 contains = true;
 
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
index f3bbcb9..785429cf 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
@@ -120,7 +120,7 @@ public class GridDhtPartitionsStateValidatorBenchmark extends JmhAbstractBenchma
             Map<Integer, Long> cacheSizesMap = new HashMap<>();
 
             IntStream.range(0, PARTS).forEach(k -> { localPartitions.add(partitionMock(k, k + 1, k + 1));
-                long us = k > 20 && k <= 30 ? 0 :k + 2L;
+                long us = k > 20 && k <= 30 ? 0 : k + 2L;
                 updateCountersMap.put(k, new T2<>(k + 2L, us));
                 cacheSizesMap.put(k, us); });
 
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/JmhPartitionUpdateCounterBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/JmhPartitionUpdateCounterBenchmark.java
index c44d938..e1bd9b0 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/JmhPartitionUpdateCounterBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/JmhPartitionUpdateCounterBenchmark.java
@@ -52,7 +52,7 @@ public class JmhPartitionUpdateCounterBenchmark {
     private static final int GAPS_BUFFER_SIZE = 50;
 
     /** Max delta for next counter value. */
-    private static final int COUNTER_MAX_DELTA= 50;
+    private static final int COUNTER_MAX_DELTA = 50;
 
     /** Testing gaps buffer. */
     private final long [][] gapsBuf = new long[GAPS_BUFFER_SIZE][];
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
index 1a620cb..4252c06 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
@@ -247,7 +247,7 @@ public class JmhWaitStategyBenchmark extends JmhCacheAbstractBenchmark {
             BenchmarkParams params = result.getParams();
             Collection<String> args1 = params.getJvmArgs();
             for (String s : args1) {
-                System.out.print(s.substring(s.length() -3, s.length()));
+                System.out.print(s.substring(s.length() - 3, s.length()));
                 System.out.print(" x ");
             }
             System.out.print(params.getThreads());
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridAffinityAssignmentJolBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridAffinityAssignmentJolBenchmark.java
index f154341..df47437 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridAffinityAssignmentJolBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridAffinityAssignmentJolBenchmark.java
@@ -156,8 +156,8 @@ public class GridAffinityAssignmentJolBenchmark {
         long totalSize = GraphLayout.parseInstance(ga).totalSize();
 
         System.out.println("Optimized, parts " + parts
-            +" nodeCount " + nodeCnt
-            +" backups " + backups
+            + " nodeCount " + nodeCnt
+            + " backups " + backups
             + " " + totalSize);
 
         setOptimization(true);
@@ -173,8 +173,8 @@ public class GridAffinityAssignmentJolBenchmark {
         long totalSize2 = GraphLayout.parseInstance(ga2).totalSize();
 
         System.out.println("Deoptimized, parts " + parts
-            +" nodeCount " + nodeCnt
-            +" backups " + backups
+            + " nodeCount " + nodeCnt
+            + " backups " + backups
             + " " + totalSize2);
 
         if (totalSize > totalSize2)
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridMetricsJolBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridMetricsJolBenchmark.java
index 3539c18..9c6d2f9 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridMetricsJolBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/GridMetricsJolBenchmark.java
@@ -77,34 +77,34 @@ public class GridMetricsJolBenchmark {
 
         int start = 0;
 
-        for(int i=0; i<BOOLEAN_CNT; i++)
+        for (int i = 0; i < BOOLEAN_CNT; i++)
             metrics[start + i] = new BooleanMetricImpl(BOOLEAN_METRIC + i, null);
 
         start += BOOLEAN_CNT;
 
-        for(int i=0; i<DOUBLE_CNT; i++)
+        for (int i = 0; i < DOUBLE_CNT; i++)
             metrics[start + i] = new DoubleMetricImpl(DOUBLE_METRIC + i, null);
 
         start += DOUBLE_CNT;
 
-        for(int i=0; i<INT_CNT; i++)
+        for (int i = 0; i < INT_CNT; i++)
             metrics[start + i] = new IntMetricImpl(INT_METRIC + i, null);
 
         start += INT_CNT;
 
-        for(int i=0; i<LONG_CNT; i++)
+        for (int i = 0; i < LONG_CNT; i++)
             metrics[start + i] = new AtomicLongMetric(LONG_METRIC + i, null);
 
         start += LONG_CNT;
 
-        for(int i=0; i<LONG_ADDER_CNT; i++)
+        for (int i = 0; i < LONG_ADDER_CNT; i++)
             metrics[start + i] = new LongAdderMetric(LONG_ADDER_METRIC + i, null);
 
         start += LONG_ADDER_CNT;
 
         long sz = GraphLayout.parseInstance(metrics).totalSize();
 
-        System.out.println("Total size of " + TOTAL + " metric array is " + (sz/1024) + "KiB, " + sz + " bytes.");
+        System.out.println("Total size of " + TOTAL + " metric array is " + (sz / 1024) + "KiB, " + sz + " bytes.");
     }
 
     /**
@@ -113,23 +113,23 @@ public class GridMetricsJolBenchmark {
     private static void measureMetricRegistry() {
         MetricRegistry mreg = new MetricRegistry("test", name -> null, name -> null, null);
 
-        for(int i=0; i<BOOLEAN_CNT; i++)
+        for (int i = 0; i < BOOLEAN_CNT; i++)
             mreg.booleanMetric(BOOLEAN_METRIC + i, null);
 
-        for(int i=0; i<DOUBLE_CNT; i++)
+        for (int i = 0; i < DOUBLE_CNT; i++)
             mreg.doubleMetric(DOUBLE_METRIC + i, null);
 
-        for(int i=0; i<INT_CNT; i++)
+        for (int i = 0; i < INT_CNT; i++)
             mreg.doubleMetric(INT_METRIC + i, null);
 
-        for(int i=0; i<LONG_CNT; i++)
+        for (int i = 0; i < LONG_CNT; i++)
             mreg.longMetric(LONG_METRIC + i, null);
 
-        for(int i=0; i<LONG_ADDER_CNT; i++)
+        for (int i = 0; i < LONG_ADDER_CNT; i++)
             mreg.longMetric(LONG_ADDER_METRIC + i, null);
 
         long sz = GraphLayout.parseInstance(mreg).totalSize();
 
-        System.out.println("Total size of " + TOTAL + " metric registry is " + (sz/1024) + "KiB, " + sz + " bytes.");
+        System.out.println("Total size of " + TOTAL + " metric registry is " + (sz / 1024) + "KiB, " + sz + " bytes.");
     }
 }
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java
index 2582007..9b4c927 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java
@@ -70,7 +70,7 @@ public abstract class LoadTestDriver {
 
         if (cfg == null && attempt == NUMBER_OF_SETUP_ATTEMPTS) {
             throw new RuntimeException("All " + NUMBER_OF_SETUP_ATTEMPTS + " attempts to setup load test '" +
-                    testName+ "' have failed");
+                    testName + "' have failed");
         }
 
         // calculates host unique prefix based on its subnet IP address
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
index 1ccd44a..9a248ad 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/PersonGenerator.java
@@ -30,7 +30,7 @@ public class PersonGenerator implements Generator {
     private static final Date DATE = new Date();
 
     /** */
-    private static final List<String> PHONES = new LinkedList<String>(){{
+    private static final List<String> PHONES = new LinkedList<String>() {{
         add("1234567");
         add("7654321");
         add("1289054");
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
index 23030c4..39ff547 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
@@ -77,7 +77,7 @@ public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer>
 
         for (ComputeJobResult res : results)
             if (!res.isCancelled())
-                stoppedCnt+=(Integer)res.getData();
+                stoppedCnt += (Integer)res.getData();
 
         return stoppedCnt;
     }
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index 3956fca..1c6b1c5 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -386,7 +386,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
                 info("Expects '" + e.getKey() + "' fails with grid client exception.");
             }
-            catch (GridServerUnreachableException |GridClientClosedException ignore) {
+            catch (GridServerUnreachableException | GridClientClosedException ignore) {
                 // No op: compute projection is empty.
             }
         }
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
index 2140dac..e870129 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
@@ -71,7 +71,7 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest {
 
         assert router.getSendCount() > sndCnt :
             "Failed to ensure network activity [currCnt=" + router.getSendCount() + ", oldCnt=" + sndCnt + ']';
-        assert router.getReceivedCount() > rcvCnt:
+        assert router.getReceivedCount() > rcvCnt :
             "Failed to ensure network activity [currCnt=" + router.getReceivedCount() + ", oldCnt=" + rcvCnt + ']';
     }
 
@@ -109,7 +109,7 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest {
         cfg.setHost(HOST);
         cfg.setPort(ROUTER_PORT);
         cfg.setPortRange(0);
-        cfg.setServers(Collections.singleton(HOST+":"+BINARY_PORT));
+        cfg.setServers(Collections.singleton(HOST + ":" + BINARY_PORT));
         cfg.setLogger(new Log4JLogger(ROUTER_LOG_CFG));
 
         return cfg;
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
index 67ad9c1..a92266f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
@@ -81,7 +81,7 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest {
 
             if (exp.equals(act))
                 info("Validation succeed [exp=" + exp + ", act=" + act + ']');
-            else{
+            else {
                 info("Validation failed  [exp=" + exp + ", act=" + act + ']');
 
                 fail = true;
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java
index 25786dd..1680161 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java
@@ -440,7 +440,7 @@ public class JdbcBlobTest {
 
             fail();
         }
-        catch(SQLException e) {
+        catch (SQLException e) {
             // No-op.
         }
 
@@ -449,7 +449,7 @@ public class JdbcBlobTest {
 
             fail();
         }
-        catch(SQLException e) {
+        catch (SQLException e) {
             // No-op.
         }
 
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
index 8344a3f..f1e0e51 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
@@ -232,7 +232,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
     public void testClose() throws Exception {
         String url = CFG_URL_PREFIX + configURL();
 
-        try(final Connection conn = DriverManager.getConnection(url)) {
+        try (final Connection conn = DriverManager.getConnection(url)) {
             assertNotNull(conn);
             assertFalse(conn.isClosed());
 
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 0e0bc49..f741444 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
@@ -631,7 +631,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
 
             Set<String> actualPks = new HashSet<>(expectedPks.size());
 
-            while(rs.next()) {
+            while (rs.next()) {
                 actualPks.add(rs.getString("TABLE_SCHEM") +
                     '.' + rs.getString("TABLE_NAME") +
                     '.' + rs.getString("PK_NAME") +
@@ -650,7 +650,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
         // Perform checks few times due to query/plan caching.
         for (int i = 0; i < 3; i++) {
             // No parameters statement.
-            try(Connection conn = DriverManager.getConnection(BASE_URL)) {
+            try (Connection conn = DriverManager.getConnection(BASE_URL)) {
                 conn.setSchema("\"pers\"");
 
                 PreparedStatement noParams = conn.prepareStatement("select * from Person;");
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 5820885..97d5a6e 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
@@ -599,7 +599,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
      * @throws SQLException On error.
      */
     private BigDecimal convertStringToBigDecimalViaJdbc(String strDec, int scale) throws SQLException {
-        try(ResultSet rs = stmt.executeQuery("select '" + strDec + "'")) {
+        try (ResultSet rs = stmt.executeQuery("select '" + strDec + "'")) {
             assert rs.next();
 
             return rs.getBigDecimal(1, scale);
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 63f995d..f9ee85f 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
@@ -281,7 +281,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
             "drop table if exists test; create table test(ID int primary key, NAME varchar(20)); ");
 
         for (int i = 0; i < stmtCnt; ++i)
-            sql.append("insert into test (ID, NAME) values (" + i + ", 'name_" + i +"'); ");
+            sql.append("insert into test (ID, NAME) values (" + i + ", 'name_" + i + "'); ");
 
         assert !stmt.execute(sql.toString());
 
@@ -352,7 +352,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
 
                 int rowsCnt = 0;
 
-                while(rs.next())
+                while (rs.next())
                     rowsCnt++;
 
                 assert rowsCnt <= (i + 1) / 2;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionTimeoutSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionTimeoutSelfTest.java
index c739afa..aca246f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionTimeoutSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionTimeoutSelfTest.java
@@ -159,7 +159,7 @@ public class JdbcThinConnectionTimeoutSelfTest extends JdbcThinAbstractSelfTest
     public void testNegativeConnectionTimeout() {
         GridTestUtils.assertThrows(log,
             () -> {
-                try(final Connection conn = DriverManager.getConnection(URL+"?connectionTimeout=-1")) {
+                try (final Connection conn = DriverManager.getConnection(URL + "?connectionTimeout=-1")) {
                     return null;
                 }
             },
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
index 28101e0..c1677dd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
@@ -119,7 +119,7 @@ public class JdbcThinErrorsSelfTest extends JdbcErrorsAbstractSelfTest {
      * message.
      */
     @Test
-    public void testExplainUpdatesUnsupported() throws Exception{
+    public void testExplainUpdatesUnsupported() throws Exception {
         checkErrorState((conn) -> {
             try (Statement statement = conn.createStatement()) {
                 statement.executeUpdate("CREATE TABLE TEST_EXPLAIN (ID LONG PRIMARY KEY, VAL LONG)");
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinLocalQueriesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinLocalQueriesSelfTest.java
index e934ec6..9a0a1a3 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinLocalQueriesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinLocalQueriesSelfTest.java
@@ -93,7 +93,7 @@ public class JdbcThinLocalQueriesSelfTest extends JdbcThinAbstractSelfTest {
                 // Test paged fetch. Different client threads may be used.
                 stmt.setFetchSize(1);
 
-                try(ResultSet rs = stmt.executeQuery("SELECT * FROM TEST")) {
+                try (ResultSet rs = stmt.executeQuery("SELECT * FROM TEST")) {
                     int cnt = 0;
 
                     while (rs.next())
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 8c93c1e..7d34d03 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
@@ -534,7 +534,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
 
             Set<String> actualSystemCols = new HashSet<>();
 
-            while(rs.next()) {
+            while (rs.next()) {
                 int precision = rs.getInt("COLUMN_SIZE");
 
                 int scale = rs.getInt("DECIMAL_DIGITS");
@@ -992,7 +992,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
 
             Set<String> actualIdxs = new HashSet<>(expectedIdxs.size());
 
-            while(rs.next()) {
+            while (rs.next()) {
                 actualIdxs.add(rs.getString("TABLE_SCHEM") +
                     '.' + rs.getString("TABLE_NAME") +
                     '.' + rs.getString("INDEX_NAME"));
@@ -1044,7 +1044,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
 
             Set<String> actualPks = new HashSet<>(expectedPks.size());
 
-            while(rs.next()) {
+            while (rs.next()) {
                 actualPks.add(rs.getString("TABLE_SCHEM") +
                     '.' + rs.getString("TABLE_NAME") +
                     '.' + rs.getString("PK_NAME") +
@@ -1063,7 +1063,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
         // Perform checks few times due to query/plan caching.
         for (int i = 0; i < 3; i++) {
             // No parameters statement.
-            try(Connection conn = DriverManager.getConnection(URL)) {
+            try (Connection conn = DriverManager.getConnection(URL)) {
                 conn.setSchema("\"pers\"");
 
                 PreparedStatement noParams = conn.prepareStatement("select * from Person;");
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
index 0a186e7..9fd6ef2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
@@ -164,7 +164,7 @@ public class JdbcThinMissingLongArrayResultsTest extends JdbcThinAbstractSelfTes
 
                 int cols = rs.getMetaData().getColumnCount();
 
-                while(rs.next()) {
+                while (rs.next()) {
                     StringBuilder sb = new StringBuilder();
 
                     sb.append(rs.getObject(1).toString());
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
index 68bf053..8fc5dbb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
@@ -120,14 +120,14 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
 
         ResultSet rs = stmt.getResultSet();
 
-        while(rs.next())
+        while (rs.next())
             assertEquals(rs.getInt(2), rs.getInt(1) * 2);
 
         stmt.execute("select t._key, t._val from \"cache2\".Integer t");
 
         rs = stmt.getResultSet();
 
-        while(rs.next())
+        while (rs.next())
             assertEquals(rs.getInt(2), rs.getInt(1) * 3);
 
         stmt.execute("select t._key, t._val, v._val " +
@@ -135,7 +135,7 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
 
         rs = stmt.getResultSet();
 
-        while(rs.next()) {
+        while (rs.next()) {
             assertEquals(rs.getInt(2), rs.getInt(1) * 2);
             assertEquals(rs.getInt(3), rs.getInt(1) * 3);
         }
@@ -148,7 +148,7 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
      */
     @Test
     public void testSchemaInUrl() throws Exception {
-        try(Connection conn = DriverManager.getConnection(URL + "/\"cache1\"")) {
+        try (Connection conn = DriverManager.getConnection(URL + "/\"cache1\"")) {
             Statement stmt = conn.createStatement();
 
             stmt.execute("select t._key, t._val from Integer t");
@@ -159,7 +159,7 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
                 assertEquals(rs.getInt(2), rs.getInt(1) * 2);
         }
 
-        try(Connection conn = DriverManager.getConnection(URL + "/\"cache2\"")) {
+        try (Connection conn = DriverManager.getConnection(URL + "/\"cache2\"")) {
             Statement stmt = conn.createStatement();
 
             stmt.execute("select t._key, t._val from Integer t");
@@ -176,7 +176,7 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
      */
     @Test
     public void testSchemaInUrlAndInQuery() throws Exception {
-        try(Connection conn = DriverManager.getConnection(URL + "/\"cache2\"")) {
+        try (Connection conn = DriverManager.getConnection(URL + "/\"cache2\"")) {
             Statement stmt = conn.createStatement();
 
             stmt.execute("select t._key, t._val, v._val " +
@@ -196,7 +196,7 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
      */
     @Test
     public void testSetSchema() throws Exception {
-        try(Connection conn = DriverManager.getConnection(URL)) {
+        try (Connection conn = DriverManager.getConnection(URL)) {
             // Try to execute query without set schema
             GridTestUtils.assertThrows(log, new Callable<Object>() {
                 @Override public Object call() throws Exception {
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 33b3a6f..f7870e7 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
@@ -530,7 +530,7 @@ public class JdbcThinResultSetSelfTest extends JdbcThinAbstractSelfTest {
      * @throws SQLException On error.
      */
     private BigDecimal convertStringToBigDecimalViaJdbc(String strDec, int scale) throws SQLException {
-        try(ResultSet rs = stmt.executeQuery("select '" + strDec + "'")) {
+        try (ResultSet rs = stmt.executeQuery("select '" + strDec + "'")) {
             assert rs.next();
 
             return rs.getBigDecimal(1, scale);
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 e41bfa2..9d1ddb0 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
@@ -434,7 +434,7 @@ public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
         StringBuilder sql = new StringBuilder("drop table if exists test; create table test(ID int primary key, NAME varchar(20)); ");
 
         for (int i = 0; i < stmtCnt; ++i)
-            sql.append("insert into test (ID, NAME) values (" + i + ", 'name_" + i +"'); ");
+            sql.append("insert into test (ID, NAME) values (" + i + ", 'name_" + i + "'); ");
 
         assertFalse(stmt0.execute(sql.toString()));
 
@@ -506,7 +506,7 @@ public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
 
                 int rowsCnt = 0;
 
-                while(rs.next())
+                while (rs.next())
                     rowsCnt++;
 
                 assertTrue(rowsCnt <= (i + 1) / 2);
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 a7c26cf..f79809b 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
@@ -180,7 +180,7 @@ public class JdbcThinStatementTimeoutSelfTest extends JdbcThinAbstractSelfTest {
      */
     @Test
     public void testZeroQueryTimeout() throws Exception {
-        try(final Connection conn = DriverManager.getConnection(URL+"?queryTimeout=0")) {
+        try (final Connection conn = DriverManager.getConnection(URL + "?queryTimeout=0")) {
             conn.setSchema('"' + DEFAULT_CACHE_NAME + '"');
 
             try (final Statement stmt = conn.createStatement()) {
@@ -210,7 +210,7 @@ public class JdbcThinStatementTimeoutSelfTest extends JdbcThinAbstractSelfTest {
      */
     @Test
     public void testQueryTimeoutRetrival() throws Exception {
-        try(final Connection conn = DriverManager.getConnection(URL+"?queryTimeout=5")) {
+        try (final Connection conn = DriverManager.getConnection(URL + "?queryTimeout=5")) {
             conn.setSchema('"' + DEFAULT_CACHE_NAME + '"');
 
             try (final Statement stmt = conn.createStatement()) {
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStreamingAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStreamingAbstractSelfTest.java
index ac7113d..a93b230 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStreamingAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStreamingAbstractSelfTest.java
@@ -108,7 +108,7 @@ public abstract class JdbcThinStreamingAbstractSelfTest extends JdbcStreamingSel
 
             try (PreparedStatement stmt = conn.prepareStatement("insert into Person(\"id\", \"name\") values (?, ?), " +
                 "(?, ?)")) {
-                for (int i = 1; i <= 100; i+= 2) {
+                for (int i = 1; i <= 100; i += 2) {
                     stmt.setInt(1, i);
                     stmt.setString(2, nameForId(i));
                     stmt.setInt(3, i + 1);
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsLeaksMvccTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsLeaksMvccTest.java
index cfc5a71..8da619d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsLeaksMvccTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsLeaksMvccTest.java
@@ -65,7 +65,7 @@ public class JdbcThinTransactionsLeaksMvccTest extends JdbcThinAbstractSelfTest
                 s.execute("CREATE TABLE TEST (k int primary key, v int) WITH \"atomicity=transactional_snapshot\"");
 
                 for (int i = 0; i < KEYS; ++i)
-                    s.execute("INSERT INTO TEST VALUES (" + i +", " + i + ")");
+                    s.execute("INSERT INTO TEST VALUES (" + i + ", " + i + ")");
 
             }
         }
@@ -94,7 +94,7 @@ public class JdbcThinTransactionsLeaksMvccTest extends JdbcThinAbstractSelfTest
      *
      */
     @Test
-    @WithSystemProperty(key=IGNITE_MAX_COMPLETED_TX_COUNT, value = "1024")
+    @WithSystemProperty(key = IGNITE_MAX_COMPLETED_TX_COUNT, value = "1024")
     public void testLeaks() {
         runQueries(ITERATIONS);
 
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
index 8e15ee1..94132b2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
@@ -45,7 +45,7 @@ public class ClientCacheBenchmark {
     private static final int KEY_COUNT = 1000;
 
     /** Size of arrays used as stored values. */
-    private static final int VALUE_LENGTH = 1024*4;
+    private static final int VALUE_LENGTH = 1024 * 4;
 
     /** Cached values for store. */
     private static final byte[][] values = new byte[KEY_COUNT][];
@@ -103,7 +103,7 @@ public class ClientCacheBenchmark {
 
         long startTime = System.currentTimeMillis();
 
-        for(int i = 0; i < threadCnt; i++) {
+        for (int i = 0; i < threadCnt; i++) {
             TestThread th = new TestThread();
             workers.add(th);
             th.start();
@@ -139,9 +139,9 @@ public class ClientCacheBenchmark {
 
         double timeSpent = ((double)(System.currentTimeMillis() - startTime)) / 1000;
 
-        itersPerSec = total/timeSpent;
+        itersPerSec = total / timeSpent;
 
-        System.out.printf("%8s, %12.0f, %12.0f, %12s\n", thCnt, itersPerSec, total/timeSpent/thCnt, total);
+        System.out.printf("%8s, %12.0f, %12.0f, %12s\n", thCnt, itersPerSec, total / timeSpent / thCnt, total);
     }
 
     /**
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 759daac..2eec59b 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -568,9 +568,9 @@ public class MessageCodeGenerator {
 
         GridCodegenConverter fldPreproc = field.getAnnotation(GridCodegenConverter.class);
 
-        String getExp = (fldPreproc != null && !fldPreproc.get().isEmpty())? fldPreproc.get(): field.getName();
-        Class<?> writeType = (fldPreproc != null && !fldPreproc.type().equals(GridCodegenConverter.Default.class))?
-            fldPreproc.type(): field.getType();
+        String getExp = (fldPreproc != null && !fldPreproc.get().isEmpty()) ? fldPreproc.get() : field.getName();
+        Class<?> writeType = (fldPreproc != null && !fldPreproc.type().equals(GridCodegenConverter.Default.class)) ?
+            fldPreproc.type() : field.getType();
 
         returnFalseIfWriteFailed(writeType, field.getName(), colAnn != null ? colAnn.value() : null,
             mapAnn != null ? mapAnn.keyType() : null, mapAnn != null ? mapAnn.valueType() : null, false, getExp);
@@ -598,9 +598,9 @@ public class MessageCodeGenerator {
         indent++;
 
         GridCodegenConverter fldPreproc = field.getAnnotation(GridCodegenConverter.class);
-        String setExp = (fldPreproc != null && !fldPreproc.get().isEmpty())? fldPreproc.set(): "";
-        Class<?> writeType = (fldPreproc != null && !fldPreproc.type().equals(GridCodegenConverter.Default.class))?
-            fldPreproc.type(): field.getType();
+        String setExp = (fldPreproc != null && !fldPreproc.get().isEmpty()) ? fldPreproc.set() : "";
+        Class<?> writeType = (fldPreproc != null && !fldPreproc.type().equals(GridCodegenConverter.Default.class)) ?
+            fldPreproc.type() : field.getType();
 
         returnFalseIfReadFailed(writeType, field.getName(), colAnn != null ? colAnn.value() : null,
             mapAnn != null ? mapAnn.keyType() : null, mapAnn != null ? mapAnn.valueType() : null, setExp);
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
index d940664..2b5fd3c 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
@@ -141,7 +141,7 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract
 
         final IgniteConfiguration cfg = getConfiguration(igniteInstanceName); // stub - won't be used at node startup
 
-        IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, log, locJvmInstance == null ? null: (x) -> locJvmInstance, true) {
+        IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, log, locJvmInstance == null ? null : (x) -> locJvmInstance, true) {
             @Override protected IgniteLogger logger(IgniteLogger log, Object ctgr) {
                 return ListenedGridTestLog4jLogger.createLogger(ctgr + "#" + ver.replaceAll("\\.", "_"));
             }
diff --git a/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java b/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
index df94c09..a43a4e4 100644
--- a/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
+++ b/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
@@ -101,7 +101,7 @@ public class CompressionProcessorImpl extends CompressionProcessor {
         int compressLevel
     ) throws IgniteCheckedException {
         assert compression != null && compression != DiskPageCompression.DISABLED : compression;
-        assert U.isPow2(blockSize): blockSize;
+        assert U.isPow2(blockSize) : blockSize;
         assert page.position() == 0 && page.limit() >= pageSize;
 
         int oldPageLimit = page.limit();
@@ -187,8 +187,8 @@ public class CompressionProcessorImpl extends CompressionProcessor {
      * @return The given page.
      */
     private static ByteBuffer setCompressionInfo(ByteBuffer page, DiskPageCompression compression, int compressedSize, int compactedSize) {
-        assert compressedSize >= 0 && compressedSize <= Short.MAX_VALUE: compressedSize;
-        assert compactedSize >= 0 && compactedSize <= Short.MAX_VALUE: compactedSize;
+        assert compressedSize >= 0 && compressedSize <= Short.MAX_VALUE : compressedSize;
+        assert compactedSize >= 0 && compactedSize <= Short.MAX_VALUE : compactedSize;
 
         PageIO.setCompressionType(page, getCompressionType(compression));
         PageIO.setCompressedSize(page, (short)compressedSize);
@@ -402,7 +402,7 @@ public class CompressionProcessorImpl extends CompressionProcessor {
          * @return Compressor.
          */
         static LZ4Compressor getCompressor(int level) {
-            assert level >= 0 && level <= 17: level;
+            assert level >= 0 && level <= 17 : level;
             return level == 0 ? fastCompressor : factory.highCompressor(level);
         }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 7b6b4dd..2c7b0ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -199,10 +199,10 @@ public class CacheManager implements javax.cache.CacheManager {
             Cache<K, V> cache = getCache0(cacheName);
 
             if (cache != null) {
-                if(!keyType.isAssignableFrom(cache.getConfiguration(Configuration.class).getKeyType()))
+                if (!keyType.isAssignableFrom(cache.getConfiguration(Configuration.class).getKeyType()))
                     throw new ClassCastException();
 
-                if(!valType.isAssignableFrom(cache.getConfiguration(Configuration.class).getValueType()))
+                if (!valType.isAssignableFrom(cache.getConfiguration(Configuration.class).getValueType()))
                     throw new ClassCastException();
             }
 
@@ -303,7 +303,7 @@ public class CacheManager implements javax.cache.CacheManager {
 
     /** {@inheritDoc} */
     @Override public void enableManagement(String cacheName, boolean enabled) {
-        if(IgniteUtils.IGNITE_MBEANS_DISABLED)
+        if (IgniteUtils.IGNITE_MBEANS_DISABLED)
             return;
 
         kernalGateway.readLock();
@@ -328,7 +328,7 @@ public class CacheManager implements javax.cache.CacheManager {
 
     /** {@inheritDoc} */
     @Override public void enableStatistics(String cacheName, boolean enabled) {
-        if(IgniteUtils.IGNITE_MBEANS_DISABLED)
+        if (IgniteUtils.IGNITE_MBEANS_DISABLED)
             return;
 
         kernalGateway.readLock();
@@ -382,7 +382,7 @@ public class CacheManager implements javax.cache.CacheManager {
      * @param beanType Mxbean name.
      */
     private void unregisterCacheObject(String name, String beanType) {
-        if(IgniteUtils.IGNITE_MBEANS_DISABLED)
+        if (IgniteUtils.IGNITE_MBEANS_DISABLED)
             return;
 
         MBeanServer mBeanSrv = ignite.configuration().getMBeanServer();
@@ -428,10 +428,10 @@ public class CacheManager implements javax.cache.CacheManager {
 
     /** {@inheritDoc} */
     @Override public <T> T unwrap(Class<T> clazz) {
-        if(clazz.isAssignableFrom(getClass()))
+        if (clazz.isAssignableFrom(getClass()))
             return clazz.cast(this);
 
-        if(clazz.isAssignableFrom(ignite.getClass()))
+        if (clazz.isAssignableFrom(ignite.getClass()))
             return clazz.cast(ignite);
 
         throw new IllegalArgumentException();
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 1bddf3c..249c249 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
@@ -234,7 +234,7 @@ public class QueryEntity implements Serializable {
         }
 
         for (QueryIndex queryIndex : target.getIndexes()) {
-            if(currentIndexes.containsKey(queryIndex.getName())) {
+            if (currentIndexes.containsKey(queryIndex.getName())) {
                 checkEquals(
                     conflicts,
                     "index " + queryIndex.getName(),
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
index 227a7f0..e2d0c4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
@@ -127,7 +127,7 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, Li
         try {
             if (destFile.isDirectory())
                 Files.move(srcFile.toPath(), destFile.toPath().resolve(srcFile.getName()));
-            else if(!srcFile.renameTo(destFile))
+            else if (!srcFile.renameTo(destFile))
                 throw new IgfsException("Failed to perform rename (underlying file system returned false) " +
                     "[src=" + src + ", dest=" + dest + ']');
         }
@@ -478,7 +478,7 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, Li
                 lastBlockIdx = blockIdx;
             }
 
-            if(lastBlock == null)
+            if (lastBlock == null)
                 lastBlock = new IgfsBlockLocationImpl(offset, lenStep, lastNodes);
             else
                 lastBlock.increaseLength(lenStep);
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 f6caca5..786eb18 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
@@ -306,7 +306,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
             if (filter instanceof PlatformEventFilterListener)
                 ((PlatformEventFilterListener)filter).onClose();
         }
-        catch(RuntimeException ex) {
+        catch (RuntimeException ex) {
             err = ex;
         }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 6db4c91..3685d71 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1272,7 +1272,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
 
                     provider.start(ctx.plugins().pluginContextForProvider(provider));
 
-                    startTimer.finishGlobalStage("Start '"+ provider.name() + "' plugin");
+                    startTimer.finishGlobalStage("Start '" + provider.name() + "' plugin");
                 }
 
                 // Start platform plugins.
@@ -4469,7 +4469,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
         if (cls.equals(IGridClusterStateProcessor.class))
             return (T)new GridClusterStateProcessor(ctx);
 
-        if(cls.equals(GridSecurityProcessor.class))
+        if (cls.equals(GridSecurityProcessor.class))
             return null;
 
         if (cls.equals(IgniteRestProcessor.class))
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 46445c8..91549bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1454,7 +1454,7 @@ public class IgnitionEx {
          * @param springCtx Optional Spring application context.
          */
         GridStartContext(IgniteConfiguration cfg, @Nullable URL cfgUrl, @Nullable GridSpringResourceContext springCtx) {
-            assert(cfg != null);
+            assert (cfg != null);
 
             this.cfg = cfg;
             this.cfgUrl = cfgUrl;
@@ -2024,7 +2024,7 @@ public class IgnitionEx {
 
                 customExecSvcs = new HashMap<>();
 
-                for(ExecutorConfiguration execCfg : cfg.getExecutorConfiguration()) {
+                for (ExecutorConfiguration execCfg : cfg.getExecutorConfiguration()) {
                     ThreadPoolExecutor exec = new IgniteThreadPoolExecutor(
                         execCfg.getName(),
                         cfg.getIgniteInstanceName(),
@@ -2225,7 +2225,7 @@ public class IgnitionEx {
 
             myCfg.setGridLogger(cfgLog);
 
-            if(F.isEmpty(userProvidedWorkDir) && F.isEmpty(U.IGNITE_WORK_DIR))
+            if (F.isEmpty(userProvidedWorkDir) && F.isEmpty(U.IGNITE_WORK_DIR))
                 log.warning("Ignite work directory is not provided, automatically resolved to: " + workDir);
 
             // Check Ignite home folder (after log is available).
@@ -2405,7 +2405,7 @@ public class IgnitionEx {
 
                     if (IgfsUtils.matchIgfsCacheName(ccfg.getName()))
                         throw new IgniteCheckedException(
-                            "Cache name cannot start with \""+ IgfsUtils.IGFS_CACHE_PREFIX
+                            "Cache name cannot start with \"" + IgfsUtils.IGFS_CACHE_PREFIX
                                 + "\" because it is reserved for IGFS internal purposes.");
 
                     if (DataStructuresProcessor.isDataStructureCache(ccfg.getName()))
@@ -2799,7 +2799,7 @@ public class IgnitionEx {
          * @throws IgniteCheckedException If registration failed.
          */
         private void registerFactoryMbean(MBeanServer srv) throws IgniteCheckedException {
-            if(U.IGNITE_MBEANS_DISABLED)
+            if (U.IGNITE_MBEANS_DISABLED)
                 return;
 
             assert srv != null;
@@ -2854,7 +2854,7 @@ public class IgnitionEx {
          * Unregister delegate Mbean instance for {@link Ignition}.
          */
         private void unregisterFactoryMBean() {
-            if(U.IGNITE_MBEANS_DISABLED)
+            if (U.IGNITE_MBEANS_DISABLED)
                 return;
 
             synchronized (mbeans) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerMappingFileStore.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerMappingFileStore.java
index 66d19db..8709d77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerMappingFileStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerMappingFileStore.java
@@ -107,7 +107,7 @@ final class MarshallerMappingFileStore {
                 U.error(log, "Failed to write class name to file [platformId=" + platformId + "id=" + typeId +
                         ", clsName=" + typeName + ", file=" + file.getAbsolutePath() + ']', e);
             }
-            catch(OverlappingFileLockException ignored) {
+            catch (OverlappingFileLockException ignored) {
                 if (log.isDebugEnabled())
                     log.debug("File already locked (will ignore): " + file.getAbsolutePath());
             }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
index 556282d..26ce315 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
@@ -175,7 +175,7 @@ public abstract class BinaryPrimitives {
     public static char readChar(byte[] arr, int off) {
         long pos = GridUnsafe.BYTE_ARR_OFF + off;
 
-        return BIG_ENDIAN ? GridUnsafe.getCharLE(arr, pos): GridUnsafe.getChar(arr, pos);
+        return BIG_ENDIAN ? GridUnsafe.getCharLE(arr, pos) : GridUnsafe.getChar(arr, pos);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 84e4e97..facb30a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -369,7 +369,7 @@ public class BinaryUtils {
      * @return Field type name or {@code null} if unknown.
      */
     public static String fieldTypeName(int typeId) {
-        if(typeId < 0 || typeId >= FIELD_TYPE_NAMES.length)
+        if (typeId < 0 || typeId >= FIELD_TYPE_NAMES.length)
             return null;
 
         return FIELD_TYPE_NAMES[typeId];
@@ -713,7 +713,7 @@ public class BinaryUtils {
         if (obj == null)
             return false;
 
-        Class<?> cls= obj.getClass();
+        Class<?> cls = obj.getClass();
 
         return cls == KeyCacheObjectImpl.class ||
             cls == BinaryObjectImpl.class ||
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index 461ea28..7a91f77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -484,7 +484,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
      * @param ts Timestamp.
      */
     public void doWriteTimestamp(@Nullable Timestamp ts) {
-        if (ts== null)
+        if (ts == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
             out.unsafeEnsure(1 + 8 + 4);
@@ -498,7 +498,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
      * @param time Time.
      */
     public void doWriteTime(@Nullable Time time) {
-        if (time== null)
+        if (time == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
             out.unsafeEnsure(1 + 8);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
index 9ba0128..a75349b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
@@ -85,7 +85,7 @@ public class GridClientPartitionAffinity implements GridClientDataAffinity, Grid
     private GridClientPredicate<UUID> backupFilter;
 
     /** Optional backup filter. */
-    private final GridClientPredicate<NodeInfo> backupIdFilter =new GridClientPredicate<NodeInfo>() {
+    private final GridClientPredicate<NodeInfo> backupIdFilter = new GridClientPredicate<NodeInfo>() {
         @Override public boolean apply(NodeInfo info) {
             return backupFilter == null || backupFilter.apply(info.nodeId());
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index 773ba27..bda0705 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -290,7 +290,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
                 if (ses != null)
                     srv.close(ses);
 
-                if (sock!= null)
+                if (sock != null)
                     sock.close();
 
                 if (ch != null)
@@ -577,7 +577,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
                     if (credentials() == null) {
                         fut.onDone(new GridClientAuthenticationException("Authentication failed on server " +
                             "(client has no credentials) [clientId=" + clientId +
-                            ", srvAddr=" + serverAddress() + ", errMsg=" + resp.errorMessage() +']'));
+                            ", srvAddr=" + serverAddress() + ", errMsg=" + resp.errorMessage() + ']'));
 
                         removePending(resp.requestId());
 
@@ -617,7 +617,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
 
         if (resp.successStatus() == GridClientResponse.STATUS_AUTH_FAILURE)
             fut.onDone(new GridClientAuthenticationException("Client authentication failed [clientId=" + clientId +
-                ", srvAddr=" + serverAddress() + ", errMsg=" + resp.errorMessage() +']'));
+                ", srvAddr=" + serverAddress() + ", errMsg=" + resp.errorMessage() + ']'));
         else if (resp.successStatus() == GridClientResponse.STATUS_ILLEGAL_ARGUMENT)
             fut.onDone(new IllegalArgumentException(resp.errorMessage()));
         else if (resp.errorMessage() != null)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
index fceaf67..e16973b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
@@ -56,7 +56,7 @@ public class GridClientZipOptimizedMarshaller extends GridClientOptimizedMarshal
     public GridClientZipOptimizedMarshaller(GridClientMarshaller dfltMarsh, @Nullable List<PluginProvider> plugins) {
         super(plugins);
 
-        assert dfltMarsh!= null;
+        assert dfltMarsh != null;
 
         this.dfltMarsh = dfltMarsh;
     }
@@ -108,7 +108,7 @@ public class GridClientZipOptimizedMarshaller extends GridClientOptimizedMarshal
         ByteArrayInputStream bais = new ByteArrayInputStream(input);
         ByteArrayOutputStream baos = new ByteArrayOutputStream(DFLT_BUFFER_SIZE);
 
-        try(ZipInputStream zis = new ZipInputStream(bais)) {
+        try (ZipInputStream zis = new ZipInputStream(bais)) {
             zis.getNextEntry();
 
             byte[] buf = new byte[DFLT_BUFFER_SIZE];
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
index b9b38bb..a781546 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
@@ -497,7 +497,7 @@ final class ClientUtils {
                             ));
                     }
                 ).toArray(new QueryEntity[0]))
-                .setExpiryPolicy(!protocolCtx.isFeatureSupported(EXPIRY_POLICY)?
+                .setExpiryPolicy(!protocolCtx.isFeatureSupported(EXPIRY_POLICY) ?
                         null : reader.readBoolean() ?
                         new PlatformExpiryPolicy(reader.readLong(), reader.readLong(), reader.readLong()) : null
                 );
@@ -636,7 +636,7 @@ final class ClientUtils {
             isNotNull = notNulls != null && notNulls.contains(name);
             dfltVal = dflts == null ? null : dflts.get(name);
             precision = fldsPrecision == null ? -1 : fldsPrecision.getOrDefault(name, -1);
-            scale = fldsScale == null? -1 : fldsScale.getOrDefault(name, -1);
+            scale = fldsScale == null ? -1 : fldsScale.getOrDefault(name, -1);
         }
 
         /** Deserialization constructor. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index 41f121f..6443dd3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -694,7 +694,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
     }
 
     /** {@inheritDoc} */
-    @Override public BaselineAutoAdjustStatus baselineAutoAdjustStatus(){
+    @Override public BaselineAutoAdjustStatus baselineAutoAdjustStatus() {
         return ctx.state().baselineAutoAdjustStatus();
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/StateCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/StateCommand.java
index 1148110..bf5728f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/StateCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/StateCommand.java
@@ -41,7 +41,7 @@ public class StateCommand implements Command<Void> {
      * @throws Exception If failed to print state.
      */
     @Override public Object execute(GridClientConfiguration clientCfg, Logger log) throws Exception {
-        try (GridClient client = Command.startClient(clientCfg)){
+        try (GridClient client = Command.startClient(clientCfg)) {
             GridClientClusterState state = client.state();
 
             ClusterState clusterState = state.state();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheCommands.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheCommands.java
index 9084445..9fe71cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheCommands.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheCommands.java
@@ -123,7 +123,7 @@ public class CacheCommands implements Command<CacheSubcommands> {
             CACHE + " [subcommand] <subcommand_parameters>");
         logger.info("");
         logger.info(INDENT + "The subcommands that take " + OP_NODE_ID + " as an argument ('" + LIST + "', '"
-            + FIND_AND_DELETE_GARBAGE+ "', '" + CONTENTION + "' and '" + VALIDATE_INDEXES +
+            + FIND_AND_DELETE_GARBAGE + "', '" + CONTENTION + "' and '" + VALIDATE_INDEXES +
             "') will be executed on the given node or on all server nodes" +
             " if the option is not specified. Other commands will run on a random server node.");
         logger.info("");
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java
index d3b1b60..859a815 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java
@@ -145,7 +145,7 @@ public class CacheViewer implements Command<CacheViewer.Arguments> {
         /**
          * @return Full config flag.
          */
-        public boolean fullConfig(){ return fullConfig; }
+        public boolean fullConfig() { return fullConfig; }
     }
 
     /** Command parsed arguments */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
index 1ce1f7b..6d4c09bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
@@ -1520,10 +1520,10 @@ public class JdbcThinConnection implements Connection {
 
         long lsb = 0;
 
-        for (int i=0; i<8; i++)
+        for (int i = 0; i < 8; i++)
             msb = (msb << 8) | (randomBytes[i] & 0xff);
 
-        for (int i=8; i<16; i++)
+        for (int i = 8; i < 16; i++)
             lsb = (lsb << 8) | (randomBytes[i] & 0xff);
 
         UUID randomUUID =  new UUID(msb, lsb);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinResultSet.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinResultSet.java
index ac7fd4e..df2a045 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinResultSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinResultSet.java
@@ -1926,10 +1926,10 @@ public class JdbcThinResultSet implements ResultSet {
      * @return Column order map.
      */
     private Map<String, Integer> columnOrder() throws SQLException {
-        if(colOrder != null)
+        if (colOrder != null)
             return colOrder;
 
-        if(!metaInit)
+        if (!metaInit)
             meta();
 
         initColumnOrder();
@@ -1946,7 +1946,7 @@ public class JdbcThinResultSet implements ResultSet {
         for (int i = 0; i < meta.size(); ++i) {
             String colName = meta.get(i).columnName().toUpperCase();
 
-            if(!colOrder.containsKey(colName))
+            if (!colOrder.containsKey(colName))
                 colOrder.put(colName, i);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcBlob.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcBlob.java
index 2109f7e..17e9b13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcBlob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcBlob.java
@@ -57,7 +57,7 @@ public class JdbcBlob implements Blob {
         if (pos < 1 || arr.length - pos < 0 || len < 0)
             throw new SQLException("Invalid argument. Position can't be less than 1 or " +
                 "greater than size of underlying byte array. Requested length also can't be negative " + "" +
-                "[pos=" + pos + ", len=" + len +']');
+                "[pos=" + pos + ", len=" + len + ']');
 
         int idx = (int)(pos - 1);
 
@@ -84,7 +84,7 @@ public class JdbcBlob implements Blob {
         if (pos < 1 || len < 1 || pos > arr.length || len > arr.length - pos + 1)
             throw new SQLException("Invalid argument. Position can't be less than 1 or " +
                 "greater than size of underlying byte array. Requested length can't be negative and can't be " +
-                "greater than available bytes from given position [pos=" + pos + ", len=" + len +']');
+                "greater than available bytes from given position [pos=" + pos + ", len=" + len + ']');
 
         return new ByteArrayInputStream(arr, (int)(pos - 1), (int)len);
     }
@@ -96,7 +96,7 @@ public class JdbcBlob implements Blob {
         if (start < 1 || start > arr.length || ptrn.length == 0 || ptrn.length > arr.length)
             return -1;
 
-        for(int i = 0, pos = (int)(start - 1); pos < arr.length;) {
+        for (int i = 0, pos = (int)(start - 1); pos < arr.length;) {
             if (arr[pos] == ptrn[i]) {
                 pos++;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
index a2604a0..1f22563 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
@@ -721,7 +721,7 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
 
         boolean areTypesValid = false;
 
-        if(tblTypes == null)
+        if (tblTypes == null)
             areTypesValid = true;
         else {
             for (String type : tblTypes) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java
index 0c305b3..fb4d8e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java
@@ -164,7 +164,7 @@ public class JdbcStatement implements Statement {
         boolean loc = nodeId == null;
 
         if (!conn.isDmlSupported())
-            if(isQuery != null && !isQuery)
+            if (isQuery != null && !isQuery)
                 throw new SQLException("Failed to query Ignite: DML operations are supported in versions 1.8.0 and newer");
             else
                 isQuery = true;
@@ -479,7 +479,7 @@ public class JdbcStatement implements Statement {
         try {
             int[] res = loc ? task.call() : ignite.compute(ignite.cluster().forNodeId(nodeId)).call(task);
 
-            long updateCnt = F.isEmpty(res)? -1 : res[res.length - 1];
+            long updateCnt = F.isEmpty(res) ? -1 : res[res.length - 1];
 
             results = Collections.singletonList(new JdbcResultSet(this, updateCnt));
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 4ae64b5..9f35c06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1843,7 +1843,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
         UUID newSecSubjId = secSubjId != null ? secSubjId : nodeId;
 
-        try(OperationSecurityContext s = ctx.security().withContext(newSecSubjId)) {
+        try (OperationSecurityContext s = ctx.security().withContext(newSecSubjId)) {
             lsnr.onMessage(nodeId, msg, plc);
         }
         finally {
@@ -3286,7 +3286,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
                 U.log(log, "File has been sent to remote node [name=" + file.getName() +
                     ", uploadTime=" + (double)((U.currentTimeMillis() - startTime) / 1000) + " sec, retries=" + retries +
-                    ", transferred=" + snd.transferred() + ", rmtId=" + rmtId +']');
+                    ", transferred=" + snd.transferred() + ", rmtId=" + rmtId + ']');
 
             }
             catch (InterruptedException e) {
@@ -3587,7 +3587,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
                 if (msgBody != null) {
                     if (predLsnr != null) {
-                        try(OperationSecurityContext s = ctx.security().withContext(initNodeId)) {
+                        try (OperationSecurityContext s = ctx.security().withContext(initNodeId)) {
                             if (!predLsnr.apply(nodeId, msgBody))
                                 removeMessageListener(TOPIC_COMM_USER, this);
                         }
@@ -4217,8 +4217,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
     /**
      * @return Security subject id.
      */
-    private UUID secSubjId(GridIoMessage msg){
-        if(ctx.security().enabled()) {
+    private UUID secSubjId(GridIoMessage msg) {
+        if (ctx.security().enabled()) {
             assert msg instanceof GridIoSecurityAwareMessage;
 
             return ((GridIoSecurityAwareMessage) msg).secSubjId();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
index e99e478..bc93b32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
@@ -297,7 +297,7 @@ public class DiscoCache {
      * @return Oldest alive server node.
      */
     @SuppressWarnings("ForLoopReplaceableByForEach")
-    @Nullable public ClusterNode oldestAliveServerNode(){
+    @Nullable public ClusterNode oldestAliveServerNode() {
         // Avoid iterator allocation.
         for (int i = 0; i < srvNodes.size(); i++) {
             ClusterNode srv = srvNodes.get(i);
@@ -312,7 +312,7 @@ public class DiscoCache {
     /**
      * @return Oldest server node.
      */
-    @Nullable public ClusterNode oldestServerNode(){
+    @Nullable public ClusterNode oldestServerNode() {
         if (!srvNodes.isEmpty())
             return srvNodes.get(0);
 
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 01a7f86..cd43878 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
@@ -704,7 +704,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
 
                     discoCacheHist.put(nextTopVer, discoCache);
 
-                    assert snapshot.topVer.compareTo(nextTopVer) < 0: "Topology version out of order [this.topVer=" +
+                    assert snapshot.topVer.compareTo(nextTopVer) < 0 : "Topology version out of order [this.topVer=" +
                         topSnap + ", topVer=" + topVer + ", node=" + node + ", nextTopVer=" + nextTopVer +
                         ", evt=" + U.gridEventName(type) + ']';
 
@@ -1151,7 +1151,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
 
         Boolean locMarshStrSerVer2 = locNode.attribute(ATTR_MARSHALLER_USE_BINARY_STRING_SER_VER_2);
         boolean locMarshStrSerVer2Bool = locMarshStrSerVer2 == null ?
-            false /* turned on and added to the attributes list by default only when BinaryMarshaller is used. */:
+            false /* turned on and added to the attributes list by default only when BinaryMarshaller is used. */ :
             locMarshStrSerVer2;
 
         boolean locDelayAssign = locNode.attribute(ATTR_LATE_AFFINITY_ASSIGNMENT);
@@ -1442,7 +1442,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
      * @return Required offheap memory in bytes.
      */
     private long requiredOffheap() {
-        if(ctx.config().isClientMode())
+        if (ctx.config().isClientMode())
             return 0;
 
         DataStorageConfiguration memCfg = ctx.config().getDataStorageConfiguration();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
index 0940ac9..c02ba76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
@@ -710,7 +710,7 @@ public class GridEncryptionManager extends GridManagerAdapter<EncryptionSpi> imp
         String newMasterKeyName = IgniteSystemProperties.getString(IGNITE_MASTER_KEY_NAME_TO_CHANGE_BEFORE_STARTUP);
 
         if (newMasterKeyName != null) {
-            if (newMasterKeyName.equals(getSpi().getMasterKeyName())){
+            if (newMasterKeyName.equals(getSpi().getMasterKeyName())) {
                 log.info("Restored master key name equals to name from system property " +
                     IGNITE_MASTER_KEY_NAME_TO_CHANGE_BEFORE_STARTUP + ". This system property will be ignored and " +
                     "recommended to remove [masterKeyName=" + newMasterKeyName + ']');
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
index 2311439..cbc8c31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
@@ -337,7 +337,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
                 int typeId = readInt();
 
                 OptimizedClassDescriptor desc = typeId == 0 ?
-                    classDescriptor(clsMap, U.forName(readUTF(), clsLdr, ctx.classNameFilter()), ctx, mapper):
+                    classDescriptor(clsMap, U.forName(readUTF(), clsLdr, ctx.classNameFilter()), ctx, mapper) :
                     classDescriptor(clsMap, typeId, clsLdr, ctx, mapper);
 
                 curCls = desc.describedClass();
@@ -345,7 +345,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
                 try {
                     return desc.read(this);
                 }
-                catch (IOException e){
+                catch (IOException e) {
                     throw new IOException("Failed to deserialize object [typeName=" +
                         desc.describedClass().getName() + ']', e);
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
index 0855ebf..7c8e5af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java
@@ -241,7 +241,7 @@ public class OptimizedObjectOutputStream extends ObjectOutputStream {
                     else
                         desc.write(this, obj);
                 }
-                catch (IOException e){
+                catch (IOException e) {
                     throw new IOException("Failed to serialize object [typeName=" +
                         desc.describedClass().getName() + ']', e);
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java b/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java
index 27fe585..ca136d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java
@@ -113,7 +113,7 @@ public class IoStatisticsHolderCache implements IoStatisticsHolder {
     /**
      * @return Cache group id.
      */
-    public int cacheGroupId(){
+    public int cacheGroupId() {
         return grpId;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
index b0db8a9..91c08d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java
@@ -64,7 +64,7 @@ public class IgniteStandardMXBean extends StandardMBean {
     /**
      * Static constructor.
      */
-    static{
+    static {
         primCls.put(Boolean.TYPE.toString().toLowerCase(), Boolean.TYPE);
         primCls.put(Character.TYPE.toString().toLowerCase(), Character.TYPE);
         primCls.put(Byte.TYPE.toString().toLowerCase(), Byte.TYPE);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
index ccf2937..a84778b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
@@ -85,7 +85,7 @@ public final class PageIdUtils {
      * @return Page link.
      */
     public static long link(long pageId, int itemId) {
-        assert itemId >= 0 && itemId <= MAX_ITEMID_NUM: itemId;
+        assert itemId >= 0 && itemId <= MAX_ITEMID_NUM : itemId;
         assert (pageId >> (FLAG_SIZE + PART_ID_SIZE + PAGE_IDX_SIZE)) == 0 : U.hexLong(pageId);
 
         return pageId | (((long)itemId) << (FLAG_SIZE + PART_ID_SIZE + PAGE_IDX_SIZE));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
index 14c1bc4..4758dc5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
@@ -403,7 +403,7 @@ public abstract class WALRecord {
      * @param size Size of this record in bytes.
      */
     public void size(int size) {
-        assert size >= 0: size;
+        assert size >= 0 : size;
 
         this.size = size;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
index 3e2b67b..9fa27c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
@@ -75,7 +75,7 @@ public class MetaPageUpdatePartitionDataRecord extends PageDeltaRecord {
     /**
      * @param in Input.
      */
-    public MetaPageUpdatePartitionDataRecord(DataInput in) throws IOException{
+    public MetaPageUpdatePartitionDataRecord(DataInput in) throws IOException {
         super(in.readInt(), in.readLong());
 
         this.updateCntr = in.readLong();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index f6a4fc6..64cf18d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -1170,7 +1170,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
             int hash = backups;
             hash = 31 * hash + affFuncCls.hashCode();
             hash = 31 * hash + filterCls.hashCode();
-            hash= 31 * hash + partsCnt;
+            hash = 31 * hash + partsCnt;
 
             this.hash = hash;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java
index 5d4dd23..84d1b0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java
@@ -101,5 +101,5 @@ public class UserManagementOperation implements Serializable {
     /**
      * User action type.
      */
-    public enum OperationType {ADD, UPDATE, REMOVE}
+    public enum OperationType { ADD, UPDATE, REMOVE }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
index 5a299e5..79b42f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
@@ -48,7 +48,7 @@ public class CacheEntryImpl0<K, V> implements Cache.Entry<K, V> {
 
     /** {@inheritDoc} */
     @Override public <T> T unwrap(Class<T> cls) {
-        if(cls.isAssignableFrom(getClass()))
+        if (cls.isAssignableFrom(getClass()))
             return cls.cast(this);
         else if (cls.isAssignableFrom(CacheEntry.class) && e instanceof GridCacheVersionAware)
             return (T)new CacheEntryImplEx<>(e.getKey(), e.getValue(), ((GridCacheVersionAware)e).version());
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 1de5906..ad15c1b 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
@@ -201,7 +201,7 @@ public class CacheEvictableEntryImpl<K, V> implements EvictableEntry<K, V> {
         if (clazz.isAssignableFrom(IgniteCache.class))
             return (T)cached.context().grid().cache(cached.context().name());
 
-        if(clazz.isAssignableFrom(getClass()))
+        if (clazz.isAssignableFrom(getClass()))
             return clazz.cast(this);
 
         throw new IllegalArgumentException();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index 9adec6e..54ed210 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -1254,7 +1254,7 @@ public class CacheGroupContext {
      * @param persist If {@code true} then flag state will be persisted into metastorage.
      */
     public void localWalEnabled(boolean enabled, boolean persist) {
-        if (localWalEnabled != enabled){
+        if (localWalEnabled != enabled) {
             log.info("Local WAL state for group=" + cacheOrGroupName() +
                 " changed from " + localWalEnabled + " to " + enabled);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 1865512..23a8629 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -925,7 +925,7 @@ public class CacheMetricsImpl implements CacheMetrics {
      *
      * @param duration Duration.
      */
-    private void recalculateInvokeMinTimeNanos(long duration){
+    private void recalculateInvokeMinTimeNanos(long duration) {
         long minTime = entryProcessorMinInvocationTime.value();
 
         while (minTime > duration || minTime == 0) {
@@ -941,7 +941,7 @@ public class CacheMetricsImpl implements CacheMetrics {
      *
      * @param duration Duration.
      */
-    private void recalculateInvokeMaxTimeNanos(long duration){
+    private void recalculateInvokeMaxTimeNanos(long duration) {
         long maxTime = entryProcessorMaxInvocationTime.value();
 
         while (maxTime < duration) {
@@ -965,7 +965,7 @@ public class CacheMetricsImpl implements CacheMetrics {
     /**
      * Cache remove callback.
      */
-    public void onRemove(){
+    public void onRemove() {
         rmCnt.increment();
 
         if (delegate != null)
@@ -1306,7 +1306,7 @@ public class CacheMetricsImpl implements CacheMetrics {
     /**
      *
      */
-    public void startRebalance(long delay){
+    public void startRebalance(long delay) {
         rebalanceStartTime.value(delay + U.currentTimeMillis());
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
index 68515cd..e720693 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
@@ -117,7 +117,7 @@ public class CacheWeakQueryIteratorsHolder<V> {
     /**
      * Cancel all cache queries.
      */
-    public void clearQueries(){
+    public void clearQueries() {
         for (AutoCloseable rsrc : refs.values()) {
             try {
                 rsrc.close();
@@ -288,7 +288,7 @@ public class CacheWeakQueryIteratorsHolder<V> {
             try {
                 next = iter.nextX();
             }
-            catch (NoSuchElementException e){
+            catch (NoSuchElementException e) {
                 clearWeakReference();
 
                 throw e;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 37425d2..9f471b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -706,7 +706,7 @@ public class ClusterCachesInfo {
 
             if (restartingCaches.containsKey(cacheName) &&
                 ((req.restartId() == null && restartingCaches.get(cacheName) != NULL_OBJECT)
-                    || (req.restartId() != null &&!req.restartId().equals(restartingCaches.get(cacheName))))) {
+                    || (req.restartId() != null && !req.restartId().equals(restartingCaches.get(cacheName))))) {
 
                 if (req.failIfExists()) {
                     ctx.cache().completeCacheStartFuture(req, false,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index 7708105..7f71c82 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -246,7 +246,7 @@ public class DynamicCacheChangeRequest implements Serializable {
     /**
      * @return Cache data destroy flag. Setting to <code>true</code> will remove all cache data.
      */
-    public boolean destroy(){
+    public boolean destroy() {
         return destroy;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java
index b71abbd..c85c700 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java
@@ -126,7 +126,7 @@ public class ExchangeDiscoveryEvents {
 
             srvEvtTopVer = new AffinityTopologyVersion(evt.topologyVersion(), 0);
 
-            if (evt.type()== EVT_NODE_JOINED)
+            if (evt.type() == EVT_NODE_JOINED)
                 joinedSrvNodes.add(evt.eventNode());
             else if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED)
                 leftSrvNodes.add(evt.eventNode());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundFuture.java
index 9869d4a..c0c1f0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundFuture.java
@@ -53,7 +53,7 @@ public abstract class GridCacheCompoundFuture<T, R> extends GridCompoundFuture<T
 
     /** {@inheritDoc} */
     @Override protected boolean onDone(@Nullable R res, @Nullable Throwable err, boolean cancel) {
-        if(super.onDone(res, err, cancel)){
+        if (super.onDone(res, err, cancel)) {
             endTime = U.currentTimeMillis();
             return true;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundIdentityFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundIdentityFuture.java
index 8fd619a..a21434c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundIdentityFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheCompoundIdentityFuture.java
@@ -53,7 +53,7 @@ public abstract class GridCacheCompoundIdentityFuture<T> extends GridCompoundIde
 
     /** {@inheritDoc} */
     @Override protected boolean onDone(@Nullable T res, @Nullable Throwable err, boolean cancel) {
-        if(super.onDone(res, err, cancel)){
+        if (super.onDone(res, err, cancel)) {
             endTime = U.currentTimeMillis();
             return true;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index faf48c1..03f26be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -604,7 +604,7 @@ public class GridCacheContext<K, V> implements Externalizable {
      */
     public boolean systemTx() {
         return cacheType == CacheType.UTILITY ||
-            ((cacheType == CacheType.INTERNAL || cacheType == CacheType.DATA_STRUCTURES)&& transactional());
+            ((cacheType == CacheType.INTERNAL || cacheType == CacheType.DATA_STRUCTURES) && transactional());
     }
 
     /**
@@ -2272,7 +2272,7 @@ public class GridCacheContext<K, V> implements Externalizable {
             }
         }
 
-        if (!readFromBackup || forcePrimary){
+        if (!readFromBackup || forcePrimary) {
             ClusterNode first = affNodes.get(0);
 
             return !invalidNodes.contains(first) ? first : null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
index b9fd67b..3b45654 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
@@ -78,7 +78,7 @@ public class GridCacheDefaultAffinityKeyMapper implements AffinityKeyMapper {
     @Override public Object affinityKey(Object key) {
         GridArgumentCheck.notNull(key, "key");
 
-        if(key.getClass().isArray())
+        if (key.getClass().isArray())
             return IgniteUtils.hashCode(key);
 
         try {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index 707fea1..d48a3cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -866,7 +866,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
             if (cls != null)
                 return cls;
 
-            throw new ClassNotFoundException("Failed to load class [name=" + name+ ", ctx=" + deps + ']');
+            throw new ClassNotFoundException("Failed to load class [name=" + name + ", ctx=" + deps + ']');
         }
 
         /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
index d3e03dd..13030f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
@@ -52,7 +52,7 @@ public abstract class GridCacheFutureAdapter<R> extends GridFutureAdapter<R> imp
 
     /** {@inheritDoc} */
     @Override protected boolean onDone(@Nullable R res, @Nullable Throwable err, boolean cancel) {
-        if(super.onDone(res, err, cancel)){
+        if (super.onDone(res, err, cancel)) {
             endTime = U.currentTimeMillis();
             return true;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index c068290..6697501 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -290,7 +290,7 @@ public class GridCacheGateway<K, V> {
     /**
      *
      */
-    public void writeLock(){
+    public void writeLock() {
         rwLock.writeLock().lock();
     }
 
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 f2eab9e..78a330e 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
@@ -1437,7 +1437,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
                 if (clsHandlers == null)
                     clsHandlers = new IgniteBiInClosure[GridCacheMessage.MAX_CACHE_MSG_LOOKUP_INDEX];
 
-                if(clsHandlers[msgIdx] != null)
+                if (clsHandlers[msgIdx] != null)
                     return null;
 
                 clsHandlers[msgIdx] = c;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 87e9950..fa6acbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -498,7 +498,7 @@ public final class GridCacheMvcc {
                 if (!cur.version().equals(baseVer) && committedVers.contains(cur.version())) {
                     cur.setOwner();
 
-                    assert localOwners() == null || localOwner().nearLocal(): "Cannot not have local owner and " +
+                    assert localOwners() == null || localOwner().nearLocal() : "Cannot not have local owner and " +
                         "remote completed transactions at the same time [baseVer=" + baseVer +
                         ", committedVers=" + committedVers +
                         ", rolledbackVers=" + rolledbackVers +
@@ -872,7 +872,7 @@ public final class GridCacheMvcc {
                     if (c.owner())
                         continue;
 
-                    assert !c.ready() || (c.read() && cand.read()):
+                    assert !c.ready() || (c.read() && cand.read()) :
                         "Cannot have more then one ready near-local candidate [c=" + c + ", cand=" + cand +
                             ", mvcc=" + this + ']';
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 5ef4419..b1ebd2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -2364,9 +2364,10 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                 if (IgniteSystemProperties.getBoolean(IGNITE_IO_DUMP_ON_TIMEOUT, false)) {
                     U.warn(diagnosticLog, "Found long running cache operations, dump IO statistics.");
 
-                // Dump IO manager statistics.
-                if (IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_IO_DUMP_ON_TIMEOUT, false))
-                    cctx.gridIO().dumpStats();}
+                    // Dump IO manager statistics.
+                    if (IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_IO_DUMP_ON_TIMEOUT, false))
+                        cctx.gridIO().dumpStats();
+                }
             }
             else {
                 nextLongRunningOpsDumpTime = 0;
@@ -2589,7 +2590,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                     log.info("Merge exchange future on finish [curFut=" + curFut.initialVersion() +
                         ", mergedFut=" + fut.initialVersion() +
                         ", evt=" + IgniteUtils.gridEventName(fut.firstEvent().type()) +
-                        ", evtNode=" + fut.firstEvent().eventNode().id()+
+                        ", evtNode=" + fut.firstEvent().eventNode().id() +
                         ", evtNodeClient=" + fut.firstEvent().eventNode().isClient() + ']');
                 }
 
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 f12e2a2..dea3aca 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
@@ -3056,7 +3056,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     @Override public @Nullable IgniteNodeValidationResult validateNode(
         ClusterNode node, JoiningNodeDiscoveryData discoData
     ) {
-        if(!cachesInfo.isMergeConfigSupports(node))
+        if (!cachesInfo.isMergeConfigSupports(node))
             return null;
 
         String validationRes = cachesInfo.validateJoiningNodeData(discoData);
@@ -4377,7 +4377,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             if (cachesInfo.isRestarting(name)) {
                 IgniteCacheProxyImpl<?, ?> proxy = jCacheProxies.get(name);
 
-                assert proxy != null: name;
+                assert proxy != null : name;
 
                 proxy.internalProxy(); //should throw exception
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index e15cc0f..e30f57e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -854,7 +854,7 @@ public class GridCacheSharedContext<K, V> {
     /**
      * @return Diagnostic manager.
      */
-    public CacheDiagnosticManager diagnostic(){
+    public CacheDiagnosticManager diagnostic() {
         return diagnosticMgr;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index 72e403b..8610293 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
@@ -234,7 +234,7 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter {
                 }
             }
 
-            if(!cctx.affinityNode())
+            if (!cctx.affinityNode())
                 return false;  /* Pending tree never contains entries for that cache */
 
             if (!hasPendingEntries || nextCleanTime > U.currentTimeMillis())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 943a531..0fcce98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -604,7 +604,7 @@ public class GridCacheUtils {
             private final LongAdder res = new LongAdder();
 
             @Override public boolean collect(Long l) {
-                if(l != null)
+                if (l != null)
                     res.add(l);
 
                 return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java
index 6e353be..840bfd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java
@@ -175,7 +175,7 @@ public abstract class GridDeferredAckMessageSender<T> {
          * @return {@code True} if request was handled, {@code false} if this buffer is filled and cannot be used.
          */
         public boolean add(T ver) {
-            if(!readLock().tryLock())
+            if (!readLock().tryLock())
                 return false; // Here, writeLock is help by another thread and guard is already true.
 
             boolean snd = false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index ee593d4..3cd49a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -2021,7 +2021,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
                 // Make sure value bytes initialized.
                 key.valueBytes(coCtx);
 
-                if(val != null)
+                if (val != null)
                     val.valueBytes(coCtx);
 
                  MvccUpdateDataRow updateRow = new MvccUpdateDataRow(
@@ -2183,7 +2183,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
             try {
                 procRes = entryProc.process(invokeEntry, invokeArgs);
 
-                if(invokeEntry.modified() && invokeEntry.op() != CacheInvokeEntry.Operation.REMOVE) {
+                if (invokeEntry.modified() && invokeEntry.op() != CacheInvokeEntry.Operation.REMOVE) {
                     Object val = invokeEntry.getValue(true);
 
                     CacheObject val0 = cctx.toCacheObject(val);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
index 79bb80c..3574c82 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
@@ -205,7 +205,7 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
      *
      * @return Init latch.
      */
-    public CountDownLatch getInitLatch(){
+    public CountDownLatch getInitLatch() {
         return initLatch;
     }
 
@@ -2283,7 +2283,7 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
     /**
      * @param fut Finish restart future.
      */
-    public void registrateFutureRestart(GridFutureAdapter<?> fut){
+    public void registrateFutureRestart(GridFutureAdapter<?> fut) {
         RestartFuture currentFut = restartFut.get();
 
         if (currentFut != null)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterVolatileImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterVolatileImpl.java
index 1545ae76..f25f456 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterVolatileImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterVolatileImpl.java
@@ -77,7 +77,7 @@ public class PartitionUpdateCounterVolatileImpl implements PartitionUpdateCounte
     @Override public void update(long val) {
         long cur;
 
-        while(val > (cur = cntr.get()) && !cntr.compareAndSet(cur, val));
+        while (val > (cur = cntr.get()) && !cntr.compareAndSet(cur, val));
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
index ed3ea76..9371e85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
@@ -331,7 +331,7 @@ public class ValidationOnNodeJoinUtils {
 
         // This method can be called when memory recovery is in progress,
         // which means that the GridDiscovery manager is not started, and therefore localNode is also not initialized.
-        ClusterNode locNode = ctx.discovery().localNode() != null ? ctx.discovery().localNode():
+        ClusterNode locNode = ctx.discovery().localNode() != null ? ctx.discovery().localNode() :
             new DetachedClusterNode(ctx.pdsFolderResolver().resolveFolders().consistentId(), ctx.nodeAttributes());
 
         if (cc.isWriteBehindEnabled() && ctx.discovery().cacheAffinityNode(locNode, cc.getName())) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
index 9e8a4c7..3164a1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
@@ -1129,7 +1129,7 @@ public class WalStateManager extends GridCacheSharedManagerAdapter {
     /**
      * @return WAL disable context.
      */
-    public WALDisableContext walDisableContext(){
+    public WALDisableContext walDisableContext() {
         return walDisableContext;
     }
 
@@ -1207,7 +1207,7 @@ public class WalStateManager extends GridCacheSharedManagerAdapter {
     /**
      *
      */
-    public static class WALDisableContext implements MetastorageLifecycleListener{
+    public static class WALDisableContext implements MetastorageLifecycleListener {
         /** */
         public static final String WAL_DISABLED = "wal-disabled";
 
@@ -1327,7 +1327,7 @@ public class WalStateManager extends GridCacheSharedManagerAdapter {
             Boolean disabled = (Boolean)ms.read(WAL_DISABLED);
 
             // Node crash when WAL was disabled.
-            if (disabled != null && disabled){
+            if (disabled != null && disabled) {
                 resetWalFlag = true;
 
                 pageStoreMgr.cleanupPersistentSpace();
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 b5dabcb..89f04ff 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
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache.binary;
 
-import javax.cache.CacheException;
 import java.io.File;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -32,6 +31,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import javax.cache.CacheException;
 import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteClientDisconnectedException;
@@ -749,7 +749,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
                         " [typeId=" + typeId
                         + ", schemaId=" + schemaId
                         + ", pendingVer=" + (holder == null ? "NA" : holder.pendingVersion())
-                        + ", acceptedVer=" + (holder == null ? "NA" :holder.acceptedVersion()) + ']');
+                        + ", acceptedVer=" + (holder == null ? "NA" : holder.acceptedVersion()) + ']');
 
                 try {
                     transport.requestUpToDateMetadata(typeId).get();
@@ -770,7 +770,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
                         " [typeId=" + typeId
                         + ", schemaId=" + schemaId
                         + ", pendingVer=" + (holder == null ? "NA" : holder.pendingVersion())
-                        + ", acceptedVer=" + (holder == null ? "NA" :holder.acceptedVersion()) + ']');
+                        + ", acceptedVer=" + (holder == null ? "NA" : holder.acceptedVersion()) + ']');
             }
         }
         else {
@@ -816,7 +816,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
                         + ", missingSchemaId=" + schemaId
                         + ", pendingVer=" + (holder == null ? "NA" : holder.pendingVersion())
                         + ", acceptedVer=" + (holder == null ? "NA" : holder.acceptedVersion())
-                        + ", binMetaUpdateTimeout=" + waitSchemaTimeout +']');
+                        + ", binMetaUpdateTimeout=" + waitSchemaTimeout + ']');
 
                 long t0 = System.nanoTime();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
index f42604a..0bc05cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
@@ -182,7 +182,7 @@ public abstract class CacheDistributedGetFutureAdapter<K, V>
     /**
      * @param aclass Class.
      */
-    protected void initLogger(Class<?> aclass){
+    protected void initLogger(Class<?> aclass) {
         if (log == null)
             log = U.logger(cctx.kernalContext(), logRef, aclass);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index ead81e3..c0bdfeb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -979,7 +979,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
                     res.error(e);
                 }
 
-                if (!F.isEmpty(fut.invalidPartitions())){
+                if (!F.isEmpty(fut.invalidPartitions())) {
                     AffinityTopologyVersion topVer = ctx.shared().exchange().lastTopologyFuture().initialVersion();
 
                     res.invalidPartitions(fut.invalidPartitions(), topVer);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 01cd2a9..2432c50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -268,7 +268,7 @@ public final class GridDhtLockFuture extends GridCacheCompoundIdentityFuture<Boo
         }
 
         if (tx != null) {
-            while(true) {
+            while (true) {
                 IgniteInternalFuture fut = tx.lockFut;
 
                 if (fut != null) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index c7f30c7..3df3e60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -1451,7 +1451,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
 
                                 assert e.lockedBy(mappedVer) ||
                                     ctx.mvcc().isRemoved(e.context(), mappedVer) ||
-                                    tx != null && tx.isRollbackOnly():
+                                    tx != null && tx.isRollbackOnly() :
                                     "Entry does not own lock for tx [locNodeId=" + ctx.localNodeId() +
                                         ", entry=" + e +
                                         ", mappedVer=" + mappedVer + ", ver=" + ver +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java
index 443ff6c..8d45780 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java
@@ -280,7 +280,7 @@ public abstract class GridDhtTxAbstractEnlistFuture<T> extends GridCacheFutureAd
         else if (timeout > 0)
             timeoutObj = new LockTimeoutObject();
 
-        while(true) {
+        while (true) {
             IgniteInternalFuture<?> fut = tx.lockFut;
 
             if (fut == GridDhtTxLocalAdapter.ROLLBACK_FUT) {
@@ -337,7 +337,7 @@ public abstract class GridDhtTxAbstractEnlistFuture<T> extends GridCacheFutureAd
                 return;
             }
 
-            if(!tx.implicitSingle())
+            if (!tx.implicitSingle())
                 tx.addActiveCache(cctx, false);
             else // Nothing to do for single update.
                 assert tx.txState().cacheIds().contains(cctx.cacheId()) && tx.txState().cacheIds().size() == 1;
@@ -416,7 +416,7 @@ public abstract class GridDhtTxAbstractEnlistFuture<T> extends GridCacheFutureAd
                     EntryProcessor entryProc = null;
                     Object[] invokeArgs = null;
 
-                    if(op.isInvoke()) {
+                    if (op.isInvoke()) {
                         assert needResult();
 
                         invokeVal = (GridInvokeValue)((IgniteBiTuple)cur).getValue();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxEnlistFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxEnlistFuture.java
index 437ea1d..1b14cf3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxEnlistFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxEnlistFuture.java
@@ -121,7 +121,7 @@ public final class GridDhtTxEnlistFuture extends GridDhtTxAbstractEnlistFuture<G
 
         res.success(txRes.success());
 
-        if(txRes.invokeResult() != null) {
+        if (txRes.invokeResult() != null) {
             res.invokeResult(true);
 
             CacheInvokeResult invokeRes = txRes.invokeResult();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 9498e32..b5e8bfb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -269,7 +269,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
     /**
      * @return Partition update counters.
      */
-    public GridLongList partUpdateCounters(){
+    public GridLongList partUpdateCounters() {
         return partUpdateCnt;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryAbstractEnlistFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryAbstractEnlistFuture.java
index 3a7b32f..b9e4229 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryAbstractEnlistFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryAbstractEnlistFuture.java
@@ -74,7 +74,7 @@ public abstract class GridDhtTxQueryAbstractEnlistFuture extends GridDhtTxAbstra
 
     /** {@inheritDoc} */
     @Override protected void onEntryProcessed(KeyCacheObject key, GridCacheUpdateTxResult res) {
-        if(res.success())
+        if (res.success())
             cnt++;
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index b9e9364..4ae143a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -863,7 +863,7 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
     /**
      * @param topVer Topology version.
      */
-    private void awaitVersionAndRemap(AffinityTopologyVersion topVer){
+    private void awaitVersionAndRemap(AffinityTopologyVersion topVer) {
         IgniteInternalFuture<AffinityTopologyVersion> awaitTopologyVersionFuture =
             cctx.shared().exchange().affinityReadyFuture(topVer);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index ba7b590..b35cf6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -100,7 +100,7 @@ public class PartitionUpdateCountersMessage implements Message {
      * @param idx Item number.
      * @return Partition number.
      */
-    public long initialCounter(int idx){
+    public long initialCounter(int idx) {
         if (idx >= size)
             throw new ArrayIndexOutOfBoundsException();
 
@@ -113,7 +113,7 @@ public class PartitionUpdateCountersMessage implements Message {
      * @param idx Item number.
      * @param value Initial partition counter.
      */
-    public void initialCounter(int idx, long value){
+    public void initialCounter(int idx, long value) {
         if (idx >= size)
             throw new ArrayIndexOutOfBoundsException();
 
@@ -126,7 +126,7 @@ public class PartitionUpdateCountersMessage implements Message {
      * @param idx Item number.
      * @return Update counter delta.
      */
-    public long updatesCount(int idx){
+    public long updatesCount(int idx) {
         if (idx >= size)
             throw new ArrayIndexOutOfBoundsException();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index a416416..68ea3e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1895,7 +1895,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
                                                 }
                                             }
 
-                                            assert found: "The requested topology future cannot be found [topVer="
+                                            assert found : "The requested topology future cannot be found [topVer="
                                                 + req.topologyVersion() + ']';
                                         }
                                         else {
@@ -3467,7 +3467,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
                         }
                     }
                 }
-                catch (NodeStoppingException e){
+                catch (NodeStoppingException e) {
                     U.warn(log, "Failed to update key on backup (local node is stopping): " + key);
 
                     return;
@@ -3475,8 +3475,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
                 catch (GridDhtInvalidPartitionException ignored) {
                     // Ignore.
                 }
-                catch (IgniteCheckedException|RuntimeException e) {
-                    if(e instanceof RuntimeException && !X.hasCause(e, IgniteOutOfMemoryException.class))
+                catch (IgniteCheckedException | RuntimeException e) {
+                    if (e instanceof RuntimeException && !X.hasCause(e, IgniteOutOfMemoryException.class))
                         throw (RuntimeException)e;
 
                     IgniteCheckedException err = new IgniteCheckedException("Failed to update key on backup node: " + key, e);
@@ -3795,7 +3795,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
      * @return {@code True} if cache should be validated, {@code false} - otherwise.
      */
     private boolean needCacheValidation(ClusterNode node) {
-        assert node != null: "The near node must not be null. This is guaranteed by processNearAtomicUpdateRequest()";
+        assert node != null : "The near node must not be null. This is guaranteed by processNearAtomicUpdateRequest()";
 
         return Boolean.TRUE.equals(node.attribute(ATTR_VALIDATE_CACHE_REQUESTS));
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 21efbb1..ca14c59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -96,7 +96,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G
      *
      * @param err Error.
      */
-    public void onError(IgniteCheckedException err){
+    public void onError(IgniteCheckedException err) {
         if (errs == null)
             errs = new UpdateErrors();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 264dbe7..2965dd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -406,8 +406,8 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
         if (cache.topology().stopping()) {
             completeFuture(
                 null,
-                cctx.shared().cache().isCacheRestarting(cache.name())?
-                    new IgniteCacheRestartingException(cache.name()):
+                cctx.shared().cache().isCacheRestarting(cache.name()) ?
+                    new IgniteCacheRestartingException(cache.name()) :
                     new CacheStoppedException(cache.name()),
                 null);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 3835d6a..3f108e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -626,8 +626,8 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
         if (cache.topology().stopping()) {
             completeFuture(
                 null,
-                cctx.shared().cache().isCacheRestarting(cache.name())?
-                    new IgniteCacheRestartingException(cache.name()):
+                cctx.shared().cache().isCacheRestarting(cache.name()) ?
+                    new IgniteCacheRestartingException(cache.name()) :
                     new CacheStoppedException(cache.name()),
                 null);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index e3f4258..faf62c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -165,7 +165,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements
      *
      * @param err Error.
      */
-    public void error(IgniteCheckedException err){
+    public void error(IgniteCheckedException err) {
         if (errs == null)
             errs = new UpdateErrors();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
index 840f449..2641171 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
@@ -74,7 +74,7 @@ public class UpdateErrors implements Message {
     /**
      * @param err Error.
      */
-    public void onError(IgniteCheckedException err){
+    public void onError(IgniteCheckedException err) {
         this.err = err;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 57214da..b858a38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -296,12 +296,12 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
 
         fut.init();
 
-        if(mvccTracker != null){
+        if (mvccTracker != null) {
             final MvccQueryTracker mvccTracker0 = mvccTracker;
 
             fut.listen(new CI1<IgniteInternalFuture<Object>>() {
                 @Override public void apply(IgniteInternalFuture<Object> future) {
-                    if(future.isDone())
+                    if (future.isDone())
                         mvccTracker0.onDone();
                 }
             });
@@ -419,13 +419,13 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
             mvccSnapshot
         );
 
-        if(mvccTracker != null){
+        if (mvccTracker != null) {
             final MvccQueryTracker mvccTracker0 = mvccTracker;
 
             fut.listen(new CI1<IgniteInternalFuture<Map<K, V>>>() {
                 /** {@inheritDoc} */
                 @Override public void apply(IgniteInternalFuture<Map<K, V>> future) {
-                    if(future.isDone())
+                    if (future.isDone())
                         mvccTracker0.onDone();
                 }
             });
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index b0a0e6d..43fb30a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -841,8 +841,8 @@ public final class GridDhtColocatedLockFuture extends GridCacheCompoundIdentityF
         try {
             if (cctx.topology().stopping()) {
                 onDone(
-                    cctx.shared().cache().isCacheRestarting(cctx.name())?
-                        new IgniteCacheRestartingException(cctx.name()):
+                    cctx.shared().cache().isCacheRestarting(cctx.name()) ?
+                        new IgniteCacheRestartingException(cctx.name()) :
                         new CacheStoppedException(cctx.name()));
 
                 return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 451523d..926abdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -798,7 +798,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
 
             ExchangeType exchange;
 
-            if (exchCtx.exchangeFreeSwitch()){
+            if (exchCtx.exchangeFreeSwitch()) {
                 exchange = onExchangeFreeSwitch();
 
                 initCoordinatorCaches(newCrd);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
index 663f940..006d0c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
@@ -377,7 +377,7 @@ public class ExchangeLatchManager {
         try {
             CompletableLatchUid latchUid = new CompletableLatchUid(message.latchId(), message.topVer());
 
-            if(discovery.topologyVersionEx().compareTo(message.topVer()) < 0) {
+            if (discovery.topologyVersionEx().compareTo(message.topVer()) < 0) {
                 // It means that this node doesn't receive changed topology version message yet
                 // but received ack message from client latch.
                 // It can happen when we don't have guarantees of received message order for example in ZookeeperSpi.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
index 444b630..db84007 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
@@ -110,10 +110,10 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
      *
      * @param grp Group context.
      */
-    public void onCacheGroupStopped(CacheGroupContext grp){
+    public void onCacheGroupStopped(CacheGroupContext grp) {
         GroupEvictionContext grpEvictionCtx = evictionGroupsMap.remove(grp.groupId());
 
-        if (grpEvictionCtx != null){
+        if (grpEvictionCtx != null) {
             grpEvictionCtx.stop();
 
             grpEvictionCtx.awaitFinishAll();
@@ -408,7 +408,7 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
         /**
          * Await evict finish.
          */
-        private void awaitFinishAll(){
+        private void awaitFinishAll() {
             partsEvictFutures.forEach(this::awaitFinish);
 
             evictionGroupsMap.remove(grp.groupId());
@@ -436,7 +436,7 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
          */
         private void showProgress() {
             if (log.isInfoEnabled())
-                log.info("Group eviction in progress [grpName=" + grp.cacheOrGroupName()+
+                log.info("Group eviction in progress [grpName=" + grp.cacheOrGroupName() +
                     ", grpId=" + grp.groupId() +
                     ", remainingPartsToEvict=" + (totalTasks.get() - taskInProgress) +
                     ", partsEvictInProgress=" + taskInProgress +
@@ -562,7 +562,7 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
          * @return Partition evict task.
          */
         PartitionEvictionTask pollAny() {
-            for (int bucket = 0; bucket < bucketSizes.length; bucket++){
+            for (int bucket = 0; bucket < bucketSizes.length; bucket++) {
                 if (!buckets[bucket].isEmpty())
                     return poll(bucket);
             }
@@ -590,14 +590,14 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
         /**
          * @return {@code True} if queue is empty, {@code} False if not empty.
          */
-        boolean isEmpty(){
+        boolean isEmpty() {
             return size() == 0;
         }
 
         /**
          * @return Queue size.
          */
-        int size(){
+        int size() {
             int size = 0;
 
             for (Queue<PartitionEvictionTask> queue : buckets)
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 5a4ee46..d156cf7 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
@@ -844,7 +844,7 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo
 
         if (topVer != null) {
             for (GridDhtTopologyFuture fut : cctx.shared().exchange().exchangeFutures()) {
-                if (fut.exchangeDone() && fut.topologyVersion().equals(topVer)){
+                if (fut.exchangeDone() && fut.topologyVersion().equals(topVer)) {
                     Throwable err = null;
 
                     // Before cache validation, make sure that this topology future is already completed.
@@ -855,7 +855,7 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo
                         err = fut.error();
                     }
 
-                    err = (err == null)? fut.validateCache(cctx, recovery, read, null, keys): err;
+                    err = (err == null) ? fut.validateCache(cctx, recovery, read, null, keys) : err;
 
                     if (err != null) {
                         onDone(err);
@@ -895,8 +895,8 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo
         try {
             if (cctx.topology().stopping()) {
                 onDone(
-                    cctx.shared().cache().isCacheRestarting(cctx.name())?
-                        new IgniteCacheRestartingException(cctx.name()):
+                    cctx.shared().cache().isCacheRestarting(cctx.name()) ?
+                        new IgniteCacheRestartingException(cctx.name()) :
                         new CacheStoppedException(cctx.name()));
 
                 return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 86709b7..c14e914 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -439,7 +439,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
                 writer.incrementState();
 
             case 30:
-                if(!writer.writeString("txLbl", txLbl))
+                if (!writer.writeString("txLbl", txLbl))
                     return false;
 
                 writer.incrementState();
@@ -534,7 +534,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
             case 30:
                 txLbl = reader.readString("txLbl");
 
-                if(!reader.isLastRead())
+                if (!reader.isLastRead())
                     return false;
 
                 reader.incrementState();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java
index 379c13b..88980f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java
@@ -309,8 +309,8 @@ public abstract class GridNearTxAbstractEnlistFuture<T> extends GridCacheCompoun
         try {
             if (cctx.topology().stopping()) {
                 onDone(
-                    cctx.shared().cache().isCacheRestarting(cctx.name())?
-                        new IgniteCacheRestartingException(cctx.name()):
+                    cctx.shared().cache().isCacheRestarting(cctx.name()) ?
+                        new IgniteCacheRestartingException(cctx.name()) :
                         new CacheStoppedException(cctx.name()));
 
                 return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java
index 2f87ccf..704944c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java
@@ -389,7 +389,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage implements GridC
                     rows.add(keys[i]);
                 else {
                     if (values[i] != null) {
-                        if(op.isInvoke())
+                        if (op.isInvoke())
                             ((GridInvokeValue)values[i]).finishUnmarshal(ctx, ldr);
                         else
                             ((CacheObject)values[i]).finishUnmarshal(objCtx, ldr);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index e404b65..5739028 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -1712,7 +1712,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
         final boolean retval,
         @Nullable final CacheEntryPredicate filter,
         boolean singleRmv) {
-        if(cacheCtx.mvccEnabled())
+        if (cacheCtx.mvccEnabled())
             return mvccRemoveAllAsync0(cacheCtx, keys, retval, filter);
 
         try {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java
index 8e10a7e..66a112b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java
@@ -268,7 +268,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage {
                     val = ((IgniteBiTuple)row).getValue();
                 }
 
-                assert key != null && (keysOnly || val != null): "key=" + key + ", val=" + val;
+                assert key != null && (keysOnly || val != null) : "key=" + key + ", val=" + val;
 
                 KeyCacheObject key0 = cctx.toCacheKeyObject(key);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
index 4271e41..747c1f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
@@ -602,7 +602,7 @@ public class MvccUtils {
         try {
             long pageAddr = pageMem.readLock(grpId, pageId, page);
 
-            try{
+            try {
                 DataPageIO dataIo = DataPageIO.VERSIONS.forPage(pageAddr);
 
                 return invoke(cctx, dataIo, pageAddr, itemId, pageSize, clo, snapshot);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
index 85d8fa5..f561a6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
@@ -631,7 +631,7 @@ public class TxLog implements DbCheckpointListener {
             assert treeOp == null;
 
             throw new IllegalStateException("Unexpected new transaction state. [currState=" +
-                currState +  ", newState=" + newState +  ", cntr=" + minor +']');
+                currState +  ", newState=" + newState +  ", cntr=" + minor + ']');
         }
 
         /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
index 06e7214..0aa2b06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
@@ -704,7 +704,7 @@ public class CacheDataRowAdapter implements CacheDataRow {
                 else {
                     ver = CacheVersionIO.read(buf, false);
 
-                    assert !buf.hasRemaining(): buf.remaining();
+                    assert !buf.hasRemaining() : buf.remaining();
                     assert ver != null;
                 }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java
index a6e510d..87503be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java
@@ -384,7 +384,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
     /**
      * Updates page read.
      */
-    public void onPageRead(){
+    public void onPageRead() {
         if (metricsEnabled)
             readPages.increment();
     }
@@ -392,7 +392,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
     /**
      * Updates page written.
      */
-    public void onPageWritten(){
+    public void onPageWritten() {
         if (metricsEnabled)
             writtenPages.increment();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
index def1b90..06a3c51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
@@ -519,7 +519,7 @@ public class DataStorageMetricsImpl implements DataStorageMetricsMXBean {
     }
 
     /** {@inheritDoc} */
-    @Override public long getCheckpointBufferSize(){
+    @Override public long getCheckpointBufferSize() {
         if (!metricsEnabled)
             return 0;
 
@@ -546,7 +546,7 @@ public class DataStorageMetricsImpl implements DataStorageMetricsMXBean {
     /**
      * @param walSizeProvider Wal size provider.
      */
-    public void setWalSizeProvider(IgniteOutClosure<Long> walSizeProvider){
+    public void setWalSizeProvider(IgniteOutClosure<Long> walSizeProvider) {
         this.walSizeProvider = walSizeProvider;
     }
 
@@ -560,7 +560,7 @@ public class DataStorageMetricsImpl implements DataStorageMetricsMXBean {
     /**
      *
      */
-    public void regionMetrics(Collection<DataRegionMetrics> regionMetrics){
+    public void regionMetrics(Collection<DataRegionMetrics> regionMetrics) {
         this.regionMetrics = regionMetrics;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsSnapshot.java
index d99848c..e1aa746 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsSnapshot.java
@@ -269,7 +269,7 @@ public class DataStorageMetricsSnapshot implements DataStorageMetrics {
     }
 
     /** {@inheritDoc} */
-    @Override public long getCheckpointBufferSize(){
+    @Override public long getCheckpointBufferSize() {
         return checkpointBufferSize;
     }
 
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 597ee82..068fd5a 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
@@ -1096,7 +1096,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
 
             WALPointer restored = binaryState.lastReadRecordPointer();
 
-            if(restored.equals(CheckpointStatus.NULL_PTR))
+            if (restored.equals(CheckpointStatus.NULL_PTR))
                 restored = null; // This record is first
             else
                 restored = restored.next();
@@ -2360,8 +2360,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
 
                                         applyError.compareAndSet(
                                             null,
-                                            (t instanceof IgniteCheckedException)?
-                                                (IgniteCheckedException)t:
+                                            (t instanceof IgniteCheckedException) ?
+                                                (IgniteCheckedException)t :
                                                 new IgniteCheckedException("Failed to apply page snapshot", t));
                                     }
                                 }, groupId, partId, exec, semaphore
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 1e293e6..cbdc00d 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
@@ -1669,7 +1669,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
          * @return Name of pending entires tree.
          */
         private String pendingEntriesTreeName() {
-            return grp.cacheOrGroupName() + "-" +"PendingEntries-" + partId;
+            return grp.cacheOrGroupName() + "-" + "PendingEntries-" + partId;
         }
 
         /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
index 113a53e..2ab24d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
@@ -558,14 +558,14 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
         if (memCfg.getWalHistorySize() == DFLT_WAL_HISTORY_SIZE || memCfg.getWalHistorySize() == Integer.MAX_VALUE)
             LT.warn(log, "DataRegionConfiguration.maxWalArchiveSize instead DataRegionConfiguration.walHistorySize " +
             "would be used for removing old archive wal files");
-        else if(memCfg.getMaxWalArchiveSize() == DFLT_WAL_ARCHIVE_MAX_SIZE)
+        else if (memCfg.getMaxWalArchiveSize() == DFLT_WAL_ARCHIVE_MAX_SIZE)
             LT.warn(log, "walHistorySize was deprecated. maxWalArchiveSize should be used instead");
         else
             throw new IgniteCheckedException("Should be used only one of wal history size or max wal archive size." +
                 "(use DataRegionConfiguration.maxWalArchiveSize because DataRegionConfiguration.walHistorySize was deprecated)"
             );
 
-        if(memCfg.getMaxWalArchiveSize() < memCfg.getWalSegmentSize())
+        if (memCfg.getMaxWalArchiveSize() < memCfg.getWalSegmentSize())
             throw new IgniteCheckedException(
                 "DataRegionConfiguration.maxWalArchiveSize should be greater than DataRegionConfiguration.walSegmentSize"
             );
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 54017b4..4028c43 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
@@ -85,7 +85,7 @@ public class RecoveryDebug implements AutoCloseable {
                     return;
 
             File f = new File(tmpDir, "recovery-" +
-                sdf.get().format(new Date(time)) + "-" + constId  +".log");
+                sdf.get().format(new Date(time)) + "-" + constId  + ".log");
 
             f.createNewFile();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointEntry.java
index e7bcb05..f54c678 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointEntry.java
@@ -206,7 +206,7 @@ public class CheckpointEntry {
         /**
          *
          */
-        public long size(){
+        public long size() {
             return idx;
         }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTracker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTracker.java
index 827f3c9..441196f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTracker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTracker.java
@@ -177,7 +177,7 @@ public abstract class PageLockTracker<T extends PageLockDump> implements PageLoc
 
     /** {@inheritDoc} */
     @Override public void onReadLock(int structureId, long pageId, long page, long pageAddr) {
-        if (checkFailedLock(pageAddr) ||isInvalid())
+        if (checkFailedLock(pageAddr) || isInvalid())
             return;
 
         lock();
@@ -223,7 +223,7 @@ public abstract class PageLockTracker<T extends PageLockDump> implements PageLoc
     }
 
     /** */
-    private boolean checkFailedLock(long pageAddr){
+    private boolean checkFailedLock(long pageAddr) {
         if (pageAddr == 0) {
             this.nextOp = 0;
             this.nextOpStructureId = 0;
@@ -241,7 +241,7 @@ public abstract class PageLockTracker<T extends PageLockDump> implements PageLoc
     }
 
     /** */
-    protected void free(){
+    protected void free() {
         pages.free();
     }
 
@@ -297,7 +297,7 @@ public abstract class PageLockTracker<T extends PageLockDump> implements PageLoc
     /**
      * @return Number of locks operations.
      */
-    public long operationsCounter(){
+    public long operationsCounter() {
         // Read  volatile for thread safety.
         boolean locked = this.locked;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManager.java
index 0297bfe..1357eea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManager.java
@@ -246,7 +246,7 @@ public class PageLockTrackerManager implements LifecycleAware {
         private final AtomicLong offHeapUsed = new AtomicLong();
 
         /** */
-        MemoryCalculator(){
+        MemoryCalculator() {
             onHeapAllocated(16 + (8 + 16) * 2);
         }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/store/OffHeapPageMetaInfoStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/store/OffHeapPageMetaInfoStore.java
index 4882daf..4438c12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/store/OffHeapPageMetaInfoStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/store/OffHeapPageMetaInfoStore.java
@@ -170,7 +170,7 @@ public class OffHeapPageMetaInfoStore implements PageMetaInfoStore {
     private long offset(long itemIdx) {
         long offset = ptr + itemIdx * 8 * ITEM_SIZE;
 
-        assert offset >= ptr && offset <= ((ptr + size) - 8 * ITEM_SIZE) :"offset=" + (offset - ptr) + ", size=" + size;
+        assert offset >= ptr && offset <= ((ptr + size) - 8 * ITEM_SIZE) : "offset=" + (offset - ptr) + ", size=" + size;
 
         return offset;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIO.java
index f21b8ee..c672a75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIO.java
@@ -298,7 +298,7 @@ public class EncryptedFileIO implements FileIO {
         storedCrc |= ((int)encrypted.get() & 0xff) << 8;
         storedCrc |= encrypted.get() & 0xff;
 
-        if(crc != storedCrc) {
+        if (crc != storedCrc) {
             throw new IOException("Content of encrypted page is broken. [StoredCrc=" + storedCrc +
                 ", calculatedCrd=" + crc + "]");
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileIOFactory.java
index 360847b..29f7e6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileIOFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileIOFactory.java
@@ -37,7 +37,7 @@ public interface FileIOFactory extends Serializable {
      * @return File I/O interface.
      * @throws IOException If I/O interface creation was failed.
      */
-    default FileIO create(File file) throws IOException{
+    default FileIO create(File file) throws IOException {
         return create(file, CREATE, READ, WRITE);
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index 2f95335..88c45d2f 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
@@ -113,7 +113,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
     public static final String INDEX_FILE_NAME = "index" + FILE_SUFFIX;
 
     /** */
-    public static final String PART_FILE_TEMPLATE = PART_FILE_PREFIX+ "%d" + FILE_SUFFIX;
+    public static final String PART_FILE_TEMPLATE = PART_FILE_PREFIX + "%d" + FILE_SUFFIX;
 
     /** */
     public static final String CACHE_DIR_PREFIX = "cache-";
@@ -248,7 +248,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
         try {
             File cacheWorkDir = cacheWorkDir(cacheConfiguration);
 
-            if(!cacheWorkDir.exists())
+            if (!cacheWorkDir.exists())
                 return;
 
             try (DirectoryStream<Path> files = newDirectoryStream(cacheWorkDir.toPath(),
@@ -519,7 +519,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
         try {
             store.read(pageId, pageBuf, keepCrc);
 
-            assert keepCrc || PageIO.getCrc(pageBuf) == 0: store.size() - store.pageOffset(pageId);
+            assert keepCrc || PageIO.getCrc(pageBuf) == 0 : store.size() - store.pageOffset(pageId);
 
             cctx.kernalContext().compress().decompressPage(pageBuf, store.getPageSize());
         }
@@ -585,7 +585,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
             GridCacheContext cctx0 = cctx.cacheContext(cacheId);
 
             if (cctx0 != null) {
-                assert pageBuf.position() == 0 && pageBuf.limit() == pageSize: pageBuf;
+                assert pageBuf.position() == 0 && pageBuf.limit() == pageSize : pageBuf;
 
                 ByteBuffer compressedPageBuf = cctx0.compress().compressPage(pageBuf, store);
 
@@ -1064,7 +1064,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
             };
 
             try (DirectoryStream<Path> dirStream = newDirectoryStream(cacheGrpDir.toPath(), cacheCfgFileFilter)) {
-                for(Path path: dirStream)
+                for (Path path: dirStream)
                     Files.deleteIfExists(path);
             }
             catch (IOException e) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreV2.java
index 54adf7d..8109dbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreV2.java
@@ -75,7 +75,7 @@ public class FilePageStoreV2 extends FilePageStore {
 
     /** {@inheritDoc} */
     @Override public void punchHole(long pageId, int usefulBytes) {
-        assert usefulBytes >= 0 && usefulBytes < pageSize: usefulBytes;
+        assert usefulBytes >= 0 && usefulBytes < pageSize : usefulBytes;
 
         long off = pageOffset(pageId);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index 70e19d7..b27cdd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -1457,7 +1457,7 @@ public abstract class PagesList extends DataStructure {
         boolean needWalDeltaRecord = needWalDeltaRecord(reusedPageId, reusedPage, null);
 
         if (needWalDeltaRecord) {
-            assert PageIdUtils.partId(reusedPageId) == PageIdUtils.partId(newPageId):
+            assert PageIdUtils.partId(reusedPageId) == PageIdUtils.partId(newPageId) :
                 "Partition consistency failure: " +
                 "newPageId=" + Long.toHexString(newPageId) + " (newPartId: " + PageIdUtils.partId(newPageId) + ") " +
                 "reusedPageId=" + Long.toHexString(reusedPageId) + " (partId: " + PageIdUtils.partId(reusedPageId) + ")";
@@ -1621,7 +1621,7 @@ public abstract class PagesList extends DataStructure {
         if (prevId != 0L) { // Cut tail if we have a previous page.
             Boolean ok = write(prevId, cutTail, null, bucket, FALSE, statHolder);
 
-            assert ok == TRUE: ok;
+            assert ok == TRUE : ok;
         }
         else {
             // If we don't have a previous, then we are tail page of free list, just drop the stripe.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageRowStoreEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageRowStoreEntry.java
index 0a5f7bd..6de449e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageRowStoreEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageRowStoreEntry.java
@@ -27,7 +27,7 @@ public class MetastorageRowStoreEntry extends SimpleDataRow {
     /** */
     public MetastorageRowStoreEntry(byte[] val) {
         super(0L, MetaStorage.PRESERVE_LEGACY_METASTORAGE_PARTITION_ID ?
-            PageIdAllocator.OLD_METASTORE_PARTITION: PageIdAllocator.METASTORE_PARTITION, val);
+            PageIdAllocator.OLD_METASTORE_PARTITION : PageIdAllocator.METASTORE_PARTITION, val);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
index 7fabfe0..bab2688 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
@@ -478,7 +478,7 @@ public class FullPageIdTable implements LoadedPagesMap {
      * @return {@code True} if checks succeeded.
      */
     private boolean assertKey(int grpId, long pageId) {
-        assert grpId != EMPTY_CACHE_GRP_ID && PageIdUtils.isEffectivePageId(pageId):
+        assert grpId != EMPTY_CACHE_GRP_ID && PageIdUtils.isEffectivePageId(pageId) :
             "grpId=" + grpId + ", pageId=" + U.hexLong(pageId);
 
         return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
index cd3ccd3..8437653 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
@@ -802,7 +802,7 @@ public class PageMemoryImpl implements PageMemoryEx {
                 if (readPageFromStore) {
                     boolean locked = rwLock.writeLock(absPtr + PAGE_LOCK_OFFSET, OffheapReadWriteLock.TAG_LOCK_ALWAYS);
 
-                    assert locked: "Page ID " + fullId + " expected to be locked";
+                    assert locked : "Page ID " + fullId + " expected to be locked";
 
                     lockedPageAbsPtr = absPtr;
                 }
@@ -833,7 +833,7 @@ public class PageMemoryImpl implements PageMemoryEx {
 
             seg.acquirePage(absPtr);
 
-            if(!readPageFromStore)
+            if (!readPageFromStore)
                 statHolder.trackLogicalRead(absPtr + PAGE_OVERHEAD);
 
             return absPtr;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteCacheSnapshotManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteCacheSnapshotManager.java
index 705879e..21849b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteCacheSnapshotManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteCacheSnapshotManager.java
@@ -93,7 +93,7 @@ public class IgniteCacheSnapshotManager<T extends SnapshotOperation> extends Gri
     /**
      *
      */
-    public boolean snapshotOperationInProgress(){
+    public boolean snapshotOperationInProgress() {
         return false;
     }
 
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 e134bcb..6b2bbb7 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
@@ -490,14 +490,14 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
 
             final int cnt = io.getCount(leafAddr);
 
-            assert cnt <= Short.MAX_VALUE: cnt;
+            assert cnt <= Short.MAX_VALUE : cnt;
 
             int idx = findInsertionPoint(lvl, io, leafAddr, 0, cnt, r.row, 0);
 
             if (idx < 0)
                 return RETRY; // We've found exact match on search but now it's gone.
 
-            assert idx >= 0 && idx < cnt: idx;
+            assert idx >= 0 && idx < cnt : idx;
 
             // Need to do inner replace when we remove the rightmost element and the leaf have no forward page,
             // i.e. it is not the rightmost leaf of the tree.
@@ -523,8 +523,8 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
                 }
 
                 // Retry must reset these fields when we release the whole branch without remove.
-                assert r.needReplaceInner == FALSE: "needReplaceInner";
-                assert r.needMergeEmptyBranch == FALSE: "needMergeEmptyBranch";
+                assert r.needReplaceInner == FALSE : "needReplaceInner";
+                assert r.needMergeEmptyBranch == FALSE : "needMergeEmptyBranch";
 
                 if (cnt == 1) // It was the last element on the leaf.
                     r.needMergeEmptyBranch = TRUE;
@@ -899,7 +899,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             Bool res = write(metaPageId, initRoot, BPlusMetaIO.VERSIONS.latest(), rootId, inlineSize, FALSE,
                 statisticsHolder());
 
-            assert res == TRUE: res;
+            assert res == TRUE : res;
 
             assert treeMeta != null;
         }
@@ -1830,7 +1830,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
      * @return Always positive index.
      */
     private static int fix(int idx) {
-        assert checkIndex(idx): idx;
+        assert checkIndex(idx) : idx;
 
         if (idx < 0)
             idx = -idx - 1;
@@ -1914,7 +1914,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
                                 continue;
                             }
 
-                            assert x.isFinished(): res;
+                            assert x.isFinished() : res;
                         }
 
                         return;
@@ -2071,7 +2071,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
                                 continue;
                             }
 
-                            assert res == FOUND: res;
+                            assert res == FOUND : res;
                         }
 
                         assert r.isFinished();
@@ -3461,7 +3461,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
                 }
             }
 
-            if(pageId == rootId)
+            if (pageId == rootId)
                 retry = false; // We are at the root page, there are no other leafs.
 
             if (retry) {
@@ -3482,7 +3482,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             if (lvl != 0)
                 return false;
 
-            if(io.getCount(pageAddr) == 0) {
+            if (io.getCount(pageAddr) == 0) {
                 // it's an empty tree
                 retry = false;
 
@@ -4132,7 +4132,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             if (res == NOT_FOUND)
                 res = RETRY;
 
-            assert res == FOUND || res == RETRY: res;
+            assert res == FOUND || res == RETRY : res;
 
             return res;
         }
@@ -4292,7 +4292,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          * @return Tail to release if an empty branch was not merged.
          */
         private Tail<L> mergeEmptyBranch() throws IgniteCheckedException {
-            assert needMergeEmptyBranch == TRUE: needMergeEmptyBranch;
+            assert needMergeEmptyBranch == TRUE : needMergeEmptyBranch;
 
             Tail<L> t = tail;
 
@@ -4307,7 +4307,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             int cnt = t.getCount();
             int idx = fix(insertionPoint(t));
 
-            assert cnt > 0: cnt;
+            assert cnt > 0 : cnt;
 
             if (idx == cnt)
                 idx--;
@@ -4358,7 +4358,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          * @throws IgniteCheckedException If failed.
          */
         private boolean isInnerKeyInTail() throws IgniteCheckedException {
-            assert tail.lvl > 0: tail.lvl;
+            assert tail.lvl > 0 : tail.lvl;
 
             return insertionPoint(tail) >= 0;
         }
@@ -4378,7 +4378,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             // Try to simply release all first.
             if (t.lvl <= 1) {
                 // We've just locked leaf and did not do the remove, can safely release all and retry.
-                assert !isRemoved(): "removed";
+                assert !isRemoved() : "removed";
 
                 // These fields will be setup again on remove from leaf.
                 needReplaceInner = FALSE;
@@ -4421,7 +4421,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          */
         private Result finishTail() throws IgniteCheckedException {
             assert !isFinished();
-            assert tail.type == Tail.EXACT && tail.lvl >= 0: tail;
+            assert tail.type == Tail.EXACT && tail.lvl >= 0 : tail;
 
             if (tail.lvl == 0) {
                 // At the bottom level we can't have a tail without a sibling, it means we have higher levels.
@@ -4613,8 +4613,8 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          * @throws IgniteCheckedException If failed.
          */
         private Result lockForward(int lvl) throws IgniteCheckedException {
-            assert fwdId != 0: fwdId;
-            assert backId == 0: backId;
+            assert fwdId != 0 : fwdId;
+            assert backId == 0 : backId;
 
             long fwdId = this.fwdId;
             long fwdPage = acquirePage(fwdId);
@@ -4642,9 +4642,9 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
         private void removeDataRowFromLeaf(long pageId, long page, long pageAddr, Boolean walPlc, BPlusIO<L> io, int cnt,
             int idx)
             throws IgniteCheckedException {
-            assert idx >= 0 && idx < cnt: idx;
-            assert io.isLeaf(): "inner";
-            assert !isRemoved(): "already removed";
+            assert idx >= 0 && idx < cnt : idx;
+            assert io.isLeaf() : "inner";
+            assert !isRemoved() : "already removed";
 
             // Detach the row.
             rmvd = needOld ? getRow(io, pageAddr, idx) : (T)Boolean.TRUE;
@@ -4684,12 +4684,12 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          * @throws IgniteCheckedException If failed.
          */
         private int insertionPoint(Tail<L> tail) throws IgniteCheckedException {
-            assert tail.type == Tail.EXACT: tail.type;
+            assert tail.type == Tail.EXACT : tail.type;
 
             if (tail.idx == Short.MIN_VALUE) {
                 int idx = findInsertionPoint(tail.lvl, tail.io, tail.buf, 0, tail.getCount(), row, 0);
 
-                assert checkIndex(idx): idx;
+                assert checkIndex(idx) : idx;
 
                 tail.idx = (short)idx;
             }
@@ -4777,7 +4777,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
          * @return {@code true} If children are correct.
          */
         private boolean checkChildren(Tail<L> prnt, Tail<L> left, Tail<L> right, int idx) {
-            assert idx >= 0 && idx < prnt.getCount(): idx;
+            assert idx >= 0 && idx < prnt.getCount() : idx;
 
             return inner(prnt.io).getLeft(prnt.buf, idx) == left.pageId &&
                 inner(prnt.io).getRight(prnt.buf, idx) == right.pageId;
@@ -5543,7 +5543,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
             throws IgniteCheckedException {
             assert io.isLeaf() : io;
             assert cnt != 0 : cnt; // We can not see empty pages (empty tree handled in init).
-            assert startIdx >= 0 || startIdx == -1: startIdx;
+            assert startIdx >= 0 || startIdx == -1 : startIdx;
             assert cnt >= startIdx;
 
             checkDestroyed();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
index e6214b9..4708f423 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
@@ -737,7 +737,7 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO impl
             if (itemId + 1 < directCnt) // It is not the last direct item.
                 dropLast = moveLastItem(pageAddr, itemId, directCnt, indirectCnt);
 
-            if (indirectId == 0) {// For the last direct item with no indirect item.
+            if (indirectId == 0) { // For the last direct item with no indirect item.
                 if (dropLast)
                     moveItems(pageAddr, directCnt, indirectCnt, -1, pageSize);
                 else
@@ -1161,7 +1161,7 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO impl
             if (cnt != 0) {
                 int off = page.limit() - cnt;
 
-                assert off > PageIO.COMMON_HEADER_END: off;
+                assert off > PageIO.COMMON_HEADER_END : off;
                 assert cnt > 0 : cnt;
 
                 moveBytes(pageAddr, off, cnt, freeSpace, pageSize);
@@ -1288,7 +1288,7 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO impl
      * @param pageSize Page size.
      */
     private void moveBytes(long addr, int off, int cnt, int step, int pageSize) {
-        assert cnt >= 0: cnt;
+        assert cnt >= 0 : cnt;
         assert step != 0 : step;
         assert off + step >= 0;
         assert off + step + cnt <= pageSize : "[off=" + off + ", step=" + step + ", cnt=" + cnt +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusIO.java
index 4c656eb..55a5d45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusIO.java
@@ -60,7 +60,7 @@ public abstract class BPlusIO<L> extends PageIO implements CompactablePageIO {
         super(type, ver);
 
         assert itemSize > 0 : itemSize;
-        assert canGetRow || !leaf: "leaf page always must be able to get full row";
+        assert canGetRow || !leaf : "leaf page always must be able to get full row";
 
         this.leaf = leaf;
         this.canGetRow = canGetRow;
@@ -126,7 +126,7 @@ public abstract class BPlusIO<L> extends PageIO implements CompactablePageIO {
     public final int getCount(long pageAddr) {
         int cnt = PageUtils.getShort(pageAddr, CNT_OFF) & 0xFFFF;
 
-        assert cnt >= 0: cnt;
+        assert cnt >= 0 : cnt;
 
         return cnt;
     }
@@ -136,7 +136,7 @@ public abstract class BPlusIO<L> extends PageIO implements CompactablePageIO {
      * @param cnt Count.
      */
     public final void setCount(long pageAddr, int cnt) {
-        assert cnt >= 0: cnt;
+        assert cnt >= 0 : cnt;
 
         PageUtils.putShort(pageAddr, CNT_OFF, (short)cnt);
 
@@ -366,7 +366,7 @@ public abstract class BPlusIO<L> extends PageIO implements CompactablePageIO {
 
         // Move down split key in inner pages.
         if (!isLeaf() && !emptyBranch) {
-            assert prntIdx >= 0 && prntIdx < prntCnt: prntIdx; // It must be adjusted already.
+            assert prntIdx >= 0 && prntIdx < prntCnt : prntIdx; // It must be adjusted already.
 
             // We can be sure that we have enough free space to store split key here,
             // because we've done remove already and did not release child locks.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusLeafIO.java
index aadf67e..e48d948 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/BPlusLeafIO.java
@@ -49,7 +49,7 @@ public abstract class BPlusLeafIO<L> extends BPlusIO<L> {
 
     /** {@inheritDoc} */
     @Override public final int offset(int idx) {
-        assert idx >= 0: idx;
+        assert idx >= 0 : idx;
 
         return ITEMS_OFF + idx * getItemSize();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
index 5db5421..7d71bcb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
@@ -447,7 +447,7 @@ public class DataPageIO extends AbstractDataPageIO<CacheDataRow> {
     private void writeVersionFragment(ByteBuffer buf, GridCacheVersion ver, int rowOff, int len, int prevLen) {
         int verSize = CacheVersionIO.size(ver, false);
 
-        assert len <= verSize: len;
+        assert len <= verSize : len;
 
         if (verSize == len) { // Here we check for equality but not <= because version is the last.
             // Here we can write version directly.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIO.java
index dee301d..1df7194 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIO.java
@@ -403,7 +403,7 @@ public class TrackingPageIO extends PageIO {
 
         int idxToStartTest = (PageIdUtils.pageIndex(start) - COUNT_OF_EXTRA_PAGE) % cntOfPage;
 
-        int zeroIdx = useLeftHalf(curSnapshotTag)? BITMAP_OFFSET : BITMAP_OFFSET + SIZE_FIELD_SIZE + (cntOfPage >> 3);
+        int zeroIdx = useLeftHalf(curSnapshotTag) ? BITMAP_OFFSET : BITMAP_OFFSET + SIZE_FIELD_SIZE + (cntOfPage >> 3);
 
         int startIdx = zeroIdx + (idxToStartTest >> 3);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/ReuseListImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/ReuseListImpl.java
index a59b308..89fd2f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/ReuseListImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/ReuseListImpl.java
@@ -81,7 +81,7 @@ public class ReuseListImpl extends PagesList implements ReuseList {
 
     /** {@inheritDoc} */
     @Override protected boolean isReuseBucket(int bucket) {
-        assert bucket == 0: bucket;
+        assert bucket == 0 : bucket;
 
         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 f534662..448d31a 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
@@ -2118,7 +2118,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
 
 
         /** {@inheritDoc} */
-        @Override public void body() throws InterruptedException, IgniteInterruptedCheckedException{
+        @Override public void body() throws InterruptedException, IgniteInterruptedCheckedException {
             init();
 
             super.body0();
@@ -2164,7 +2164,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
          * Pessimistically tries to reserve segment for compression in order to avoid concurrent truncation.
          * Waits if there's no segment to archive right now.
          */
-        private long tryReserveNextSegmentOrWait() throws IgniteInterruptedCheckedException{
+        private long tryReserveNextSegmentOrWait() throws IgniteInterruptedCheckedException {
             long segmentToCompress = segmentAware.waitNextSegmentToCompress();
 
             boolean reserved = reserve(new FileWALPointer(segmentToCompress, 0, 0));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
index 0f9c6b1..4a741c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
@@ -286,7 +286,7 @@ public class SegmentedRingByteBuffer {
             if (currTail < 0)
                 return;
 
-            if(TAIL_UPD.compareAndSet(this, currTail, currTail | CLOSE_MASK))
+            if (TAIL_UPD.compareAndSet(this, currTail, currTail | CLOSE_MASK))
                 return;
         }
     }
@@ -347,7 +347,7 @@ public class SegmentedRingByteBuffer {
         waitForConsumer = false;
 
         // There are no data for reading or all data up to given position were read.
-        if (tail <= head || (pos >=0 && head > pos))
+        if (tail <= head || (pos >= 0 && head > pos))
             return null;
 
         int headIdx = (int)toIndex(head);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/AbstractFileHandle.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/AbstractFileHandle.java
index 127d737..0f7b717 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/AbstractFileHandle.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/AbstractFileHandle.java
@@ -41,7 +41,7 @@ public abstract class AbstractFileHandle {
     /**
      * @return Absolute WAL segment file index (incremental counter).
      */
-    public long getSegmentId(){
+    public long getSegmentId() {
         return segmentIdx;
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
index 6b7a88c..255030b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
@@ -456,7 +456,7 @@ public class IgniteWalIteratorFactory {
          * @param log Logger.
          * @return IteratorParametersBuilder Self reference.
          */
-        public IteratorParametersBuilder log(IgniteLogger log){
+        public IteratorParametersBuilder log(IgniteLogger log) {
             this.log = log;
 
             return this;
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 9df76d2..c7582c8 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
@@ -591,7 +591,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
     @Override public GridCloseableIterator scanQueryDistributed(final GridCacheQueryAdapter qry,
         Collection<ClusterNode> nodes) throws IgniteCheckedException {
         assert !cctx.isLocal() : cctx.name();
-        assert qry.type() == GridCacheQueryType.SCAN: qry;
+        assert qry.type() == GridCacheQueryType.SCAN : qry;
         assert qry.mvccSnapshot() != null || !cctx.mvccEnabled();
 
         GridCloseableIterator locIter0 = null;
@@ -650,7 +650,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
              * @return Cache entry
              */
             private Object convert(Object obj) {
-                if(qry.transform() != null)
+                if (qry.transform() != null)
                     return obj;
 
                 Map.Entry e = (Map.Entry)obj;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index 414fdc7..8fe394f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -788,7 +788,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
         boolean storeSessionEnded) throws IgniteCheckedException {
         assert store != null;
 
-        sessionInit0(tx, commit? StoreOperation.COMMIT: StoreOperation.ROLLBACK, false);
+        sessionInit0(tx, commit ? StoreOperation.COMMIT : StoreOperation.ROLLBACK, false);
 
         try {
             if (sesLsnrs != null && sesHolder.get().contains(store)) {
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 02beb1d..4743dac 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
@@ -965,7 +965,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
             IgniteLogger log) {
             super(igniteInstanceName, name, log);
 
-            flusherCacheCriticalSize = cacheCriticalSize/flushThreadCnt;
+            flusherCacheCriticalSize = cacheCriticalSize / flushThreadCnt;
 
             assert flusherCacheCriticalSize > batchSize;
 
@@ -1218,7 +1218,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
             IgniteBiTuple<K, StatefulValue<K, V>> tuple;
             boolean applied;
 
-            while(!queue.isEmpty()) {
+            while (!queue.isEmpty()) {
                 pending = U.newLinkedHashMap(batchSize);
                 prevOperation = null;
                 boolean needNewBatch = false;
@@ -1342,7 +1342,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
     Map<K, StatefulValue<K,V>>[] flusherMaps() {
         Map<K, StatefulValue<K,V>>[] result = new Map[flushThreadCnt];
 
-        for (int i=0; i < flushThreadCnt; i++)
+        for (int i = 0; i < flushThreadCnt; i++)
             result[i] = flushThreads[i].flusherWriteMap;
 
         return result;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 0130dcc..bc1da61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1270,7 +1270,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
     }
 
     /** */
-    private void recordStateChangedEvent(TransactionState state){
+    private void recordStateChangedEvent(TransactionState state) {
         if (!near() || !local()) // Covers only GridNearTxLocal's state changes.
             return;
 
@@ -1304,7 +1304,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
     /**
      * @param type Event type.
      */
-    protected void recordStateChangedEvent(int type){
+    protected void recordStateChangedEvent(int type) {
         assert near() && local();
 
         GridEventStorageManager evtMgr = cctx.gridEvents();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 29c9d84..7dd8416 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -1019,7 +1019,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
      * @param ver Entry version.
      */
     public void entryReadVersion(GridCacheVersion ver) {
-        assert this.serReadVer == null: "Wrong version [serReadVer=" + serReadVer + ", ver=" + ver + "]";
+        assert this.serReadVer == null : "Wrong version [serReadVer=" + serReadVer + ", ver=" + ver + "]";
         assert ver != null;
 
         this.serReadVer = ver;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
index 4206191..42471b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
@@ -163,8 +163,8 @@ public class IgniteTxImplicitSingleStateImpl extends IgniteTxLocalStateAdapter {
 
         if (cacheCtx.topology().stopping()) {
             fut.onDone(
-                cctx.cache().isCacheRestarting(cacheCtx.name())?
-                    new IgniteCacheRestartingException(cacheCtx.name()):
+                cctx.cache().isCacheRestarting(cacheCtx.name()) ?
+                    new IgniteCacheRestartingException(cacheCtx.name()) :
                     new CacheStoppedException(cacheCtx.name()));
 
             return null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 2e2e9ca..6b51d00 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -3182,7 +3182,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
                 try {
                     processFailedMessage(nodeId, cacheMsg, err);
                 }
-                catch(Throwable e){
+                catch (Throwable e) {
                     U.error(log, "Failed to process message [senderId=" + nodeId +
                         ", messageType=" + cacheMsg.getClass() + ']', e);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
index 6594451..896b3a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
@@ -114,7 +114,7 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow> i
     {
         RowLinkIO rowIo = ((RowLinkIO)srcIo);
 
-        long link =rowIo.getLink(srcPageAddr, srcIdx);
+        long link = rowIo.getLink(srcPageAddr, srcIdx);
         int hash = rowIo.getHash(srcPageAddr, srcIdx);
 
         int off = offset(dstIdx);
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 a617621..e9d652c 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
@@ -289,7 +289,7 @@ public class CacheDataTree extends BPlusTree<CacheSearchRow, CacheDataRow> {
                             pageMem.readUnlock(grpId, pageId, page);
                         }
                     }
-                    finally{
+                    finally {
                         pageMem.releasePage(grpId, pageId, page);
                     }
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccDataRow.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccDataRow.java
index cd6866e..1de33dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccDataRow.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccDataRow.java
@@ -126,7 +126,7 @@ public class MvccDataRow extends DataRow {
             this.mvccOpCntr = mvccOpCntr;
         }
 
-        assert (mvccOpCntr & ~MVCC_OP_COUNTER_MASK) == 0: mvccOpCntr;
+        assert (mvccOpCntr & ~MVCC_OP_COUNTER_MASK) == 0 : mvccOpCntr;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccUpdateDataRow.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccUpdateDataRow.java
index b527ec4..d9ef5a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccUpdateDataRow.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccUpdateDataRow.java
@@ -209,7 +209,7 @@ public class MvccUpdateDataRow extends MvccDataRow implements MvccUpdateResult,
         if (needOldVal)
             flags |= NEED_OLD_VALUE;
 
-        if(needPrevValue)
+        if (needPrevValue)
             flags |= NEED_PREV_VALUE;
 
         setFlags(flags);
@@ -284,7 +284,7 @@ public class MvccUpdateDataRow extends MvccDataRow implements MvccUpdateResult,
                 }
 
                 // TODO: IGNITE-9689: optimize filter usage here. See {@link org.apache.ignite.internal.processors.cache.CacheOperationFilter}.
-                if(filter != null && !applyFilter(res == ResultType.PREV_NOT_NULL ? oldRow.value() : null))
+                if (filter != null && !applyFilter(res == ResultType.PREV_NOT_NULL ? oldRow.value() : null))
                     res = FILTERED;
 
                 setFlags(LAST_COMMITTED_FOUND);
@@ -344,7 +344,7 @@ public class MvccUpdateDataRow extends MvccDataRow implements MvccUpdateResult,
 
                         // Actually, full row can be omitted for replace(k,newval) and putIfAbsent, but
                         // operation context is not available here and full row required if filter is set.
-                        if((isFlagsSet(NEED_PREV_VALUE) || isFlagsSet(NEED_OLD_VALUE) || filter != null)) {
+                        if ((isFlagsSet(NEED_PREV_VALUE) || isFlagsSet(NEED_OLD_VALUE) || filter != null)) {
                             oldRow = tree.getRow(io, pageAddr, idx, RowData.NO_KEY);
 
                             oldRow.key(key);
@@ -393,7 +393,7 @@ public class MvccUpdateDataRow extends MvccDataRow implements MvccUpdateResult,
                     }
 
                     // TODO: IGNITE-9689: optimize filter usage here. See {@link org.apache.ignite.internal.processors.cache.CacheOperationFilter}.
-                    if(filter != null && !applyFilter(res == ResultType.PREV_NOT_NULL ? oldRow.value() : null))
+                    if (filter != null && !applyFilter(res == ResultType.PREV_NOT_NULL ? oldRow.value() : null))
                         res = FILTERED;
 
                     // Lock entry for primary partition if needed.
@@ -606,7 +606,7 @@ public class MvccUpdateDataRow extends MvccDataRow implements MvccUpdateResult,
     /**
      * @return Invoke result.
      */
-    @Override public CacheInvokeResult invokeResult(){
+    @Override public CacheInvokeResult invokeResult() {
         return invokeRes;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java
index e97378e..8e3089f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java
@@ -96,7 +96,7 @@ public class ContentionClosure implements IgniteCallable<ContentionInfo> {
 
                     GridCacheEntryEx cached = entry.cached();
 
-                    while(true) {
+                    while (true) {
                         try {
                             locs = cached.localCandidates();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java
index a6d8a3f..cec22f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java
@@ -34,7 +34,7 @@ public class IdleVerifyException extends IgniteException {
 
     /** */
     public IdleVerifyException(Collection<IgniteException> exceptions) {
-        if(F.isEmpty(exceptions))
+        if (F.isEmpty(exceptions))
             throw new IllegalArgumentException("Exceptions can't be empty!");
 
         this.exceptions = exceptions;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopology.java
index 47f7cf3..a04eb1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopology.java
@@ -184,7 +184,7 @@ public class BaselineTopology implements Serializable {
 
         Set<Object> consistentIds = new TreeSet<>(CONSISTENT_ID_COMPARATOR);
 
-        for (Object o : nodeMap.keySet()){
+        for (Object o : nodeMap.keySet()) {
             branchingPntHash += (long)o.hashCode();
 
             consistentIds.add(o);
@@ -243,14 +243,14 @@ public class BaselineTopology implements Serializable {
     /**
      * @return Short consistent Id.
      */
-    public Short resolveShortConsistentId(Object constId){
+    public Short resolveShortConsistentId(Object constId) {
         return consistentIdMapping.get(constId);
     }
 
     /**
      * @return Object consistent Id.
      */
-    public Object resolveConsistentId(Short constId){
+    public Object resolveConsistentId(Short constId) {
         return compactIdMapping.get(constId);
     }
 
@@ -399,7 +399,7 @@ public class BaselineTopology implements Serializable {
     /**
      * @return {@code true} If it is new baseline topology.
      */
-    public boolean isNewTopology(){
+    public boolean isNewTopology() {
         return lastBranchingPointType == BranchingPointType.NEW_BASELINE_TOPOLOGY && id == 0;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopologyHistory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopologyHistory.java
index fdc6cbf..16bd67f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopologyHistory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineTopologyHistory.java
@@ -118,7 +118,7 @@ public class BaselineTopologyHistory implements Serializable {
 
     /** */
     void flushHistoryItems(ReadWriteMetastorage metastorage) throws IgniteCheckedException {
-        while(!bufferedForStore.isEmpty()) {
+        while (!bufferedForStore.isEmpty()) {
             BaselineTopologyHistoryItem item = bufferedForStore.remove();
 
             metastorage.write(METASTORE_BLT_HIST_PREFIX + item.id(), item);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
index 91e1fb0..cd30a54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
@@ -265,7 +265,7 @@ public class DiscoveryDataClusterState implements Serializable {
         if (prevBLT == null && curBLT != null)
             return true;
 
-        if (prevBLT!= null && curBLT != null)
+        if (prevBLT != null && curBLT != null)
             return !prevBLT.equals(curBLT);
 
         return false;
@@ -325,7 +325,7 @@ public class DiscoveryDataClusterState implements Serializable {
      * @return Cluster state that finished transition.
      */
     public DiscoveryDataClusterState finish(boolean success) {
-        if(success)
+        if (success)
             return createState(state, baselineTopology);
         else
             return prevState != null ? prevState : createState(INACTIVE, null);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index 73f3e84..1ee2754 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -1734,7 +1734,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter implements I
     /**
      * @return Status of baseline auto-adjust.
      */
-    public BaselineAutoAdjustStatus baselineAutoAdjustStatus(){
+    public BaselineAutoAdjustStatus baselineAutoAdjustStatus() {
         return changeTopologyWatcher.getStatus();
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
index 70ec274..0ace54d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
@@ -106,7 +106,7 @@ class GridUpdateNotifier {
         workerThread = new Thread(new Runnable() {
             @Override public void run() {
                 try {
-                    while(!Thread.currentThread().isInterrupted()) {
+                    while (!Thread.currentThread().isInterrupted()) {
                         Runnable cmd0 = cmd.getAndSet(null);
 
                         if (cmd0 != null)
@@ -212,8 +212,8 @@ class GridUpdateNotifier {
      * @param msg Message to log.
      */
     private void throttle(IgniteLogger log, boolean warn, String msg) {
-        assert(log != null);
-        assert(msg != null);
+        assert (log != null);
+        assert (msg != null);
 
         long now = U.currentTimeMillis();
 
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 318c684..a6d7182 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
@@ -230,7 +230,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
                 failCntr.increment();
 
                 synchronized (DataStreamerImpl.this) {
-                    if(cancellationReason == null)
+                    if (cancellationReason == null)
                         cancellationReason = err;
 
                     cancelled = true;
@@ -1672,7 +1672,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
                             // Another thread might already renew the batch
                             AffinityTopologyVersion bTopVer = b0.batchTopVer;
 
-                            if(bTopVer != null && topVer.compareTo(bTopVer) > 0) {
+                            if (bTopVer != null && topVer.compareTo(bTopVer) > 0) {
                                 GridFutureAdapter<Object> bFut = b0.curFut;
 
                                 b0.renewBatch(remap);
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 50674b1..820f3bd 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
@@ -150,7 +150,7 @@ public abstract class AtomicDataStructureProxy<V extends AtomicDataStructureValu
      * @return Ignite runtime exception that corresponds the original {@code cause}.
      */
     protected IgniteException checkRemovedAfterFail(Exception cause) {
-        assert cause != null: "The original cause must not be null.";
+        assert cause != null : "The original cause must not be null.";
 
         needCheckNotRemoved();
 
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 5378d77..cc2b75b 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
@@ -657,7 +657,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
                     boolean isInterrupted = Thread.interrupted();
 
                     try {
-                        while(true) {
+                        while (true) {
                             try {
                                 try (GridNearTxLocal tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
                                     AtomicDataStructureValue val = cache.get(key);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
index 8b59cb1..327d9b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAnnotationHelper.java
@@ -124,7 +124,7 @@ public class GridCacheAnnotationHelper<A extends Annotation> {
                 }
                 catch (IllegalAccessException e) {
                     throw new IgniteCheckedException("Failed to get annotated field value [cls=" + cls.getName() +
-                        ", ann=" + annCls.getSimpleName()+']', e);
+                        ", ann=" + annCls.getSimpleName() + ']', e);
                 }
 
                 if (needsRecursion(f)) {
@@ -163,7 +163,7 @@ public class GridCacheAnnotationHelper<A extends Annotation> {
                 }
                 catch (Exception e) {
                     throw new IgniteCheckedException("Failed to get annotated method value [cls=" + cls.getName() +
-                        ", ann=" + annCls.getSimpleName()+']', e);
+                        ", ann=" + annCls.getSimpleName() + ']', e);
                 }
 
                 annFound = true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
index e76eae3..9fc7034 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -93,7 +93,7 @@ public final class GridCacheAtomicLongImpl extends AtomicDataStructureProxy<Grid
     @Override public long incrementAndGet() {
         checkRemoved();
 
-        try{
+        try {
             EntryProcessorResult<Long> res = cacheView.invoke(key, IncrementAndGetProcessor.INSTANCE);
 
             assert res != null && res.get() != null : res;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index be2efa3..6985110 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -355,7 +355,7 @@ public final class GridCacheAtomicSequenceImpl extends AtomicDataStructureProxy<
                     return curLocVal;
                 }
                 catch (Error | Exception e) {
-                    if(!X.hasCause(e, ClusterTopologyCheckedException.class))
+                    if (!X.hasCause(e, ClusterTopologyCheckedException.class))
                         U.error(log, "Failed to get and add: " + this, e);
 
                     throw e;
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 0a59e1f..d3f3cfc 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
@@ -705,7 +705,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
                                 if (val.isFair() && newVal == 0) {
                                     UUID rmvdNode = val.getNodes().removeFirst();
 
-                                    assert(thisNode.equals(rmvdNode));
+                                    assert (thisNode.equals(rmvdNode));
                                 }
 
                                 // Get global condition queue.
@@ -1110,7 +1110,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
                 sync.release(0);
             }
 
-        } finally{
+        } finally {
             updateLock.unlock();
         }
     }
@@ -1157,7 +1157,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     @Override public void lock() {
         ctx.kernalContext().gateway().readLock();
 
-        try{
+        try {
             initializeReentrantLock();
 
             sync.lock();
@@ -1201,7 +1201,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     @Override public boolean tryLock() {
         ctx.kernalContext().gateway().readLock();
 
-        try{
+        try {
             initializeReentrantLock();
 
             boolean result = sync.tryAcquire(1, false);
@@ -1222,7 +1222,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     @Override public boolean tryLock(long timeout, TimeUnit unit) throws IgniteInterruptedException {
         ctx.kernalContext().gateway().readLock();
 
-        try{
+        try {
             initializeReentrantLock();
 
             boolean result = sync.tryAcquireNanos(1, unit.toNanos(timeout));
@@ -1249,7 +1249,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     @Override public void unlock() {
         ctx.kernalContext().gateway().readLock();
 
-        try{
+        try {
             initializeReentrantLock();
 
             // Validate before release.
@@ -1273,7 +1273,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     @Override public IgniteCondition getOrCreateCondition(String name) {
         ctx.kernalContext().gateway().readLock();
 
-        try{
+        try {
             initializeReentrantLock();
 
             IgniteCondition result = sync.newCondition(name);
@@ -1292,7 +1292,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public int getHoldCount() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.getHoldCount();
@@ -1304,7 +1304,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public boolean isHeldByCurrentThread() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.isHeldExclusively();
@@ -1316,7 +1316,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public boolean isLocked() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.isLocked();
@@ -1328,7 +1328,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public boolean hasQueuedThreads() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.hasQueuedThreads();
@@ -1340,7 +1340,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public boolean hasQueuedThread(Thread thread) {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.isQueued(thread);
@@ -1352,7 +1352,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public boolean hasWaiters(IgniteCondition condition) {
-        try{
+        try {
             initializeReentrantLock();
 
             AbstractQueuedSynchronizer.ConditionObject c = sync.conditionMap.get(condition.name());
@@ -1369,7 +1369,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public int getWaitQueueLength(IgniteCondition condition) {
-        try{
+        try {
             initializeReentrantLock();
 
             AbstractQueuedSynchronizer.ConditionObject c = sync.conditionMap.get(condition.name());
@@ -1385,7 +1385,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     }
 
     @Override public boolean isFailoverSafe() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.failoverSafe;
@@ -1396,7 +1396,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
     }
 
     @Override public boolean isFair() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.fair;
@@ -1408,7 +1408,7 @@ public final class GridCacheLockImpl extends AtomicDataStructureProxy<GridCacheL
 
     /** {@inheritDoc} */
     @Override public boolean isBroken() {
-        try{
+        try {
             initializeReentrantLock();
 
             return sync.isBroken();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java
index 2b86fd1..2a62757 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java
@@ -171,7 +171,7 @@ public final class GridCacheLockState extends VolatileAtomicDataStructureValue i
     /**
      * @return Condition count.
      */
-    public int condtionCount(){
+    public int condtionCount() {
         return conditionMap.size();
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
index b7e20c4..f381440 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
@@ -215,7 +215,7 @@ public final class GridCacheSemaphoreImpl extends AtomicDataStructureProxy<GridC
         /** {@inheritDoc} */
         @Override protected final boolean tryReleaseShared(int releases) {
             // Fail-fast path.
-            if(broken)
+            if (broken)
                 return true;
 
             // Check if some other node updated the state.
@@ -361,7 +361,7 @@ public final class GridCacheSemaphoreImpl extends AtomicDataStructureProxy<GridC
                                     name);
 
                             // Quit early if semaphore is already broken.
-                            if( val.isBroken()) {
+                            if (val.isBroken()) {
                                 tx.rollback();
 
                                 return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index 19bb26d..12d0ff0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -171,7 +171,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite
 
             Integer val;
 
-            while((val = qryFut.next()) != null)
+            while ((val = qryFut.next()) != null)
                 sum += val;
 
             return sum;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
index 0c75bc3..ca96a1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
@@ -691,7 +691,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
                 catch (InterruptedException ignored) {
                     Thread.currentThread().interrupt();
 
-                    U.warn(log, "Failed to process fragmentizer communication message (thread was interrupted) "+
+                    U.warn(log, "Failed to process fragmentizer communication message (thread was interrupted) " +
                         "[nodeId=" + nodeId + ", msg=" + msg + ']');
                 }
             }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 90feb5d..56a44a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -497,7 +497,7 @@ public class IgfsMetaManager extends IgfsManager {
      * @return {@code True} in case such entry exists.
      * @throws IgniteCheckedException IF failed.
      */
-    public boolean exists(IgniteUuid fileId) throws IgniteCheckedException{
+    public boolean exists(IgniteUuid fileId) throws IgniteCheckedException {
         if (busyLock.enterBusy()) {
             try {
                 assert fileId != null;
@@ -664,7 +664,7 @@ public class IgfsMetaManager extends IgfsManager {
         final boolean updateSpace, final long space, @Nullable final IgfsFileAffinityRange affRange)
         throws IgniteCheckedException {
 
-        if(client) {
+        if (client) {
             runClientTask(new IgfsClientMetaUnlockCallable(cfg.getName(), IgfsUserContext.currentUser(), fileId,
                 lockId, modificationTime, updateSpace, space, affRange));
 
@@ -3187,7 +3187,7 @@ public class IgfsMetaManager extends IgfsManager {
         Map<String, String> dirProps, Map<String, String> fileProps, int blockSize, @Nullable IgniteUuid affKey,
         boolean evictExclude, @Nullable IgfsSecondaryFileSystemCreateContext secondaryCtx,
         @Nullable T1<OutputStream> secondaryOutHolder)
-        throws IgniteCheckedException{
+        throws IgniteCheckedException {
         // Check if entry we are going to write to is directory.
         if (lockInfos.get(pathIds.lastExistingId()).isFile())
             throw new IgfsParentNotDirectoryException("Failed to open file for write " +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
index 397b709..90edc38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
@@ -150,7 +150,7 @@ public class LocalFileSystemUtils {
 
         int perm = 0;
 
-        for(PosixFilePermission p : attrs.permissions())
+        for (PosixFilePermission p : attrs.permissions())
             perm |= (1 << 8 - p.ordinal());
 
         props.put(IgfsUtils.PROP_PERMISSION, '0' + Integer.toOctalString(perm));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java
index 81b6f61..dad0b44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java
@@ -263,7 +263,7 @@ public class GridMarshallerMappingProcessor extends GridProcessorAdapter {
                     if (origNodeId.equals(ctx.localNodeId())) {
                         GridFutureAdapter<MappingExchangeResult> fut = mappingExchangeSyncMap.get(msg.mappingItem());
 
-                        assert fut != null: msg;
+                        assert fut != null : msg;
 
                         fut.onDone(MappingExchangeResult.createFailureResult(
                                 duplicateMappingException(msg.mappingItem(), msg.conflictingClassName())));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/MetricRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/MetricRegistry.java
index e4223c2..4604b40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/MetricRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/MetricRegistry.java
@@ -319,7 +319,7 @@ public class MetricRegistry implements ReadOnlyMetricRegistry {
     private <T extends Metric> T addMetric(String name, T metric) {
         T old = (T)metrics.putIfAbsent(name, metric);
 
-        if(old != null)
+        if (old != null)
             return old;
 
         return metric;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index 8a64e1f..5be565b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -195,7 +195,7 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<byte
             if (authCtx != null)
                 AuthorizationContext.context(authCtx);
 
-            try(OperationSecurityContext s = ctx.security().withContext(connCtx.securityContext())) {
+            try (OperationSecurityContext s = ctx.security().withContext(connCtx.securityContext())) {
                 resp = handler.handle(req);
             }
             finally {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioServerBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioServerBuffer.java
index cb8303e..ba9d6bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioServerBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioServerBuffer.java
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.internal.processors.odbc;
 
+import java.nio.ByteBuffer;
 import org.apache.ignite.IgniteCheckedException;
 import org.jetbrains.annotations.Nullable;
 
-import java.nio.ByteBuffer;
-
 /**
  * Client NIO server buffer.
  */
@@ -70,7 +69,7 @@ public class ClientListenerNioServerBuffer {
     @Nullable public byte[] read(ByteBuffer buf) throws IgniteCheckedException {
         if (cnt < 0) {
             for (; cnt < 0 && buf.hasRemaining(); cnt++)
-                msgSize |= (buf.get() & 0xFF) << (8*(4 + cnt));
+                msgSize |= (buf.get() & 0xFF) << (8 * (4 + cnt));
 
             if (cnt < 0)
                 return null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java
index d2acaee..35feba1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java
@@ -588,7 +588,7 @@ public class ClientListenerProcessor extends GridProcessorAdapter {
 
             StringBuilder sb = new StringBuilder();
 
-            if(ctx instanceof JdbcConnectionContext)
+            if (ctx instanceof JdbcConnectionContext)
                 sb.append("JdbcClient [");
             else if (ctx instanceof OdbcConnectionContext)
                 sb.append("OdbcClient [");
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcColumnMetaV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcColumnMetaV2.java
index 6c77b55..051b214 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcColumnMetaV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcColumnMetaV2.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 /**
  * JDBC column metadata.
  */
-public class JdbcColumnMetaV2 extends JdbcColumnMeta{
+public class JdbcColumnMetaV2 extends JdbcColumnMeta {
     /** Allow nulls . */
     private boolean nullable;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
index 214ae11..ee0fcc6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -130,7 +130,7 @@ public class JdbcConnectionContext extends ClientListenerAbstractConnectionConte
     @Override public void initializeFromHandshake(GridNioSession ses,
         ClientListenerProtocolVersion ver, BinaryReaderExImpl reader)
         throws IgniteCheckedException {
-        assert SUPPORTED_VERS.contains(ver): "Unsupported JDBC protocol version.";
+        assert SUPPORTED_VERS.contains(ver) : "Unsupported JDBC protocol version.";
 
         boolean distributedJoins = reader.readBoolean();
         boolean enforceJoinOrder = reader.readBoolean();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaColumnsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaColumnsResult.java
index 199c76d..d485844 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaColumnsResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaColumnsResult.java
@@ -87,7 +87,7 @@ public class JdbcMetaColumnsResult extends JdbcResult {
         else {
             writer.writeInt(meta.size());
 
-            for(JdbcColumnMeta m : meta)
+            for (JdbcColumnMeta m : meta)
                 m.writeBinary(writer, ver);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaIndexesResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaIndexesResult.java
index b180954..f9b7e60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaIndexesResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaIndexesResult.java
@@ -67,7 +67,7 @@ public class JdbcMetaIndexesResult extends JdbcResult {
         else {
             writer.writeInt(meta.size());
 
-            for(JdbcIndexMeta m : meta)
+            for (JdbcIndexMeta m : meta)
                 m.writeBinary(writer, ver);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaParamsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaParamsResult.java
index 43c2422..91d8a63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaParamsResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaParamsResult.java
@@ -59,7 +59,7 @@ public class JdbcMetaParamsResult extends JdbcResult {
         else {
             writer.writeInt(meta.size());
 
-            for(JdbcParameterMeta m : meta)
+            for (JdbcParameterMeta m : meta)
                 m.writeBinary(writer, ver);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java
index f6d986e..1fea2fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java
@@ -61,7 +61,7 @@ public class JdbcMetaPrimaryKeysResult extends JdbcResult {
         else {
             writer.writeInt(meta.size());
 
-            for(JdbcPrimaryKeyMeta m : meta)
+            for (JdbcPrimaryKeyMeta m : meta)
                 m.writeBinary(writer, ver);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java
index d5afb7c..e025239 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java
@@ -59,7 +59,7 @@ public class JdbcMetaTablesResult extends JdbcResult {
         else {
             writer.writeInt(meta.size());
 
-            for(JdbcTableMeta m : meta)
+            for (JdbcTableMeta m : meta)
                 m.writeBinary(writer, ver);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCursor.java
index cd566ed..972755b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCursor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCursor.java
@@ -60,7 +60,7 @@ class JdbcQueryCursor extends JdbcCursor {
     /**
      * Open iterator;
      */
-    void openIterator(){
+    void openIterator() {
         iter = cur.iterator();
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java
index e62efcb..09df1d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java
@@ -45,7 +45,7 @@ public class JdbcQueryFetchResult extends JdbcResult {
      * @param items Query result rows.
      * @param last Flag indicating the query has no unfetched results.
      */
-    JdbcQueryFetchResult(List<List<Object>> items, boolean last){
+    JdbcQueryFetchResult(List<List<Object>> items, boolean last) {
         super(QRY_FETCH);
 
         this.items = items;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java
index d366e60..99d1c98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java
@@ -45,7 +45,7 @@ public class JdbcQueryMetadataResult extends JdbcResult {
      * @param queryId Query ID.
      * @param meta Query metadata.
      */
-    JdbcQueryMetadataResult(long queryId, List<JdbcColumnMeta> meta){
+    JdbcQueryMetadataResult(long queryId, List<JdbcColumnMeta> meta) {
         super(QRY_META);
 
         this.meta = meta;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java
index d3024a5..a78432e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java
@@ -138,7 +138,7 @@ public class JdbcRequest extends ClientListenerRequestNoId implements JdbcRawBin
 
         JdbcRequest req;
 
-        switch(reqType) {
+        switch (reqType) {
             case QRY_EXEC:
                 req = new JdbcQueryExecuteRequest();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
index ccab26e..9401ce1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
@@ -116,7 +116,7 @@ public class OdbcConnectionContext extends ClientListenerAbstractConnectionConte
     @Override public void initializeFromHandshake(GridNioSession ses,
         ClientListenerProtocolVersion ver, BinaryReaderExImpl reader)
         throws IgniteCheckedException {
-        assert SUPPORTED_VERS.contains(ver): "Unsupported ODBC protocol version.";
+        assert SUPPORTED_VERS.contains(ver) : "Unsupported ODBC protocol version.";
 
         boolean distributedJoins = reader.readBoolean();
         boolean enforceJoinOrder = reader.readBoolean();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryCloseResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryCloseResult.java
index eb156fa..e22dd45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryCloseResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryCloseResult.java
@@ -27,7 +27,7 @@ public class OdbcQueryCloseResult {
     /**
      * @param queryId Query ID.
      */
-    public OdbcQueryCloseResult(long queryId){
+    public OdbcQueryCloseResult(long queryId) {
         this.queryId = queryId;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryFetchResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryFetchResult.java
index 612ac02..0d5c26c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryFetchResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryFetchResult.java
@@ -37,7 +37,7 @@ public class OdbcQueryFetchResult {
      * @param items Query result rows.
      * @param last Flag indicating the query has no unfetched results.
      */
-    public OdbcQueryFetchResult(long queryId, Collection<?> items, boolean last){
+    public OdbcQueryFetchResult(long queryId, Collection<?> items, boolean last) {
         this.queryId = queryId;
         this.items = items;
         this.last = last;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryMoreResultsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryMoreResultsResult.java
index faa5e27..ce7ad69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryMoreResultsResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryMoreResultsResult.java
@@ -37,7 +37,7 @@ public class OdbcQueryMoreResultsResult {
      * @param items Query result rows.
      * @param last Flag indicating the query has no unfetched results.
      */
-    public OdbcQueryMoreResultsResult(long queryId, Collection<?> items, boolean last){
+    public OdbcQueryMoreResultsResult(long queryId, Collection<?> items, boolean last) {
         this.queryId = queryId;
         this.items = items;
         this.last = last;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
index 44ad832..e5b2ec8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
@@ -577,7 +577,7 @@ public class OdbcRequestHandler implements ClientListenerRequestHandler {
             );
         }
         catch (Exception e) {
-            U.error(log, "Failed to execute batch query [qry=" + qry +']', e);
+            U.error(log, "Failed to execute batch query [qry=" + qry + ']', e);
 
             extractBatchError(e, null, err);
         }
@@ -825,7 +825,7 @@ public class OdbcRequestHandler implements ClientListenerRequestHandler {
      * @param queryId Query ID.
      */
     private void CloseCursor(OdbcQueryResults results, long queryId) {
-        assert(results != null);
+        assert (results != null);
 
         results.closeAll();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index 89d657f..5380502 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -880,7 +880,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
             PlatformCacheExtension[] res = new PlatformCacheExtension[maxExtId + 1];
 
             for (PlatformCacheExtension cacheExt : cacheExts)
-                res[cacheExt.id()]= cacheExt;
+                res[cacheExt.id()] = cacheExt;
 
             return res;
         }
@@ -921,7 +921,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
             PlatformPluginExtension[] res = new PlatformPluginExtension[maxExtId + 1];
 
             for (PlatformPluginExtension ext : exts)
-                res[ext.id()]= ext;
+                res[ext.id()] = ext;
 
             return res;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/binary/PlatformBinaryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/binary/PlatformBinaryProcessor.java
index 23d2cb5..d701ca1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/binary/PlatformBinaryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/binary/PlatformBinaryProcessor.java
@@ -147,7 +147,7 @@ public class PlatformBinaryProcessor extends PlatformAbstractTarget {
 
                 Map<String, Integer> vals = new HashMap<>(cnt);
 
-                for (int i = 0; i< cnt; i++) {
+                for (int i = 0; i < cnt; i++) {
                     vals.put(reader.readString(), reader.readInt());
                 }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index eb182a8..b53d44e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -1350,7 +1350,7 @@ public class PlatformCache extends PlatformAbstractTarget {
             QueryCursorEx cursor = (QueryCursorEx) cache.query(qry);
 
             return new PlatformQueryCursor(platformCtx, cursor,
-                qry.getPageSize() > 0 ? qry.getPageSize(): Query.DFLT_PAGE_SIZE);
+                qry.getPageSize() > 0 ? qry.getPageSize() : Query.DFLT_PAGE_SIZE);
         }
         catch (Exception err) {
             throw PlatformUtils.unwrapQueryException(err);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
index 9388855..94b1365 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
@@ -94,7 +94,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
             try {
                 interopProc = PlatformUtils.platformProcessor(ignite);
             }
-            catch (IllegalStateException ex){
+            catch (IllegalStateException ex) {
                 throw new EntryProcessorException(ex);
             }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index 050f299..13f2914 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -729,7 +729,8 @@ public class PlatformCallbackGateway {
         }
         finally {
             leave();
-        }}
+        }
+    }
 
     /**
      * @param ptr Pointer.
@@ -1120,7 +1121,7 @@ public class PlatformCallbackGateway {
      *
      * @param memPtr Pointer to a stream.
      */
-    public void affinityFunctionAssignPartitions(long memPtr){
+    public void affinityFunctionAssignPartitions(long memPtr) {
         enter();
 
         try {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodeIdsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodeIdsRequest.java
index 0661eba..df56baf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodeIdsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodeIdsRequest.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.internal.processors.platform.client.cluster;
 
+import java.util.Collection;
+import java.util.UUID;
 import org.apache.ignite.binary.BinaryRawReader;
 import org.apache.ignite.cluster.ClusterGroup;
 import org.apache.ignite.cluster.ClusterNode;
@@ -26,9 +28,6 @@ import org.apache.ignite.internal.processors.platform.client.ClientConnectionCon
 import org.apache.ignite.internal.processors.platform.client.ClientRequest;
 import org.apache.ignite.internal.processors.platform.client.ClientResponse;
 
-import java.util.Collection;
-import java.util.UUID;
-
 /**
  * Cluster group get node identifiers request.
  */
@@ -65,11 +64,11 @@ public class ClientClusterGroupGetNodeIdsRequest extends ClientRequest {
     }
 
     /** Tansforms nodes collection to node ids array. */
-    private UUID[] getNodeIds(ClusterGroup clusterGrp){
+    private UUID[] getNodeIds(ClusterGroup clusterGrp) {
         Collection<ClusterNode> nodes = clusterGrp.nodes();
         UUID[] nodeIds = new UUID[nodes.size()];
         int i = 0;
-        for(ClusterNode node : nodes){
+        for (ClusterNode node : nodes) {
             nodeIds[i++] = node.id();
         }
         return nodeIds;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesDetailsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesDetailsResponse.java
index 0abff57..1a998b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesDetailsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesDetailsResponse.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.internal.processors.platform.client.cluster;
 
+import java.util.Collection;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.binary.BinaryRawWriterEx;
 import org.apache.ignite.internal.processors.platform.client.ClientConnectionContext;
 import org.apache.ignite.internal.processors.platform.client.ClientResponse;
 import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
 
-import java.util.Collection;
-
 /**
  * Cluster group get nodes details response.
  */
@@ -48,7 +47,7 @@ public class ClientClusterGroupGetNodesDetailsResponse extends ClientResponse {
 
         writer.writeInt(nodes.size());
 
-        for (ClusterNode node: nodes){
+        for (ClusterNode node: nodes) {
             writer.writeUuid(node.id());
             PlatformUtils.writeNodeAttributes(writer, node.attributes());
             writer.writeCollection(node.addresses());
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 d1291b4..9019553 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
@@ -365,7 +365,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
                 return TRUE;
             }
 
-            case OP_CLEAR_STATISTICS:{
+            case OP_CLEAR_STATISTICS: {
                 Collection<String> cacheNames = PlatformUtils.readStrings(reader);
 
                 platformCtx.kernalContext().grid().cluster().clearStatistics(cacheNames);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index c2303ac..fcde8b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -464,7 +464,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
      * @throws org.apache.ignite.IgniteCheckedException If failed.
      */
     protected int doInvoke(IgniteInClosure<BinaryRawWriterEx> task, IgniteInClosure<BinaryRawReaderEx> readClo)
-        throws IgniteCheckedException{
+        throws IgniteCheckedException {
         try (PlatformMemory mem = platformCtx.memory().allocate()) {
             PlatformOutputStream out = mem.output();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
index 634e124..0d176e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
@@ -147,7 +147,7 @@ public class PlatformMessaging extends PlatformAbstractTarget {
     @Override public void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer)
         throws IgniteCheckedException {
         switch (type) {
-            case OP_REMOTE_LISTEN:{
+            case OP_REMOTE_LISTEN: {
                 writer.writeUuid(startRemoteListen(reader, messaging));
 
                 break;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
index 705cf9c..729b3be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
@@ -653,7 +653,7 @@ public class PlatformServices extends PlatformAbstractTarget {
          * @return Whether specified args are compatible with argTypes.
          */
         private static boolean areMethodArgsCompatible(Class[] argTypes, Object[] args) {
-            for (int i = 0; i < args.length; i++){
+            for (int i = 0; i < args.length; i++) {
                 // arg is always of a primitive wrapper class, and argTypes can have actual primitive
                 Object arg = args[i];
                 Class argType = wrap(argTypes[i]);
@@ -700,7 +700,7 @@ public class PlatformServices extends PlatformAbstractTarget {
          * @param val Value.
          */
         public void put(K key, V val) {
-            synchronized (this){
+            synchronized (this) {
                 if (map.containsKey(key))
                     return;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
index 42bcf8e..28e290d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
@@ -623,7 +623,7 @@ public class PlatformUtils {
      * @param evtType Type of event.
      */
     private static void writeEventType(BinaryRawWriterEx writer, EventType evtType) {
-        switch (evtType){
+        switch (evtType) {
             case CREATED: writer.writeByte((byte) 0); break;
             case UPDATED: writer.writeByte((byte) 1); break;
             case REMOVED: writer.writeByte((byte) 2); break;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
index 8100c32..6a0c868 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryFieldsResultAdapter.java
@@ -52,7 +52,7 @@ public class GridQueryFieldsResultAdapter implements GridQueryFieldsResult {
     }
 
     /** {@inheritDoc} */
-    @Override public GridCloseableIterator<List<?>> iterator() throws IgniteCheckedException{
+    @Override public GridCloseableIterator<List<?>> iterator() throws IgniteCheckedException {
         return it;
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index a75817e..68f5fb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1061,7 +1061,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
 
         if (!dscoMsgIdHist.add(id)) {
             U.warn(log, "Received duplicate schema custom discovery message (will ignore) [opId=" +
-                msg.operation().id() + ", msg=" + msg  +']');
+                msg.operation().id() + ", msg=" + msg  + ']');
 
             return;
         }
@@ -1080,7 +1080,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
         }
         else
             U.warn(log, "Received unsupported schema custom discovery message (will ignore) [opId=" +
-                msg.operation().id() + ", msg=" + msg  +']');
+                msg.operation().id() + ", msg=" + msg  + ']');
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java
index 8948b98..1c82ee5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java
@@ -145,7 +145,7 @@ public class GridRunningQueryInfo {
     /**
      * @return Query running future.
      */
-    public QueryRunningFuture runningFuture(){
+    public QueryRunningFuture runningFuture() {
         return fut;
     }
 
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 1e8d5b8..aeee9a5 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
@@ -789,7 +789,7 @@ public class QueryUtils {
 
             d.addIndex(idxDesc);
         }
-        else if (idxTyp == QueryIndexType.FULLTEXT){
+        else if (idxTyp == QueryIndexType.FULLTEXT) {
             for (String field : idx.getFields().keySet()) {
                 String alias = d.aliases().get(field);
 
@@ -1505,17 +1505,17 @@ public class QueryUtils {
 
             code = ((IgniteSQLException)e).statusCode();
         }
-        else if (e instanceof TransactionDuplicateKeyException){
+        else if (e instanceof TransactionDuplicateKeyException) {
             code = IgniteQueryErrorCode.DUPLICATE_KEY;
 
             sqlState = IgniteQueryErrorCode.codeToSqlState(code);
         }
-        else if (e instanceof TransactionSerializationException){
+        else if (e instanceof TransactionSerializationException) {
             code = IgniteQueryErrorCode.TRANSACTION_SERIALIZATION_ERROR;
 
             sqlState = IgniteQueryErrorCode.codeToSqlState(code);
         }
-        else if (e instanceof TransactionAlreadyCompletedException){
+        else if (e instanceof TransactionAlreadyCompletedException) {
             code = IgniteQueryErrorCode.TRANSACTION_COMPLETED;
 
             sqlState = IgniteQueryErrorCode.codeToSqlState(code);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/RunningQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/RunningQueryManager.java
index 17fb0b9..361e383 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/RunningQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/RunningQueryManager.java
@@ -215,7 +215,7 @@ public class RunningQueryManager {
      * @param runningQryInfo Running query info object.
      * @return {@code true} For SQL or SQL_FIELDS query type.
      */
-    private boolean isSqlQuery(GridRunningQueryInfo runningQryInfo){
+    private boolean isSqlQuery(GridRunningQueryInfo runningQryInfo) {
         return runningQryInfo.queryType() == SQL_FIELDS || runningQryInfo.queryType() == SQL;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/TableInformation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/TableInformation.java
index 13dd2ab..952c6b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/TableInformation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/TableInformation.java
@@ -102,7 +102,7 @@ public class TableInformation {
      * @param tblName Table name.
      * @param tblType Table type.
      */
-    public TableInformation(String schemaName, String tblName, String tblType){
+    public TableInformation(String schemaName, String tblName, String tblType) {
         assert schemaName != null;
         assert tblName != null;
         assert tblType != null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
index a46d735..15637de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
@@ -388,7 +388,7 @@ public class GridQueryNextPageResponse implements Message {
     /**
      * @param retryCause Retry Ccause message.
      */
-    public void retryCause(String retryCause){
+    public void retryCause(String retryCause) {
         this.retryCause = retryCause;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
index ae511bd..81117bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
@@ -66,7 +66,7 @@ public class GridQueryKillResponse implements Message {
     /**
      * @return Error text or {@code null} if no error.
      */
-    public String error(){
+    public String error() {
         return errMsg;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 9f8bdb5..0c4797e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -274,7 +274,7 @@ public class GridRestProcessor extends GridProcessorAdapter implements IgniteRes
                     if (secCtx0 == null || ses.isTokenExpired(sesTokTtl))
                         ses.secCtx = secCtx0 = authenticate(req, ses);
 
-                    try(OperationSecurityContext s = ctx.security().withContext(secCtx0)) {
+                    try (OperationSecurityContext s = ctx.security().withContext(secCtx0)) {
                         authorize(req);
                     }
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java
index 1874c88..7730d13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java
@@ -45,7 +45,7 @@ public class GridClientStateRequest extends GridClientAbstractMessage {
     /**
      *
      */
-    public void active(boolean active){
+    public void active(boolean active) {
         this.active = active;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
index bc77030..64681dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
@@ -56,7 +56,7 @@ public class GridVersionCommandHandler extends GridRestCommandHandlerAdapter {
 
         assert SUPPORTED_COMMANDS.contains(req.command());
 
-        switch (req.command()){
+        switch (req.command()) {
             case VERSION:
                 return new GridFinishedFuture<>(new GridRestResponse(VER_STR));
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 3f6ef3c..e2e9a1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -184,7 +184,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
         return new GridEmbeddedFuture<>(new IgniteClosure2X<GridRestResponse, Exception, GridRestResponse>() {
             @Override public GridRestResponse applyx(GridRestResponse restRes,
                 Exception ex) throws IgniteCheckedException {
-                if(ex != null)
+                if (ex != null)
                     throw U.cast(ex);
 
                 // Handle 'Stat' command (special case because several packets are included in response).
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/NoOpIgniteSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/NoOpIgniteSecurityProcessor.java
index a9cbf58..22b234b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/NoOpIgniteSecurityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/NoOpIgniteSecurityProcessor.java
@@ -130,7 +130,7 @@ public class NoOpIgniteSecurityProcessor extends GridProcessorAdapter implements
      * @param node Joining node.
      * @return Validation result or {@code null} in case of success.
      */
-    private IgniteNodeValidationResult validateSecProcClass(ClusterNode node){
+    private IgniteNodeValidationResult validateSecProcClass(ClusterNode node) {
         String rmtCls = node.attribute(ATTR_GRID_SEC_PROC_CLASS);
 
         if (rmtCls != null) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index b2c626b..22246c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -366,7 +366,7 @@ public class GridTaskProcessor extends GridProcessorAdapter implements IgniteCha
      *      if value with given {@code key} doesn't exist.
      */
     @Nullable public <T> T getThreadContext(GridTaskThreadContextKey key) {
-        assert(key != null);
+        assert (key != null);
 
         Map<GridTaskThreadContextKey, Object> map = thCtx.get();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 8ce33e8..aad33cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -1028,7 +1028,7 @@ public class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObjec
                             ClusterNode newNode = ctx.affinity().mapPartitionToNode(affCacheName, affPartId,
                                 mapTopVer);
 
-                            if(!checkTargetNode(resp, jRes, newNode))
+                            if (!checkTargetNode(resp, jRes, newNode))
                                 return;
 
                             sendRequest(jRes);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java
index 924835b..6a8ea7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java
@@ -498,7 +498,7 @@ public class SqlParser {
     /**
      * Last successfully parsed sql statement. It corresponds to the last command returned by {@link #nextCommand()}.
      */
-    public String lastCommandSql(){
+    public String lastCommandSql() {
         if (lastCmdEndPos < 0)
             return null;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArrays.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArrays.java
index 47680fe..2cf5aa0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArrays.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArrays.java
@@ -61,7 +61,7 @@ public final class GridArrays {
     public static <T> T[] remove(T[] arr, int idx) {
         int len = arr.length;
 
-        assert idx >= 0 && idx < len: idx + " < " + len;
+        assert idx >= 0 && idx < len : idx + " < " + len;
 
         if (idx == len - 1)
             return Arrays.copyOfRange(arr, 0, len - 1);
@@ -85,7 +85,7 @@ public final class GridArrays {
     public static long[] remove(long[] arr, int idx) {
         int len = arr.length;
 
-        assert idx >= 0 && idx < len: idx + " < " + len;
+        assert idx >= 0 && idx < len : idx + " < " + len;
 
         if (idx == len - 1)
             return Arrays.copyOfRange(arr, 0, len - 1);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMultiCollectionWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMultiCollectionWrapper.java
index 06fa291..02b5727 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMultiCollectionWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMultiCollectionWrapper.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  * Wrapper around several collection, don't allow adding new elements.
  * @param <E>
  */
-public class GridMultiCollectionWrapper<E> implements Collection<E>{
+public class GridMultiCollectionWrapper<E> implements Collection<E> {
     /** Collections. */
     public final Collection<E>[] collections;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
index 8eb5607..c2733aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java
@@ -490,7 +490,7 @@ public class GridStringBuilder implements Serializable {
      * @throws ClassNotFoundException Thrown if read class cannot be found.
      */
     private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException   {
-        impl= (StringBuilder) s.readObject();
+        impl = (StringBuilder) s.readObject();
     }
 
     /** {@inheritDoc} */
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 8ffe8a5..8336514 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
@@ -4838,7 +4838,7 @@ public abstract class IgniteUtils {
      */
     public static <T> ObjectName registerMBean(MBeanServer mbeanSrv, ObjectName name, T impl, Class<T> itf)
         throws JMException {
-        if(IGNITE_MBEANS_DISABLED)
+        if (IGNITE_MBEANS_DISABLED)
             throw new MBeanRegistrationException(new IgniteIllegalStateException("MBeans are disabled."));
 
         assert mbeanSrv != null;
@@ -5452,7 +5452,7 @@ public abstract class IgniteUtils {
      * @param obj Object.
      */
     public static int hashCode(Object obj) {
-        if(obj == null)
+        if (obj == null)
             return 0;
 
         if (obj.getClass().isArray()) {
@@ -7830,7 +7830,7 @@ public abstract class IgniteUtils {
 
                         if (ucp instanceof URLClassLoader)
                             return ((URLClassLoader)ucp).getURLs();
-                        else if (clsURLClassPath!= null && clsURLClassPath.isInstance(ucp))
+                        else if (clsURLClassPath != null && clsURLClassPath.isInstance(ucp))
                             return (URL[])mthdURLClassPathGetUrls.invoke(ucp);
                         else
                             throw new RuntimeException("Unknown classloader: " + clsLdr.getClass());
@@ -8297,12 +8297,13 @@ public abstract class IgniteUtils {
      * @param fieldName Field name.
      * @return Boolean flag.
      */
-    public static boolean hasField(Object obj, String fieldName){
+    public static boolean hasField(Object obj, String fieldName) {
         try {
             field(obj, fieldName);
 
             return true;
-        }catch (IgniteException e){
+        }
+        catch (IgniteException e) {
             return false;
         }
     }
@@ -8904,10 +8905,10 @@ public abstract class IgniteUtils {
      * @param ldr Class loader.
      * @param clsName Class name of clearing class.
      */
-    public static void clearClassFromClassCache(ClassLoader ldr, String clsName){
+    public static void clearClassFromClassCache(ClassLoader ldr, String clsName) {
         ConcurrentMap<String, Class> map = classCache.get(ldr);
 
-        if (map!=null)
+        if (map != null)
             map.remove(clsName);
     }
 
@@ -10730,7 +10731,7 @@ public abstract class IgniteUtils {
     public static int fileCount(Path dir) throws IOException {
         int cnt = 0;
 
-        try (DirectoryStream<Path> ds = Files.newDirectoryStream(dir)){
+        try (DirectoryStream<Path> ds = Files.newDirectoryStream(dir)) {
             for (Path d : ds) {
                 if (Files.isDirectory(d))
                     cnt += fileCount(d);
@@ -10857,7 +10858,7 @@ public abstract class IgniteUtils {
 
         long y = 1;
 
-        while (y < x){
+        while (y < x) {
             if (y * 2 > Integer.MAX_VALUE)
                 return (int)y;
 
@@ -11331,7 +11332,7 @@ public abstract class IgniteUtils {
         /**
          * @param task Add task.
          */
-        public void addTask(T task){
+        public void addTask(T task) {
             tasks.add(task);
         }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index 8ed4d7a..03ad782 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -719,16 +719,16 @@ public class StripedExecutor implements ExecutorService {
                     if (r != null)
                         return r;
 
-                    if(others != null) {
+                    if (others != null) {
                         int len = others.length;
                         int init = ThreadLocalRandom.current().nextInt(len);
                         int cur = init;
 
                         while (true) {
-                            if(cur != idx) {
+                            if (cur != idx) {
                                 Deque<Runnable> queue = (Deque<Runnable>) ((StripeConcurrentQueue) others[cur]).queue;
 
-                                if(queue.size() > IGNITE_TASKS_STEALING_THRESHOLD && (r = queue.pollLast()) != null)
+                                if (queue.size() > IGNITE_TASKS_STEALING_THRESHOLD && (r = queue.pollLast()) != null)
                                     return r;
                             }
 
@@ -755,9 +755,9 @@ public class StripedExecutor implements ExecutorService {
             if (parked)
                 LockSupport.unpark(thread);
 
-            if(others != null && queueSize() > IGNITE_TASKS_STEALING_THRESHOLD) {
+            if (others != null && queueSize() > IGNITE_TASKS_STEALING_THRESHOLD) {
                 for (Stripe other : others) {
-                    if(((StripeConcurrentQueue)other).parked)
+                    if (((StripeConcurrentQueue)other).parked)
                         LockSupport.unpark(other.thread);
                 }
             }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index ea670dc..cb34b28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -127,7 +127,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> {
     @Override public R result() {
         Object state0 = state;
 
-        if(state0 == null ||                           // It is DONE state
+        if (state0 == null ||                           // It is DONE state
            (state0.getClass() != Node.class &&         // It is not INIT state
             state0.getClass() != ErrorWrapper.class && // It is not FAILED
             state0 != CANCELLED))                      // It is not CANCELLED
@@ -273,10 +273,10 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> {
             if (isDone(oldState))
                 return false;
 
-            if(node == null)
+            if (node == null)
                 node = new Node(waiter);
 
-            if(oldState != INIT && oldState.getClass() == Node.class)
+            if (oldState != INIT && oldState.getClass() == Node.class)
                 node.next = (Node)oldState;
 
             if (compareAndSetState(oldState, node))
@@ -292,7 +292,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> {
         Object cur = state;
 
         while (cur != null) {
-            if(cur.getClass() != Node.class)
+            if (cur.getClass() != Node.class)
                 return;
 
             Object curWaiter = ((Node)cur).val;
@@ -507,7 +507,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> {
 
             if (compareAndSetState(oldState, newState)) {
 
-                if(oldState != INIT)
+                if (oldState != INIT)
                     unblockAll((Node)oldState);
 
                 return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
index ccdee84..241c966 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
@@ -390,7 +390,7 @@ public class GridFilenameUtils {
                 if (i == size - 1)
                     lastIsDirectory = true;
                 System.arraycopy(array, i + 1, array, i - 1, size - i);
-                size -=2;
+                size -= 2;
                 i--;
             }
         }
@@ -796,7 +796,7 @@ public class GridFilenameUtils {
         if (prefix < 0)
             return null;
         int index = indexOfLastSeparator(filename);
-        int endIndex = index+separatorAdd;
+        int endIndex = index + separatorAdd;
         if (prefix >= filename.length() || index < 0 || prefix >= endIndex)
             return "";
         return filename.substring(prefix, endIndex);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
index 2cce27f..8b526dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
@@ -97,30 +97,30 @@ public class GridReversedLinesFileReader implements Closeable {
         // --- check & prepare encoding ---
         CharsetEncoder charsetEncoder = charset.newEncoder();
         float maxBytesPerChar = charsetEncoder.maxBytesPerChar();
-        if(maxBytesPerChar == 1f) {
+        if (maxBytesPerChar == 1f) {
             // all one byte encodings are no problem
             byteDecrement = 1;
-        } else if(charset == Charset.forName("UTF-8")) {
+        } else if (charset == Charset.forName("UTF-8")) {
             // UTF-8 works fine out of the box, for multibyte sequences a second UTF-8 byte can never be a newline byte
             // http://en.wikipedia.org/wiki/UTF-8
             byteDecrement = 1;
-        } else if(charset == Charset.forName("Shift_JIS")) {
+        } else if (charset == Charset.forName("Shift_JIS")) {
             // Same as for UTF-8
             // http://www.herongyang.com/Unicode/JIS-Shift-JIS-Encoding.html
             byteDecrement = 1;
-        } else if(charset == Charset.forName("UTF-16BE") || charset == Charset.forName("UTF-16LE")) {
+        } else if (charset == Charset.forName("UTF-16BE") || charset == Charset.forName("UTF-16LE")) {
             // UTF-16 new line sequences are not allowed as second tuple of four byte sequences,
             // however byte order has to be specified
             byteDecrement = 2;
-        } else if(charset == Charset.forName("UTF-16")) {
+        } else if (charset == Charset.forName("UTF-16")) {
             throw new UnsupportedEncodingException(
                 "For UTF-16, you need to specify the byte order (use UTF-16BE or UTF-16LE)");
         } else {
             throw new UnsupportedEncodingException(
-                "Encoding "+charset+" is not supported yet (feel free to submit a patch)");
+                "Encoding " + charset + " is not supported yet (feel free to submit a patch)");
         }
         // NOTE: The new line sequences are matched in the order given, so it is important that \r\n is BEFORE \n
-        newLineSequences = new byte[][] { "\r\n".getBytes(charset), "\n".getBytes(charset), "\r".getBytes(charset) };
+        newLineSequences = new byte[][] {"\r\n".getBytes(charset), "\n".getBytes(charset), "\r".getBytes(charset)};
 
         avoidNewlineSplitBufferSize = newLineSequences[0].length;
     }
@@ -164,7 +164,7 @@ public class GridReversedLinesFileReader implements Closeable {
         }
 
         // aligned behaviour wiht BufferedReader that doesn't return a last, emtpy line
-        if("".equals(line) && !trailingNewlineOfFileSkipped) {
+        if ("".equals(line) && !trailingNewlineOfFileSkipped) {
             trailingNewlineOfFileSkipped = true;
             line = readLine();
         }
@@ -273,7 +273,7 @@ public class GridReversedLinesFileReader implements Closeable {
                     int lineLengthBytes = currentLastBytePos - lineStart + 1;
 
                     if (lineLengthBytes < 0) {
-                        throw new IllegalStateException("Unexpected negative line length="+lineLengthBytes);
+                        throw new IllegalStateException("Unexpected negative line length=" + lineLengthBytes);
                     }
                     byte[] lineData = new byte[lineLengthBytes];
                     System.arraycopy(data, lineStart, lineData, 0, lineLengthBytes);
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 700d3f1..fbba3b1 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
@@ -352,7 +352,7 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
      * @param ignite Ignite
      */
     @IgniteInstanceResource
-    private void injectResources(Ignite ignite){
+    private void injectResources(Ignite ignite) {
         if (ignite != null) {
             // Inject resources.
             igniteInstanceName = ignite.name();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
index 9a0fe12..58f8797 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
@@ -35,7 +35,7 @@ public class GridMetadataAwareAdapter {
     /**
      * Enum stored predefined keys.
      */
-    public enum EntryKey {//keys sorted by usage rate, descending.
+    public enum EntryKey { //keys sorted by usage rate, descending.
         /** Predefined key. */
         CACHE_STORE_MANAGER_KEY(0),
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
index 35d377b..2de377a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
@@ -122,7 +122,7 @@ public class GridNodePredicate implements IgnitePredicate<ClusterNode>, Iterable
      *
      * @return Set of node IDs this predicate is based on.
      */
-    public Set<UUID> nodeIds(){
+    public Set<UUID> nodeIds() {
         return ids;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
index 2621c44..310929e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeStartUtils.java
@@ -329,7 +329,7 @@ public class IgniteNodeStartUtils {
         String cfg = props.get(CFG) != null ? (String)props.get(CFG) : dfltSpec.configuration();
         String script = props.get(SCRIPT) != null ? (String)props.get(SCRIPT) : dfltSpec.script();
 
-        if (port<= 0)
+        if (port <= 0)
             throw new IgniteCheckedException("Invalid port number: " + port);
 
         if (nodes <= 0)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorDataTransferObject.java
index 22863e4..6e364c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorDataTransferObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorDataTransferObject.java
@@ -59,7 +59,7 @@ public abstract class VisorDataTransferObject implements Externalizable {
      * @return List based on passed collection.
      */
     @Nullable protected static <T> List<T> toList(Collection<T> col) {
-        if(col instanceof List)
+        if (col instanceof List)
             return (List<T>)col;
 
         if (col != null)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetLostPartitionsTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetLostPartitionsTaskArg.java
index 5f60730..c69e79d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetLostPartitionsTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetLostPartitionsTaskArg.java
@@ -51,7 +51,7 @@ public class VisorCacheResetLostPartitionsTaskArg extends VisorDataTransferObjec
     public VisorCacheResetLostPartitionsTaskArg(List<String> cacheNames) {
         this.cacheNames = cacheNames;
 
-        if(cacheNames != null)
+        if (cacheNames != null)
             modifiedCaches = cacheNames.toString();
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
index 43d8a08..f59b8c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
@@ -287,7 +287,7 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure implements IgniteCall
                 if (cacheCtx == null)
                     stoppedCachesForGrpId
                         .computeIfAbsent(grpCtx.groupId(), (x) -> new HashMap<>())
-                        .compute(cacheId, (x, y) -> y == null? 1 : y + 1);
+                        .compute(cacheId, (x, y) -> y == null ? 1 : y + 1);
             }
         }
         catch (IgniteCheckedException e) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
index 9b0dd89..c7c646b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/debug/VisorThreadInfo.java
@@ -102,7 +102,7 @@ public class VisorThreadInfo extends VisorDataTransferObject {
         id = ti.getThreadId();
         state = ti.getThreadState();
         lock = ti.getLockInfo() != null ? new VisorThreadLockInfo(ti.getLockInfo()) : null;
-        lockName =ti.getLockName();
+        lockName = ti.getLockName();
         lockOwnerId = ti.getLockOwnerId();
         lockOwnerName = ti.getLockOwnerName();
         inNative = ti.isInNative();
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 28f8ef0..35e8b43 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
@@ -87,7 +87,7 @@ public class VisorPageLocksTrackerArgs extends IgniteDataTransferObject {
     }
 
     /** */
-    public Set<String> nodeIds(){
+    public Set<String> nodeIds() {
         return Collections.unmodifiableSet(nodeIds);
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java
index 51d32d5..7ae2062 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java
@@ -108,17 +108,17 @@ public class VisorWalTask extends VisorMultiNodeTask<VisorWalTaskArg, VisorWalTa
         Map<String, Collection<String>> res = U.newHashMap(results.size());
         Map<String, VisorClusterNode> nodesInfo = U.newHashMap(results.size());
 
-        for (ComputeJobResult result: results){
+        for (ComputeJobResult result: results) {
             ClusterNode node = result.getNode();
 
             String nodeId = node.consistentId().toString();
 
-            if(result.getException() != null)
+            if (result.getException() != null)
                 exRes.put(nodeId, result.getException());
             else if (result.getData() != null) {
                 Collection<String> data = result.getData();
 
-                if(data != null)
+                if (data != null)
                     res.put(nodeId, data);
             }
 
@@ -168,7 +168,7 @@ public class VisorWalTask extends VisorMultiNodeTask<VisorWalTaskArg, VisorWalTa
 
                 }
             }
-            catch (IgniteCheckedException e){
+            catch (IgniteCheckedException e) {
                 U.error(log, "Failed to perform WAL task", e);
 
                 throw new IgniteException("Failed to perform WAL task", e);
@@ -185,7 +185,7 @@ public class VisorWalTask extends VisorMultiNodeTask<VisorWalTaskArg, VisorWalTa
         Collection<String> getUnusedWalSegments(
             GridCacheDatabaseSharedManager dbMgr,
             FileWriteAheadLogManager wal
-        ) throws IgniteCheckedException{
+        ) throws IgniteCheckedException {
             WALPointer lowBoundForTruncate = dbMgr.checkpointHistory().firstCheckpointPointer();
 
             if (lowBoundForTruncate == null)
@@ -197,7 +197,7 @@ public class VisorWalTask extends VisorMultiNodeTask<VisorWalTaskArg, VisorWalTa
 
             Collection<String> res = new ArrayList<>(walFiles != null && walFiles.length > 0 ? walFiles.length - 1 : 0);
 
-            if(walFiles != null && walFiles.length > 0) {
+            if (walFiles != null && walFiles.length > 0) {
                 sortWalFiles(walFiles);
 
                 // Obtain index of last archived WAL segment, it will not be deleted.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskArg.java
index afd3b58..1dbf647 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskArg.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.visor.VisorDataTransferObject;
 /**
  * Argument for {@link VisorWalTask}.
  */
-public class VisorWalTaskArg extends VisorDataTransferObject{
+public class VisorWalTaskArg extends VisorDataTransferObject {
     /** */
     private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
index 4ed373b..e0bc5c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
@@ -147,7 +147,7 @@ public class VisorCacheRebalanceCollectorTask extends VisorMultiNodeTask<VisorCa
                         if (cm.getRebalancingPartitionsCount() > 0)
                             rebalanceInProgress = true;
                     }
-                    catch(IllegalStateException | IllegalArgumentException e) {
+                    catch (IllegalStateException | IllegalArgumentException e) {
                         if (debug && ignite.log() != null)
                             ignite.log().error("Ignored cache group: " + grp.cacheOrGroupName(), e);
                     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
index 5407699..6aa3c69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactArray;
 /**
  * Data transfer object for node lifecycle configuration properties.
  */
-public class VisorLifecycleConfiguration extends VisorDataTransferObject{
+public class VisorLifecycleConfiguration extends VisorDataTransferObject {
     /** */
     private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSuppressedError.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSuppressedError.java
index e971341..7c65f98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSuppressedError.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSuppressedError.java
@@ -135,7 +135,7 @@ public class VisorSuppressedError extends VisorDataTransferObject {
         order = in.readLong();
         error = (VisorExceptionWrapper)in.readObject();
         threadId = in.readLong();
-        threadName= U.readString(in);
+        threadName = U.readString(in);
         time = in.readLong();
         msg = U.readString(in);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index 6143e30..7979d87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -503,7 +503,7 @@ public class VisorQueryUtils {
         @Override public List<T> getAll() {
             List<T> all = new ArrayList<>();
 
-            while(it.hasNext())
+            while (it.hasNext())
                 all.add(it.next());
 
             return all;
diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
index c7fb170..9679029 100644
--- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
+++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
@@ -224,7 +224,7 @@ public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID,
                 ignite.message(ignite.cluster().forNode(node)).send(null, respMsg); // Can still fail.
             else
                 throw new IgniteException("Failed to send message since destination node has " +
-                    "left topology (ignoring) [nodeId=" +nodeId + ", respMsg=" + respMsg + ']');
+                    "left topology (ignoring) [nodeId=" + nodeId + ", respMsg=" + respMsg + ']');
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index 0fd25b7..412c8e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -63,7 +63,7 @@ public interface IgniteMXBean {
     public String USER_ATTRS_FORMATTED_DESC = "Collection of formatted user-defined attributes added to this node.";
 
     /** */
-    public String GRID_LOG_FORMATTED_DESC ="Formatted instance of logger that is in grid.";
+    public String GRID_LOG_FORMATTED_DESC = "Formatted instance of logger that is in grid.";
 
     /** */
     public String EXECUTOR_SRVC_FORMATTED_DESC = "Formatted instance of fully configured thread pool" +
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
index 3010c19..ada5a3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
@@ -148,7 +148,7 @@ public class AuthenticationContext {
      * @return Native Apache Ignite authorization context acquired after authentication or {@code null} if native
      * Ignite authentication is not used.
      */
-    public AuthorizationContext authorizationContext(){
+    public AuthorizationContext authorizationContext() {
         return athrCtx;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.java b/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.java
index 30b1d7a..7342ec0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.java
@@ -100,7 +100,7 @@ public class ExponentialBackoffTimeoutStrategy implements TimeoutStrategy {
         long remainingTime = remainingTime(System.nanoTime());
 
         if (remainingTime <= 0)
-            throw new IgniteSpiOperationTimeoutException("Operation timed out [timeoutStrategy= " +this +"]");
+            throw new IgniteSpiOperationTimeoutException("Operation timed out [timeoutStrategy= " + this + "]");
 
         /*
             If timeout is zero that means we need return current verified timeout and calculate next timeout.
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 9fa83c0..352f9f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -407,7 +407,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
      */
     protected final <T extends IgniteSpiManagementMBean> void registerMBean(String igniteInstanceName, T impl, Class<T> mbeanItf
        ) throws IgniteSpiException {
-        if(ignite == null || U.IGNITE_MBEANS_DISABLED)
+        if (ignite == null || U.IGNITE_MBEANS_DISABLED)
             return;
 
         MBeanServer jmx = ignite.configuration().getMBeanServer();
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index 1446fca..1b5ff70 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -566,7 +566,7 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
                 catch (SQLException e) {
                     U.rollbackConnection(conn, log);
 
-                    if(++errCnt >= retryNum)
+                    if (++errCnt >= retryNum)
                         throw new IgniteSpiException("Failed to create checkpoint table: " + tblName, e);
 
                     if (log.isDebugEnabled()) {
@@ -742,7 +742,7 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
                 catch (SQLException e) {
                     U.rollbackConnection(conn, log);
 
-                    if(++errCnt >= retryNum) {
+                    if (++errCnt >= retryNum) {
                         throw new IgniteSpiException("Failed to save checkpoint [tblName=" + tblName + ", key=" + key +
                             ']', e);
                     }
@@ -753,7 +753,7 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
             }
         }
         catch (SQLException e) {
-            throw new IgniteSpiException("Failed to save checkpoint [tblName=" + tblName +", key=" + key + ']', e);
+            throw new IgniteSpiException("Failed to save checkpoint [tblName=" + tblName + ", key=" + key + ']', e);
         }
         finally {
             U.close(conn, log);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index b8d2a50..3539093 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -3753,7 +3753,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
                         String msg = "Failed to connect to node due to unrecoverable exception (is node still alive?). " +
                                 "Make sure that each ComputeTask and cache Transaction has a timeout set " +
                                 "in order to prevent parties from waiting forever in case of network issues " +
-                                "[nodeId=" + node.id() + ", addrs=" + addrs + ", err= "+ e + ']';
+                                "[nodeId=" + node.id() + ", addrs=" + addrs + ", err= " + e + ']';
 
                         if (errs == null)
                             errs = new IgniteCheckedException(msg, e);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index a352ff2..307ff9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -1788,7 +1788,7 @@ class ClientImpl extends TcpDiscoveryImpl {
                             U.quietAndWarn(log, "Local node will try to reconnect to cluster with new id due " +
                                 "to network problems [newId=" + newId +
                                 ", prevId=" + locNode.id() +
-                                ", locNode=" + locNode+ ']');
+                                ", locNode=" + locNode + ']');
 
                             locNode.onClientDisconnected(newId);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 49b5ee9..1764a42 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -559,7 +559,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 Collection<ClusterNode> processed = new HashSet<>(nodes.size());
 
                 for (TcpDiscoveryNode n : nodes) {
-                    if(n.isLocal())
+                    if (n.isLocal())
                         continue;
 
                     assert n.visible();
@@ -1160,7 +1160,7 @@ class ServerImpl extends TcpDiscoveryImpl {
      * @param locCred Local security credentials for authentication.
      * @throws IgniteSpiException If any error occurs.
      */
-    private void localAuthentication(SecurityCredentials locCred){
+    private void localAuthentication(SecurityCredentials locCred) {
         assert spi.nodeAuth != null;
         assert locCred != null;
 
@@ -1373,7 +1373,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 
         int reconCnt = 0;
 
-        while (true){
+        while (true) {
             // Need to set to false on each new iteration,
             // since remote node may leave in the middle of the first iteration.
             joinReqSent = false;
@@ -3006,7 +3006,7 @@ class ServerImpl extends TcpDiscoveryImpl {
             }
             finally {
                 if (spi.ignite() instanceof IgniteEx) {
-                    if (err == null && !spi.isNodeStopping0()&& spiStateCopy() != DISCONNECTING)
+                    if (err == null && !spi.isNodeStopping0() && spiStateCopy() != DISCONNECTING)
                         err = new IllegalStateException("Worker " + name() + " is terminated unexpectedly.");
 
                     FailureProcessor failure = ((IgniteEx)spi.ignite()).context().failure();
@@ -3333,7 +3333,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 addr: for (InetSocketAddress addr : spi.getNodeAddresses(next, sameHost)) {
                     long ackTimeout0 = spi.getAckTimeout();
 
-                    if (locNodeAddrs.contains(addr)){
+                    if (locNodeAddrs.contains(addr)) {
                         if (log.isDebugEnabled())
                             log.debug("Skip to send message to the local node (probably remote node has the same " +
                                 "loopback address that local node): " + addr);
@@ -6686,7 +6686,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 }
                 catch (IOException e) {
                     if (log.isDebugEnabled())
-                        U.error(log, "Caught exception on handshake [err=" + e +", sock=" + sock + ']', e);
+                        U.error(log, "Caught exception on handshake [err=" + e + ", sock=" + sock + ']', e);
 
                     if (X.hasCause(e, SSLException.class) && spi.isSslEnabled() && !spi.isNodeStopping0())
                         LT.warn(log, "Failed to initialize connection " +
@@ -6713,9 +6713,9 @@ class ServerImpl extends TcpDiscoveryImpl {
                 }
                 catch (IgniteCheckedException e) {
                     if (log.isDebugEnabled())
-                        U.error(log, "Caught exception on handshake [err=" + e +", sock=" + sock + ']', e);
+                        U.error(log, "Caught exception on handshake [err=" + e + ", sock=" + sock + ']', e);
 
-                    onException("Caught exception on handshake [err=" + e +", sock=" + sock + ']', e);
+                    onException("Caught exception on handshake [err=" + e + ", sock=" + sock + ']', e);
 
                     if (e.hasCause(SocketTimeoutException.class))
                         LT.warn(log, "Socket operation timed out on handshake " +
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 7980efc..7f80610 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -197,7 +197,7 @@ abstract class TcpDiscoveryImpl {
      * @param msg Error message.
      * @param e Exception.
      */
-    protected void onException(String msg, Exception e){
+    protected void onException(String msg, Exception e) {
         spi.getExceptionRegistry().onException(msg, e);
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
index 8ba19e1..e9e462d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
@@ -115,7 +115,7 @@ public class DiscoveryDataPacket implements Serializable {
     /**
      * @return {@code true} if joining node data was transferred via network in zipped format.
      */
-    public boolean isJoiningDataZipped(){
+    public boolean isJoiningDataZipped() {
         for (Map.Entry<Integer, byte[]> entry : joiningNodeData.entrySet()) {
             if (isZipped(entry.getValue()))
                 return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
index f873789..995c2f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
@@ -551,7 +551,7 @@ public class TcpDiscoveryStatistics {
      *
      * @return Max message processing time.
      */
-    public synchronized long maxMessageProcessingTime(){
+    public synchronized long maxMessageProcessingTime() {
         return maxMsgProcTime;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
index fd6d769..07c8cef 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
@@ -338,7 +338,7 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio
                 throw new IllegalStateException("Unknown algorithm: " + algo);
         }
 
-        return (dataSize/BLOCK_SZ + cntBlocks)*BLOCK_SZ;
+        return (dataSize / BLOCK_SZ + cntBlocks) * BLOCK_SZ;
     }
 
     /**
@@ -486,7 +486,7 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio
 
             Key key = ks.getKey(masterKeyName, keyStorePwd);
 
-            assertParameter(key != null, "No such master key found [masterKeyName="+ masterKeyName + ']');
+            assertParameter(key != null, "No such master key found [masterKeyName=" + masterKeyName + ']');
 
             masterKey = new KeystoreEncryptionKey(key, null);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/jmx/SystemViewMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/jmx/SystemViewMBean.java
index 6f80bd7..676f0a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/jmx/SystemViewMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/jmx/SystemViewMBean.java
@@ -95,8 +95,8 @@ public class SystemViewMBean<R> extends ReadOnlyDynamicMBean {
 
         int cnt = sysView.walker().count();
 
-        String[] fields = new String[cnt+1];
-        OpenType[] types = new OpenType[cnt+1];
+        String[] fields = new String[cnt + 1];
+        OpenType[] types = new OpenType[cnt + 1];
 
         List<Integer> filterFieldIdxs = new ArrayList<>(cnt);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
index 4cdc96c..a5afa71 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
@@ -308,7 +308,7 @@ public class AboutDialog extends JDialog {
      * @param act Escape button action.
      */
     private void setEscAction(ActionListener act) {
-        assert(act != null);
+        assert (act != null);
 
         getRootPane().registerKeyboardAction(act,
             KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0x0),
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
index ada167a..2a6f260 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
  */
 public class IgniteWarmupClosureSelfTest extends GridCommonAbstractTest {
     /** */
-    public IgniteWarmupClosureSelfTest(){
+    public IgniteWarmupClosureSelfTest() {
         super(false);
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java
index 26a26ac..6a99c57 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java
@@ -140,7 +140,7 @@ public class ResetLostPartitionTest extends GridCommonAbstractTest {
         grid(0).cluster().active(true);
 
         for (String cacheName : CACHE_NAMES) {
-            try(IgniteDataStreamer<Object, Object> st = grid(0).dataStreamer(cacheName)) {
+            try (IgniteDataStreamer<Object, Object> st = grid(0).dataStreamer(cacheName)) {
                 for (int j = 0; j < CACHE_SIZE; j++)
                     st.addData(j, "Value" + j);
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java
index a10670e..0ce3ca4 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java
@@ -88,7 +88,7 @@ public abstract class CacheJdbcPojoStoreAbstractSelfTest extends GridCommonAbstr
     /**
      * @return Flag indicating that all internal SQL queries should use escaped identifiers.
      */
-    protected boolean sqlEscapeAll(){
+    protected boolean sqlEscapeAll() {
         return false;
     }
 
@@ -266,7 +266,7 @@ public abstract class CacheJdbcPojoStoreAbstractSelfTest extends GridCommonAbstr
     /**
      * @return Flag indicate keep value in binary format or not.
      */
-    protected boolean storeKeepBinary(){
+    protected boolean storeKeepBinary() {
         return false;
     }
 
@@ -532,7 +532,7 @@ public abstract class CacheJdbcPojoStoreAbstractSelfTest extends GridCommonAbstr
             assertEquals("Person-to-test-put-insert", rs.getString(4));
 
             assertEquals(testGender.toString(),
-                binaryMarshaller ? Gender.values()[rs.getInt(5)].toString(): rs.getString(5));
+                binaryMarshaller ? Gender.values()[rs.getInt(5)].toString() : rs.getString(5));
 
             assertFalse("Unexpected more data in result set", rs.next());
 
@@ -553,7 +553,7 @@ public abstract class CacheJdbcPojoStoreAbstractSelfTest extends GridCommonAbstr
             assertEquals("Person-to-test-put-update", rs.getString(4));
 
             assertEquals(testGender.toString(),
-                binaryMarshaller ? Gender.values()[rs.getInt(5)].toString(): rs.getString(5));
+                binaryMarshaller ? Gender.values()[rs.getInt(5)].toString() : rs.getString(5));
 
             assertFalse("Unexpected more data in result set", rs.next());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerSelfTest.java
index a77deb4..300abee 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.cache.store.jdbc;
 
-import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.internal.binary.BinaryMarshaller;
+import org.apache.ignite.marshaller.Marshaller;
 import org.junit.Test;
 
 /**
@@ -26,7 +26,7 @@ import org.junit.Test;
  */
 public class CacheJdbcPojoStoreBinaryMarshallerSelfTest extends CacheJdbcPojoStoreAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected Marshaller marshaller(){
+    @Override protected Marshaller marshaller() {
         return new BinaryMarshaller();
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest.java
index 829fffa..81470df 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest.java
@@ -22,7 +22,7 @@ package org.apache.ignite.cache.store.jdbc;
  */
 public class CacheJdbcPojoStoreBinaryMarshallerWithSqlEscapeSelfTest extends CacheJdbcPojoStoreBinaryMarshallerSelfTest {
     /** {@inheritDoc} */
-    @Override protected boolean sqlEscapeAll(){
+    @Override protected boolean sqlEscapeAll() {
         return true;
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 25ec53a..985b289 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -356,7 +356,7 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest<Cache
 
         IgniteBiInClosure<Object, Object> c = new CI2<Object, Object>() {
             @Override public void apply(Object k, Object v) {
-                if (binaryEnable){
+                if (binaryEnable) {
                     if (k instanceof BinaryObject && v instanceof BinaryObject) {
                         BinaryObject key = (BinaryObject)k;
                         BinaryObject val = (BinaryObject)v;
@@ -380,7 +380,7 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest<Cache
                             && BinaryTest.class.getName().equals(valType))
                             binaryTestVals.add(val.field("bytes"));
                     }
-                }else {
+                } else {
                     if (k instanceof OrganizationKey && v instanceof Organization)
                         orgKeys.add(k);
                     else if (k instanceof PersonKey && v instanceof Person)
diff --git a/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java b/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java
index ee6ac49..4be745c 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java
@@ -896,7 +896,7 @@ public class FunctionalTest {
                 t.join();
 
                 // New explicit transaction can be started after current transaction has been closed by another thread.
-                try (ClientTransaction tx1 = client.transactions().txStart(PESSIMISTIC, READ_COMMITTED)){
+                try (ClientTransaction tx1 = client.transactions().txStart(PESSIMISTIC, READ_COMMITTED)) {
                     cache.put(0, "value23");
 
                     tx1.commit();
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
index 8a6e4ce..205ef7b 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
@@ -271,7 +271,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
     private static void readFully(InputStream in, byte[] data) throws IOException {
         int read = 0;
 
-        while(read < data.length)
+        while (read < data.length)
             read += in.read(data, read, data.length - read);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
index 14ec280..283aba7 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java
@@ -38,7 +38,7 @@ public class IgfsTestInputGenerator {
 
         long start = System.currentTimeMillis();
 
-        OutputStream out = new BufferedOutputStream(new FileOutputStream(outFileName), 32*1024*1024);
+        OutputStream out = new BufferedOutputStream(new FileOutputStream(outFileName), 32 * 1024 * 1024);
 
         for (long i = 0; i < len; i++)
                 out.write(read(i));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 67ad942..3d345a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -145,7 +145,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
      * @param cache Ignite cache.
      * @throws Exception If failed.
      */
-    private void fillCache(final IgniteCache<Integer, Object> cache) throws Exception{
+    private void fillCache(final IgniteCache<Integer, Object> cache) throws Exception {
         final byte[] val = new byte[VAL_SIZE];
 
         for (int i = 0; i < MAX_VALS_AMOUNT * 4; i++)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterProcessorCheckGlobalStateComputeRequestTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterProcessorCheckGlobalStateComputeRequestTest.java
index 89d17b2..971657c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterProcessorCheckGlobalStateComputeRequestTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterProcessorCheckGlobalStateComputeRequestTest.java
@@ -31,7 +31,7 @@ public class ClusterProcessorCheckGlobalStateComputeRequestTest extends GridComm
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-        if(igniteInstanceName.equalsIgnoreCase("daemon"))
+        if (igniteInstanceName.equalsIgnoreCase("daemon"))
             cfg.setDaemon(true);
 
         return cfg;
@@ -46,12 +46,12 @@ public class ClusterProcessorCheckGlobalStateComputeRequestTest extends GridComm
         IgniteEx daemon = startGrid("daemon");
 
         // GridInternal annotation will cause the job and response message to execute on management pool.
-        for(int i = 0; i < 100; i++)
+        for (int i = 0; i < 100; i++)
             daemon.cluster().active();
 
         checkBeanAttribute(daemon, "Thread Pools", "GridManagementExecutor", "TaskCount", 100L);
 
-        for(int i = 0; i < 100; i++)
+        for (int i = 0; i < 100; i++)
             grid(0).cluster().active();
 
         checkBeanAttribute(grid(0), "Thread Pools", "GridManagementExecutor", "TaskCount", 100L);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java
index 5c5e37e..3a336da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java
@@ -152,7 +152,7 @@ public class DiagnosticLogForPartitionStatesTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     private void doTest(List<CacheConfiguration<Integer, Integer>> cfgs, boolean msgExp) throws Exception {
-        String name = (cfgs.size() == 1)? cfgs.get(0).getName() : cfgs.get(0).getGroupName();
+        String name = (cfgs.size() == 1) ? cfgs.get(0).getName() : cfgs.get(0).getGroupName();
 
         LogListener lsnr = LogListener
             .matches(s -> s.startsWith(String.format(PARTITION_STATE_FAILED_MSG, name, ANY_MSG)))
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
index 0d8ac12..1c44ad1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
@@ -116,7 +116,7 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest {
 
         // One is definitely processed. But there might be some more processed or cancelled or processed and cancelled.
         // Thus total number should be at least SPLIT_COUNT and at most (SPLIT_COUNT - 1) *2 +1
-        assert (cancelCnt + processedCnt) >= SPLIT_COUNT && (cancelCnt + processedCnt) <= (SPLIT_COUNT - 1) * 2 +1 :
+        assert (cancelCnt + processedCnt) >= SPLIT_COUNT && (cancelCnt + processedCnt) <= (SPLIT_COUNT - 1) * 2 + 1 :
             "Invalid cancel count value: " + cancelCnt;
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
index 0afc274..bb50268 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
@@ -98,7 +98,7 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest {
             try {
                 ComputeTaskFuture<String> fut;
 
-                synchronized(mux){
+                synchronized (mux) {
                     fut = ignite1.compute().executeAsync(JobTask.class, null);
 
                     mux.wait();
@@ -171,7 +171,7 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest {
 
                     if (!nodeId.equals(argument(0))) {
                         try {
-                            synchronized(mux) {
+                            synchronized (mux) {
                                 mux.notifyAll();
                             }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
index 35d5204..ea598d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
@@ -41,7 +41,7 @@ public class GridGetOrStartSelfTest extends GridCommonAbstractTest {
     @Test
     public void testDefaultIgniteInstanceGetOrStart() throws Exception {
         IgniteConfiguration cfg = getConfiguration(null);
-        try(Ignite ignite = Ignition.getOrStart(cfg)) {
+        try (Ignite ignite = Ignition.getOrStart(cfg)) {
             try {
                 Ignition.start(cfg);
                 fail("Expected exception after grid started");
@@ -59,7 +59,7 @@ public class GridGetOrStartSelfTest extends GridCommonAbstractTest {
     @Test
     public void testNamedIgniteInstanceGetOrStart() throws Exception {
         IgniteConfiguration cfg = getConfiguration("test");
-        try(Ignite ignite = Ignition.getOrStart(cfg)) {
+        try (Ignite ignite = Ignition.getOrStart(cfg)) {
             try {
                 Ignition.start(cfg);
                 fail("Expected exception after grid started");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
index bbd8ada..dbc7397 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
@@ -105,7 +105,7 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest {
                 assert cancelCnt <= SPLIT_COUNT : "Invalid cancel count: " + cancelCnt;
 
                 // One per start and one per stop and some that come with metrics update.
-                assert colResolutionCnt > SPLIT_COUNT + 1:
+                assert colResolutionCnt > SPLIT_COUNT + 1 :
                     "Invalid collision resolution count: " + colResolutionCnt;
             }
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
index 2423867..b9470c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
@@ -58,7 +58,7 @@ public class GridJobContextSelfTest extends GridCommonAbstractTest {
                 stopGrid(2);
             }
         }
-        finally{
+        finally {
             stopGrid(1);
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
index 1e58047..95258cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
@@ -250,7 +250,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
      * or on remote nodes if there are any. Never on both.
      */
     @SuppressWarnings({"PublicInnerClass"})
-    @ComputeTaskName(value="GridDeploymentTestTask")
+    @ComputeTaskName(value = "GridDeploymentTestTask")
     public static class GridDeploymentTestTask extends ComputeTaskAdapter<Object, Object> {
         /** Ignite instance. */
         @IgniteInstanceResource
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
index 010ed6a..09c30a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
@@ -98,7 +98,7 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Collection<? extends ComputeJob> split(int gridSize, Object arg) {
-            Collection<ComputeJob> refs = new ArrayList<>(gridSize*5);
+            Collection<ComputeJob> refs = new ArrayList<>(gridSize * 5);
 
             for (int i = 0; i < gridSize * 5; i++)
                 refs.add(new GridTestJob(arg.toString() + i + 1));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 320f645..29e773f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -316,12 +316,12 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
 
         assertEquals(20, staticCache.get(20));
 
-        for(int i = 0; i < 100; i++) {
+        for (int i = 0; i < 100; i++) {
             srv.cache(nearCache.getName()).put(i, 22);
             Object actual = nearCache.localPeek(i);
             // Change of topology may start partitions moving. It leads to invalidate near cache and
             // null-values can be valid in such case.
-            if(actual == null) {
+            if (actual == null) {
                 actual = nearCache.get(i);
                 assertEquals(22, actual);
                 actual = nearCache.localPeek(i);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
index e1061ec..7f18087 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
@@ -96,7 +96,7 @@ public class IgniteConnectionConcurrentReserveAndRemoveTest extends GridCommonAb
         for (GridCommunicationClient c : arr) {
             client = (GridTcpNioCommunicationClient)c;
 
-            if(client != null) {
+            if (client != null) {
                 assertTrue(client.session().outRecoveryDescriptor().reserved());
 
                 assertFalse(client.session().outRecoveryDescriptor().connected());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
index a258028..ea26f2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.Callable;
-
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
@@ -248,7 +247,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
     private void checkInstanceFromBytes(BinaryContext binCtx, int ord, int typeId, String clsName)
         throws IgniteCheckedException {
 
-        BinaryEnumObjectImpl srcBinEnum =new BinaryEnumObjectImpl(binCtx, typeId, clsName, ord);
+        BinaryEnumObjectImpl srcBinEnum = new BinaryEnumObjectImpl(binCtx, typeId, clsName, ord);
 
         Marshaller marsh = node1.configuration().getMarshaller();
 
@@ -475,7 +474,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
     public void testEnumWrongBinaryConfig() throws Exception {
         this.register = true;
 
-        GridTestUtils.assertThrows(log, new Callable<Object> (){
+        GridTestUtils.assertThrows(log, new Callable<Object> () {
             @Override public Object call() throws Exception {
                 startGrid(WRONG_CONF_NODE_NAME);
 
@@ -493,7 +492,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
     public void testEnumValidation() throws Exception {
         startUp(false);
 
-        GridTestUtils.assertThrows(log, new Callable<Object> (){
+        GridTestUtils.assertThrows(log, new Callable<Object> () {
 
             @Override public Object call() throws Exception {
 
@@ -520,7 +519,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
         node1.binary().registerEnum(enumName,
                 F.asMap(EnumType.ONE.name(), EnumType.ONE.ordinal()));
 
-        GridTestUtils.assertThrows(log, new Callable<Object> (){
+        GridTestUtils.assertThrows(log, new Callable<Object> () {
 
             @Override public Object call() throws Exception {
 
@@ -531,7 +530,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
             }
         }, BinaryObjectException.class, "Conflicting enum values. Name ");
 
-        GridTestUtils.assertThrows(log, new Callable<Object> (){
+        GridTestUtils.assertThrows(log, new Callable<Object> () {
             @Override public Object call() throws Exception {
 
                 node2.binary().registerEnum(enumName,
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
index 0eb1788..cbf59a5d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
@@ -24,9 +24,9 @@ import java.util.UUID;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.binary.BinaryBasicNameMapper;
 import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.binary.Binarylizable;
 import org.apache.ignite.binary.BinaryReader;
 import org.apache.ignite.binary.BinaryWriter;
+import org.apache.ignite.binary.Binarylizable;
 import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
@@ -167,7 +167,7 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
     }
 
     /** */
-    private static class Value1{
+    private static class Value1 {
         /** */
         Value2 objVal = new Value2();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java
index b09ccc7..5fec63b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java
@@ -160,7 +160,7 @@ public abstract class AbstractEncryptionTest extends GridCommonAbstractTest {
 
         assertNotNull(cache);
 
-        for (long i=0; i<100; i++)
+        for (long i = 0; i < 100; i++)
             assertEquals("" + i, cache.get(i));
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheBigEntryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheBigEntryTest.java
index 045c444..9220202 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheBigEntryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheBigEntryTest.java
@@ -108,7 +108,7 @@ public class EncryptedCacheBigEntryTest extends AbstractEncryptionTest {
 
         byte[] bigArr = new byte[arrSz];
 
-        for (int i=0; i<bigArr.length; i++)
+        for (int i = 0; i < bigArr.length; i++)
             bigArr[i] = (byte)i;
 
         return bigArr;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java
index 17b5ab4..d0d2019 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java
@@ -123,8 +123,8 @@ public class EncryptedCacheCreateTest extends AbstractEncryptionTest {
         String encValPart = "AAAAAAAAAA";
         String plainValPart = "BBBBBBBBBB";
 
-        StringBuilder longEncVal = new StringBuilder(encValPart.length()*100);
-        StringBuilder longPlainVal = new StringBuilder(plainValPart.length()*100);
+        StringBuilder longEncVal = new StringBuilder(encValPart.length() * 100);
+        StringBuilder longPlainVal = new StringBuilder(plainValPart.length() * 100);
 
         for (int i = 0; i < 100; i++) {
             longEncVal.append(encValPart);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCachePreconfiguredRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCachePreconfiguredRestartTest.java
index 96fdf29..fa39c12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCachePreconfiguredRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCachePreconfiguredRestartTest.java
@@ -84,7 +84,7 @@ public class EncryptedCachePreconfiguredRestartTest extends EncryptedCacheRestar
     @Override protected void createEncryptedCache(IgniteEx grid0, IgniteEx grid1, String cacheName, String groupName) {
         IgniteCache<Long, String> cache = grid0.cache(cacheName());
 
-        for (long i=0; i<100; i++)
+        for (long i = 0; i < 100; i++)
             cache.put(i, "" + i);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java
index bf4d1ac..abb5fb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java
@@ -426,7 +426,7 @@ public class GridIoManagerFileTransmissionSelfTest extends GridCommonAbstractTes
             }
         });
 
-        rcv.context().io().addTransmissionHandler(topic, new DefaultTransmissionHandler(rcv, fileToSend, tempStore){
+        rcv.context().io().addTransmissionHandler(topic, new DefaultTransmissionHandler(rcv, fileToSend, tempStore) {
             /** {@inheritDoc} */
             @Override public String filePath(UUID nodeId, TransmissionMeta fileMeta) {
                 return new File(downloadTo, fileMeta.name()).getAbsolutePath();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index 86d464b..6917dbe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -66,7 +66,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA
         cfg.setDeploymentMode(mode);
         cfg.setPeerClassLoadingEnabled(p2pEnabled);
 
-        if(secEnabled)
+        if (secEnabled)
             cfg.setPluginProviders(new TestReconnectSecurityPluginProvider());
 
         return cfg;
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 736ba71..2edb190 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
@@ -213,11 +213,11 @@ public class OptimizedMarshallerTest extends GridCommonAbstractTest {
 
         SomeSimpleSerializable newObj = new SomeSimpleSerializable();
 
-        assert(newObj.flag);
+        assert (newObj.flag);
 
         newObj.setFlagValue(false);
 
-        assert(! newObj.flag);
+        assert (!newObj.flag);
 
         SomeSimpleSerializable outObj = marsh.unmarshal(marsh.marshal(newObj), null);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
index 4b48a22..ff695d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
@@ -2365,12 +2365,12 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
     /** */
     static class BadDeserializableValue implements Serializable {
         /** */
-        private void writeObject(ObjectOutputStream os) throws IOException{
+        private void writeObject(ObjectOutputStream os) throws IOException {
             os.write(10);
         }
 
         /** */
-        private void readObject(ObjectInputStream os){
+        private void readObject(ObjectInputStream os) {
             throw new RuntimeException("bad object");
         }
     }
@@ -2384,12 +2384,12 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
     /** */
     static class BadSerializableValue implements Serializable {
         /** */
-        private void writeObject(ObjectOutputStream os){
+        private void writeObject(ObjectOutputStream os) {
             throw new RuntimeException("bad object");
         }
 
         /** */
-        private void readObject(ObjectInputStream os){
+        private void readObject(ObjectInputStream os) {
             throw new RuntimeException("bad object");
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/CacheMetricsAddRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/CacheMetricsAddRemoveTest.java
index 11a4875..1cdb6de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/CacheMetricsAddRemoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/CacheMetricsAddRemoveTest.java
@@ -162,7 +162,7 @@ public class CacheMetricsAddRemoveTest extends GridCommonAbstractTest {
 
     /** */
     private void checkMetricsNotEmpty(String cachePrefix) {
-        for (int i=0; i<2; i++) {
+        for (int i = 0; i < 2; i++) {
             GridMetricManager mmgr = metricManager(i);
 
             MetricRegistry mreg = mmgr.registry(cachePrefix);
@@ -181,7 +181,7 @@ public class CacheMetricsAddRemoveTest extends GridCommonAbstractTest {
 
     /** */
     private void checkMetricsEmpty(String cachePrefix) {
-        for (int i=0; i<3; i++) {
+        for (int i = 0; i < 3; i++) {
             GridMetricManager mmgr = metricManager(i);
 
             MetricRegistry mreg = mmgr.registry(cachePrefix);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
index 1ab3438..6377ea2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
@@ -630,7 +630,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
             assertTrue(((long)txv.get("startTime")) <= System.currentTimeMillis());
 
             //Only pessimistic transactions are supported when MVCC is enabled.
-            if(Objects.equals(System.getProperty(IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS), "true"))
+            if (Objects.equals(System.getProperty(IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS), "true"))
                 return;
 
             GridTestUtils.runMultiThreadedAsync(() -> {
@@ -649,7 +649,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
 
             assertTrue(res);
 
-            for (int i=0; i<9; i++) {
+            for (int i = 0; i < 9; i++) {
                 txv = systemView(TXS_MON_LIST).get(new Object[] {i});
 
                 if (PESSIMISTIC.name().equals(txv.get("concurrency")))
@@ -747,7 +747,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
     /** */
     @Test
     public void testScanQuery() throws Exception {
-        try(IgniteEx client1 = startClientGrid("client-1");
+        try (IgniteEx client1 = startClientGrid("client-1");
             IgniteEx client2 = startClientGrid("client-2")) {
 
             IgniteCache<Integer, Integer> cache1 = client1.createCache(
@@ -801,7 +801,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
 
         assertEquals(36, mbn.getMBeanInfo().getAttributes().length);
 
-        assertFalse(stream(mbn.getMBeanInfo().getAttributes()).anyMatch(a-> F.isEmpty(a.getDescription())));
+        assertFalse(stream(mbn.getMBeanInfo().getAttributes()).anyMatch(a -> F.isEmpty(a.getDescription())));
 
         assertFalse(F.isEmpty((String)mbn.getAttribute("fullVersion")));
         assertFalse(F.isEmpty((String)mbn.getAttribute("copyright")));
@@ -917,7 +917,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
 
         TabularDataSupport qrySysView = systemView(server, SCAN_QRY_SYS_VIEW);
 
-        for (int i=0; i < qrySysView.size(); i++) {
+        for (int i = 0; i < qrySysView.size(); i++) {
             CompositeData view = systemView(SCAN_QRY_SYS_VIEW).get(new Object[] {i});
 
             if ("cache2".equals(view.get("cacheName"))) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/LogExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/LogExporterSpiTest.java
index e3eccfa..6d8668d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/LogExporterSpiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/LogExporterSpiTest.java
@@ -87,7 +87,7 @@ public class LogExporterSpiTest extends AbstractExporterSpiTest {
         assertTrue(res);
 
         log.registerListener(s -> {
-            if(s.contains(FILTERED_PREFIX))
+            if (s.contains(FILTERED_PREFIX))
                 fail("Filtered prefix shouldn't export.");
         });
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsSelfTest.java
index 80d3cdc..45ac6a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsSelfTest.java
@@ -70,7 +70,7 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
 
         run(l::increment, 100);
 
-        assertEquals(100*100, l.value());
+        assertEquals(100 * 100, l.value());
 
         l.reset();
 
@@ -84,7 +84,7 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
 
         run(l::increment, 100);
 
-        assertEquals(100*100, l.value());
+        assertEquals(100 * 100, l.value());
 
         l.reset();
 
@@ -98,7 +98,7 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
 
         run(() -> l.add(1), 100);
 
-        assertEquals(100*100f, l.value(), .000001);
+        assertEquals(100 * 100f, l.value(), .000001);
 
         l.reset();
 
@@ -112,7 +112,7 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
 
         run(() -> l.add(1), 100);
 
-        assertEquals(100*100, l.value());
+        assertEquals(100 * 100, l.value());
 
         l.reset();
 
@@ -242,17 +242,17 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
         }));
 
         futs.add(runAsync(() -> {
-            for (int i = 0; i < cnt*2; i++)
+            for (int i = 0; i < cnt * 2; i++)
                 h.value(99);
         }));
 
         futs.add(runAsync(() -> {
-            for (int i = 0; i < cnt*3; i++)
+            for (int i = 0; i < cnt * 3; i++)
                 h.value(500);
         }));
 
         futs.add(runAsync(() -> {
-            for (int i = 0; i < cnt*4; i++)
+            for (int i = 0; i < cnt * 4; i++)
                 h.value(501);
         }));
 
@@ -262,9 +262,9 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
         long[] res = h.value();
 
         assertEquals(cnt, res[0]);
-        assertEquals(cnt*2, res[1]);
-        assertEquals(cnt*3, res[2]);
-        assertEquals(cnt*4, res[3]);
+        assertEquals(cnt * 2, res[1]);
+        assertEquals(cnt * 3, res[2]);
+        assertEquals(cnt * 4, res[3]);
     }
 
     /** */
@@ -365,7 +365,7 @@ public class MetricsSelfTest extends GridCommonAbstractTest {
     private void run(Runnable r, int cnt) throws org.apache.ignite.IgniteCheckedException {
         List<IgniteInternalFuture> futs = new ArrayList<>();
 
-        for (int i=0; i<cnt; i++) {
+        for (int i = 0; i < cnt; i++) {
             futs.add(runAsync(() -> {
                 for (int j = 0; j < cnt; j++)
                     r.run();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
index a7932ec..af0cd71 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
@@ -500,7 +500,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
     /** */
     @Test
     public void testContinuousQuery() throws Exception {
-        try(IgniteEx originNode = startGrid(0); IgniteEx remoteNode = startGrid(1)) {
+        try (IgniteEx originNode = startGrid(0); IgniteEx remoteNode = startGrid(1)) {
             IgniteCache<Integer, Integer> cache = originNode.createCache("cache-1");
 
             SystemView<ContinuousQueryView> origQrys = originNode.context().systemView().view(CQ_SYS_VIEW);
@@ -509,7 +509,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
             assertEquals(0, origQrys.size());
             assertEquals(0, remoteQrys.size());
 
-            try(QueryCursor qry = cache.query(new ContinuousQuery<>()
+            try (QueryCursor qry = cache.query(new ContinuousQuery<>()
                 .setInitialQuery(new ScanQuery<>())
                 .setPageSize(100)
                 .setTimeInterval(1000)
@@ -518,7 +518,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
                 })
                 .setRemoteFilterFactory(() -> evt -> true)
             )) {
-                for (int i=0; i<100; i++)
+                for (int i = 0; i < 100; i++)
                     cache.put(i, i);
 
                 checkContinuousQueryView(originNode, origQrys, true);
@@ -554,12 +554,12 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
     /** */
     @Test
     public void testNodes() throws Exception {
-        try(IgniteEx g1 = startGrid(0)) {
+        try (IgniteEx g1 = startGrid(0)) {
             SystemView<ClusterNodeView> views = g1.context().systemView().view(NODES_SYS_VIEW);
 
             assertEquals(1, views.size());
 
-            try(IgniteEx g2 = startGrid(1)) {
+            try (IgniteEx g2 = startGrid(1)) {
                 awaitPartitionMapExchange();
 
                 checkViewsState(views, g1.localNode(), g2.localNode());
@@ -604,7 +604,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
     /** */
     @Test
     public void testTransactions() throws Exception {
-        try(IgniteEx g = startGrid(0)) {
+        try (IgniteEx g = startGrid(0)) {
             IgniteCache<Integer, Integer> cache1 = g.createCache(new CacheConfiguration<Integer, Integer>("c1")
                 .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL));
 
@@ -621,7 +621,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
                 AtomicInteger cntr = new AtomicInteger();
 
                 GridTestUtils.runMultiThreadedAsync(() -> {
-                    try(Transaction tx = g.transactions().withLabel("test").txStart(PESSIMISTIC, REPEATABLE_READ)) {
+                    try (Transaction tx = g.transactions().withLabel("test").txStart(PESSIMISTIC, REPEATABLE_READ)) {
                         cache1.put(cntr.incrementAndGet(), cntr.incrementAndGet());
                         cache1.put(cntr.incrementAndGet(), cntr.incrementAndGet());
 
@@ -658,11 +658,11 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
                 assertEquals(String.valueOf(cacheId(cache1.getName())), txv.cacheIds());
 
                 //Only pessimistic transactions are supported when MVCC is enabled.
-                if(Objects.equals(System.getProperty(IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS), "true"))
+                if (Objects.equals(System.getProperty(IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS), "true"))
                     return;
 
                 GridTestUtils.runMultiThreadedAsync(() -> {
-                    try(Transaction tx = g.transactions().txStart(OPTIMISTIC, SERIALIZABLE)) {
+                    try (Transaction tx = g.transactions().txStart(OPTIMISTIC, SERIALIZABLE)) {
                         cache1.put(cntr.incrementAndGet(), cntr.incrementAndGet());
                         cache1.put(cntr.incrementAndGet(), cntr.incrementAndGet());
                         cache2.put(cntr.incrementAndGet(), cntr.incrementAndGet());
@@ -719,7 +719,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
     /** */
     @Test
     public void testLocalScanQuery() throws Exception {
-        try(IgniteEx g0 = startGrid(0)) {
+        try (IgniteEx g0 = startGrid(0)) {
             IgniteCache<Integer, Integer> cache1 = g0.createCache(
                 new CacheConfiguration<Integer, Integer>("cache1")
                     .setGroupName("group1"));
@@ -782,7 +782,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
     /** */
     @Test
     public void testScanQuery() throws Exception {
-        try(IgniteEx g0 = startGrid(0);
+        try (IgniteEx g0 = startGrid(0);
             IgniteEx g1 = startGrid(1);
             IgniteEx client1 = startClientGrid("client-1");
             IgniteEx client2 = startClientGrid("client-2")) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
index d854304..cd54d7b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
@@ -203,7 +203,7 @@ public class GridAffinityAssignmentV2Test {
     public void testBackupsMoreThanThreshold() {
         List<ClusterNode> nodes = new ArrayList<>();
 
-        for(int i = 0; i < 10; i++)
+        for (int i = 0; i < 10; i++)
             nodes.add(node(metrics, ver, "1" + i));
 
         GridAffinityAssignment gridAffinityAssignment = new GridAffinityAssignment(
@@ -225,7 +225,7 @@ public class GridAffinityAssignmentV2Test {
     public void testSerialization() throws IOException, ClassNotFoundException {
         List<ClusterNode> nodes = new ArrayList<>();
 
-        for(int i = 0; i < 10; i++)
+        for (int i = 0; i < 10; i++)
             nodes.add(node(metrics, ver, "1" + i));
 
         GridAffinityAssignmentV2 gridAffinityAssignment2 = new GridAffinityAssignmentV2(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridHistoryAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridHistoryAffinityAssignmentTest.java
index cf6eb68..3b4ab3a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridHistoryAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridHistoryAffinityAssignmentTest.java
@@ -54,7 +54,7 @@ public class GridHistoryAffinityAssignmentTest extends GridCommonAbstractTest {
         List<List<ClusterNode>> curr = new ArrayList<>();
         List<List<ClusterNode>> ideal = new ArrayList<>();
 
-        for(int i = 0; i < cnt; i++) {
+        for (int i = 0; i < cnt; i++) {
             List<ClusterNode> nodes = Arrays.asList(new GridTestNode(UUID.randomUUID()), new GridTestNode(UUID.randomUUID()));
             curr.add(nodes);
             ideal.add(Arrays.asList(nodes.get(1), nodes.get(0)));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ActiveOnStartPropertyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ActiveOnStartPropertyTest.java
index 2b0f147..fa8b5e5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ActiveOnStartPropertyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ActiveOnStartPropertyTest.java
@@ -129,7 +129,7 @@ public class ActiveOnStartPropertyTest extends GridCommonAbstractTest {
 
         startGrids(nodeCnt);
 
-        for (int i=0; i < nodeCnt; i++) {
+        for (int i = 0; i < nodeCnt; i++) {
             assertEquals(activeOnStart, grid(i).configuration().isActiveOnStart());
 
             assertNull(grid(i).configuration().getClusterStateOnStart());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AutoActivationPropertyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AutoActivationPropertyTest.java
index 1838d3a..c14b1eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AutoActivationPropertyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AutoActivationPropertyTest.java
@@ -107,7 +107,7 @@ public class AutoActivationPropertyTest extends GridCommonAbstractTest {
 
         IgniteEx crd = startGrids(nodeCnt);
 
-        for (int i=0; i < nodeCnt; i++) {
+        for (int i = 0; i < nodeCnt; i++) {
             assertEquals(autoActivation, grid(i).configuration().isAutoActivationEnabled());
 
             assertNull(grid(i).configuration().getClusterStateOnStart());
@@ -119,7 +119,7 @@ public class AutoActivationPropertyTest extends GridCommonAbstractTest {
 
         crd = startGrids(nodeCnt);
 
-        for (int i=0; i < nodeCnt; i++)
+        for (int i = 0; i < nodeCnt; i++)
             assertEquals(autoActivation ? ACTIVE : INACTIVE, crd.cluster().state());
 
         for (String name : logListeners.keySet())
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
index ac23e28..f484605 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
@@ -591,7 +591,7 @@ public class CacheGroupsMetricsRebalanceTest extends GridCommonAbstractTest {
             }
         }, 5_000);
 
-        assert(cache.localMetrics().getRebalancingStartTime() < U.currentTimeMillis() + REBALANCE_DELAY);
-        assert(cache.localMetrics().getRebalancingStartTime() > beforeStartTime + REBALANCE_DELAY);
+        assert (cache.localMetrics().getRebalancingStartTime() < U.currentTimeMillis() + REBALANCE_DELAY);
+        assert (cache.localMetrics().getRebalancingStartTime() > beforeStartTime + REBALANCE_DELAY);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheIgniteOutOfMemoryExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheIgniteOutOfMemoryExceptionTest.java
index b8cd9db..a725490 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheIgniteOutOfMemoryExceptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheIgniteOutOfMemoryExceptionTest.java
@@ -147,7 +147,7 @@ public class CacheIgniteOutOfMemoryExceptionTest extends GridCommonAbstractTest
                 cache.clear();
             }
             catch (Exception e) {
-                fail("Clearing the cache should not trigger any exception [exc=" + e +']');
+                fail("Clearing the cache should not trigger any exception [exc=" + e + ']');
             }
 
             assertFalse("Failure handler should not be called during clearing the cache.", failure.get());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateOnStartPropertyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateOnStartPropertyTest.java
index df2ff52..35675c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateOnStartPropertyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateOnStartPropertyTest.java
@@ -285,7 +285,7 @@ public class ClusterStateOnStartPropertyTest extends GridCommonAbstractTest {
 
         startGrids(NODES_CNT);
 
-        for (int i=0; i < NODES_CNT; i++) {
+        for (int i = 0; i < NODES_CNT; i++) {
             checkNodeConfig(grid(i).configuration(), false, state, null, activeOnStart);
 
             assertEquals(state, grid(i).cluster().state());
@@ -314,7 +314,7 @@ public class ClusterStateOnStartPropertyTest extends GridCommonAbstractTest {
 
         crd.cluster().state(ACTIVE);
 
-        for (int i=0; i < NODES_CNT; i++) {
+        for (int i = 0; i < NODES_CNT; i++) {
             checkNodeConfig(grid(i).configuration(), true, state, autoActivation, null);
 
             assertEquals(ACTIVE, grid(i).cluster().state());
@@ -327,7 +327,7 @@ public class ClusterStateOnStartPropertyTest extends GridCommonAbstractTest {
 
         startGrids(NODES_CNT);
 
-        for (int i=0; i < NODES_CNT; i++)
+        for (int i = 0; i < NODES_CNT; i++)
             assertEquals(state, grid(i).cluster().state());
     }
 
@@ -343,7 +343,7 @@ public class ClusterStateOnStartPropertyTest extends GridCommonAbstractTest {
 
         startGrids(NODES_CNT);
 
-        for (int i=0; i < NODES_CNT; i++) {
+        for (int i = 0; i < NODES_CNT; i++) {
             checkNodeConfig(grid(i).configuration(), false, state, null, null);
 
             assertEquals(state, grid(i).cluster().state());
@@ -366,7 +366,7 @@ public class ClusterStateOnStartPropertyTest extends GridCommonAbstractTest {
 
         crd.cluster().state(ACTIVE);
 
-        for (int i=0; i < NODES_CNT; i++) {
+        for (int i = 0; i < NODES_CNT; i++) {
             checkNodeConfig(grid(i).configuration(), true, state, null, null);
 
             assertEquals(ACTIVE, grid(i).cluster().state());
@@ -376,7 +376,7 @@ public class ClusterStateOnStartPropertyTest extends GridCommonAbstractTest {
 
         startGrids(NODES_CNT);
 
-        for (int i=0; i < NODES_CNT; i++)
+        for (int i = 0; i < NODES_CNT; i++)
             assertEquals(state, grid(i).cluster().state());
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
index 0df1743..db97aef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
@@ -193,7 +193,7 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest {
         if (MvccFeatureChecker.forcedMvcc()) {
             assert !nearCacheEnabled();
 
-            if(writeSync != CacheWriteSynchronizationMode.FULL_SYNC)
+            if (writeSync != CacheWriteSynchronizationMode.FULL_SYNC)
                 return;
         }
 
@@ -206,7 +206,7 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest {
             txOperations(PESSIMISTIC, REPEATABLE_READ, crossCacheTx, false);
             txOperations(PESSIMISTIC, REPEATABLE_READ, crossCacheTx, true);
 
-            if(!MvccFeatureChecker.forcedMvcc()) {
+            if (!MvccFeatureChecker.forcedMvcc()) {
                 txOperations(OPTIMISTIC, REPEATABLE_READ, crossCacheTx, false);
                 txOperations(OPTIMISTIC, REPEATABLE_READ, crossCacheTx, true);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 3103f8d..984ffdf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3958,7 +3958,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         }
 
         if (async) {
-            if(oldAsync) {
+            if (oldAsync) {
                 IgniteCache<String, Integer> asyncCache = jcache().withAsync();
 
                 asyncCache.clear();
@@ -6136,7 +6136,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
     public void testTransformResourceInjection() throws Exception {
         ClusterGroup servers = grid(0).cluster().forServers();
 
-        if(F.isEmpty(servers.nodes()))
+        if (F.isEmpty(servers.nodes()))
             return;
 
         grid(0).services( grid(0).cluster()).deployNodeSingleton(SERVICE_NAME1, new DummyServiceImpl());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 14963e6..d71ea7a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -854,7 +854,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
         /**
          * Clear store.
          */
-        public void clear(){
+        public void clear() {
             map.clear();
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index a3f906a..5556d34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -389,7 +389,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
 
                 cache.put(i, i);
 
-                if(keys.size() == 3)
+                if (keys.size() == 3)
                     break;
             }
         }
@@ -862,7 +862,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
 
         awaitMetricsUpdate(1);
 
-        assertEquals(KEY_CNT/2, cache.metrics().getCacheSize());
+        assertEquals(KEY_CNT / 2, cache.metrics().getCacheSize());
 
         assertEquals(cache.localSizeLong(CachePeekMode.PRIMARY), cache.localMetrics().getCacheSize());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
index b66a485..2625e56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
@@ -181,7 +181,7 @@ public abstract class GridCacheAbstractUsersAffinityMapperSelfTest extends GridC
     /**
      * Users affinity mapper.
      */
-    private static class UsersAffinityKeyMapper extends GridCacheDefaultAffinityKeyMapper{
+    private static class UsersAffinityKeyMapper extends GridCacheDefaultAffinityKeyMapper {
         /** {@inheritDoc} */
         @Override public Object affinityKey(Object key) {
             GridArgumentCheck.notNull(key, "key");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
index 2cef945..11a150b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
@@ -80,14 +80,14 @@ public class GridCacheAtomicEntryProcessorDeploymentSelfTest extends GridCommonA
     /**
      * @return Cache.
      */
-    protected IgniteCache getCache(){
+    protected IgniteCache getCache() {
         return grid(1).cache(DEFAULT_CACHE_NAME);
     }
 
     /**
      * @return Entry Processor.
      */
-    protected String getEntryProcessor(){
+    protected String getEntryProcessor() {
        return GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) != null ?
             GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) :
             "org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
index a8f8dca..325413b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -456,7 +456,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
         loadAll(cache, vals.keySet(), true);
 
-        assert cache.size() == 0: "Cache is not empty.";
+        assert cache.size() == 0 : "Cache is not empty.";
 
         checkLastMethod("loadAll");
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
index 4fc155b..5d5afef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.testframework.GridTestUtils.runAsync;
 /**
  *
  */
-public class GridCacheConcurrentGetCacheOnClientTest extends GridCommonAbstractTest{
+public class GridCacheConcurrentGetCacheOnClientTest extends GridCommonAbstractTest {
     /**
      *
      */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index d9ed5a0..42c1c5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -167,7 +167,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
                 }
 
                 // Go through iterators.
-                while(it.hasNext())
+                while (it.hasNext())
                     it.next();
 
                 // Make sure that hard references are gone.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeLoadTest.java
index f570e19..7fc22cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeLoadTest.java
@@ -599,7 +599,7 @@ public class GridCacheConcurrentTxMultiNodeLoadTest extends GridCommonAbstractTe
                                 GridNearCacheEntry nearEntry = (GridNearCacheEntry)near.peekEx(k);
                                 GridDhtCacheEntry dhtEntry = (GridDhtCacheEntry)dht.peekEx(k);
 
-                                X.println("Near entry [igniteInstanceName="+ g.name() + ", key=" + k + ", entry=" +
+                                X.println("Near entry [igniteInstanceName=" + g.name() + ", key=" + k + ", entry=" +
                                     nearEntry);
                                 X.println("DHT entry [igniteInstanceName=" + g.name() + ", key=" + k + ", entry=" +
                                     dhtEntry);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
index 776f815..2d9ee46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java
@@ -269,7 +269,7 @@ public class GridCacheGenericTestStore<K, V> implements CacheStore<K, V> {
             try {
                 U.sleep(operationDelay);
             }
-            catch(IgniteInterruptedCheckedException e) {
+            catch (IgniteInterruptedCheckedException e) {
                 throw new IgniteException(e);
             }
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
index b7bd7034..7a98200 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
@@ -300,11 +300,11 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
         Collection<CacheEntry<String, Integer>> c;
         Map<String, Integer> map;
 
-        if (needVer){
+        if (needVer) {
             c = cache.getEntries(keys);
 
             assertTrue(c.isEmpty());
-        }else {
+        } else {
             map = cache.getAll(keys);
 
             for (String key : keys)
@@ -1587,7 +1587,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
 
             Object ret = retInterceptor.onBeforePut(entry, newVal);
 
-            System.out.println("Before put [key=" + entry.getKey() + ", oldVal=" + entry.getValue()+ ", newVal=" + newVal
+            System.out.println("Before put [key=" + entry.getKey() + ", oldVal=" + entry.getValue() + ", newVal=" + newVal
                 + ", ret=" + ret + ']');
 
             invokeCnt.incrementAndGet();
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 97a5e35..deaa9a6 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
@@ -130,7 +130,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
 
             assertEquals(10, cache.get(key));
 
-            if(((IgniteCacheProxy)cache).context().config().getAtomicityMode() != CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT) {
+            if (((IgniteCacheProxy)cache).context().config().getAtomicityMode() != CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT) {
                 try (Transaction ignored = grid.transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) {
                     assertEquals(10, cache.get(key));
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index b11f172..ac7d90c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -242,7 +242,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCommonAbst
             for (int i = 0; i < ITER_CNT; i++)
                 cache.put(new TestKey(i, i), new TestValue(i));
 
-            interceptor.delegate(new CacheInterceptorAdapter<TestKey, TestValue>(){
+            interceptor.delegate(new CacheInterceptorAdapter<TestKey, TestValue>() {
                 @Override public TestValue onBeforePut(Cache.Entry<TestKey, TestValue> entry, TestValue newVal) {
                     // Check that we have correct value and key.
                     assertEquals(entry.getKey().key(), entry.getKey().field());
@@ -496,7 +496,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCommonAbst
         /**
          * @return key Key.
          */
-        public int key(){
+        public int key() {
             return key;
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java
index 3fb8de1..3a90933 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySqlFieldInlineSizeSelfTest.java
@@ -49,9 +49,9 @@ public class GridCacheQuerySqlFieldInlineSizeSelfTest extends GridCommonAbstract
         assertEquals(2, ent.getIndexes().size());
 
         for (QueryIndex idx : ent.getIndexes()) {
-            if(idx.getFields().containsKey("val0"))
+            if (idx.getFields().containsKey("val0"))
                 assertEquals(10, idx.getInlineSize());
-            else if(idx.getFields().containsKey("val1"))
+            else if (idx.getFields().containsKey("val1"))
                 assertEquals(20, idx.getInlineSize());
         }
     }
@@ -129,7 +129,7 @@ public class GridCacheQuerySqlFieldInlineSizeSelfTest extends GridCommonAbstract
     /**
      *
      */
-    @QueryGroupIndex(name="idx", inlineSize = 10)
+    @QueryGroupIndex(name = "idx", inlineSize = 10)
     static class TestValueGroupIndex {
         /** */
         @QuerySqlField(orderedGroups = @QuerySqlField.Group(name = "idx", order = 0))
@@ -143,7 +143,7 @@ public class GridCacheQuerySqlFieldInlineSizeSelfTest extends GridCommonAbstract
     /**
      *
      */
-    @QueryGroupIndex(name="idx")
+    @QueryGroupIndex(name = "idx")
     static class TestValueGroupIndexInvalidAnnotation {
         /** */
         @QuerySqlField(orderedGroups = @QuerySqlField.Group(name = "idx", order = 0))
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridEvictionPolicyMBeansTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridEvictionPolicyMBeansTest.java
index ee6f263..1608fe5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridEvictionPolicyMBeansTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridEvictionPolicyMBeansTest.java
@@ -101,7 +101,7 @@ public class GridEvictionPolicyMBeansTest extends GridCommonAbstractTest {
 
     /** Check that eviction bean is available */
     @Test
-    public void testEvictionPolicyBeans() throws Exception{
+    public void testEvictionPolicyBeans() throws Exception {
         checkBean("cache1", "org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy", "MaxSize", 100);
         checkBean("cache1", "org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy", "BatchSize", 10);
         checkBean("cache1", "org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy", "MaxMemorySize", 20L);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
index 54f6cda..032eb0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
@@ -80,14 +80,14 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst
     /**
      * @return Cache mode.
      */
-    protected CacheMode cacheMode(){
+    protected CacheMode cacheMode() {
         return CacheMode.PARTITIONED;
     }
 
     /**
      * @return Cache atomicity mode.
      */
-    protected CacheAtomicityMode atomicityMode(){
+    protected CacheAtomicityMode atomicityMode() {
         return CacheAtomicityMode.TRANSACTIONAL;
     }
 
@@ -281,7 +281,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst
         try {
             fut.get();
         }
-        catch (IgniteCheckedException gridException){
+        catch (IgniteCheckedException gridException) {
             e = gridException;
         }
 
@@ -327,7 +327,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst
         try {
             fut.get();
         }
-        catch (IgniteCheckedException gridException){
+        catch (IgniteCheckedException gridException) {
             e = gridException;
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
index c26f04e..80ca5a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -298,7 +298,7 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     @Test
-    public void testNoPartitionExchangeForTemplate() throws Exception{
+    public void testNoPartitionExchangeForTemplate() throws Exception {
         final int GRID_CNT = 3;
 
         startGridsMultiThreaded(GRID_CNT);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
index 8ee51e70..535e5fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
@@ -276,7 +276,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac
         for (final TestKey key : updates.keySet()) {
             final List<T2<TestValue, TestValue>> keyUpdates = updates.get(key);
 
-            assert(!F.isEmpty(keyUpdates));
+            assert (!F.isEmpty(keyUpdates));
 
             GridTestUtils.waitForCondition(new PA() {
                 @Override public boolean apply() {
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 dff20b3..a5456d0 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
@@ -871,7 +871,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
 
         Affinity<Integer> aff = affinity(cache1);
 
-        for(int i = 0; i < keys; i++) {
+        for (int i = 0; i < keys; i++) {
             if (aff.partition(i) == p)
                 keysSet.add(i);
         }
@@ -891,7 +891,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
 
         aff = affinity(cache2);
 
-        for(int i = 0; i < keys; i++) {
+        for (int i = 0; i < keys; i++) {
             if (aff.partition(i) == p)
                 keysSet.add(i);
         }
@@ -927,7 +927,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
         srv0.createCache(cacheConfiguration(GROUP1, CACHE1, cacheMode, atomicityMode, 2, false));
         srv0.createCache(cacheConfiguration(GROUP1, CACHE2, cacheMode, atomicityMode, 2, false));
 
-        if(!loc)
+        if (!loc)
             awaitPartitionMapExchange();
 
         if (atomicityMode == TRANSACTIONAL) {
@@ -1247,7 +1247,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
         Set<Integer> locKeys = new TreeSet<>();
 
         for (int key = 0; key < data.length; key++) {
-            if(aff.isPrimaryOrBackup(node, key))
+            if (aff.isPrimaryOrBackup(node, key))
                 locKeys.add(key);
         }
 
@@ -2294,7 +2294,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
                         if (j % loaders == i)
                             futs.add(ldr.addData(j, data[j]));
 
-                        if(j % (100 * loaders) == 0)
+                        if (j % (100 * loaders) == 0)
                             ldr.flush();
                     }
 
@@ -4044,7 +4044,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
                                 }
                             }
                         }
-                        catch (Exception e){
+                        catch (Exception e) {
                             log.error("Unexpected error: " + e, e);
 
                             err.set(e);
@@ -4080,7 +4080,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
                                 }
                             }
                         }
-                        catch (Exception e){
+                        catch (Exception e) {
                             log.error("Unexpected error: " + e, e);
 
                             err.set(e);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
index 2c98d4b..b922436 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
@@ -319,7 +319,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
         Affinity<Object> affinity = grid(0).affinity(cache.getName());
 
         for (int i = 0; i < gridCount(); i++) {
-            if(!affinity.isPrimary(grid(i).localNode(), new MyKey(""))) {
+            if (!affinity.isPrimary(grid(i).localNode(), new MyKey(""))) {
                 cache = jcache(i);
                 break;
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index 0b10db2..d0bd2be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -766,7 +766,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
 
                 int partSize = 0;
 
-                for (Integer key : keys){
+                for (Integer key : keys) {
                     int keyPart = ignite(nodeIdx).affinity(DEFAULT_CACHE_NAME).partition(key);
                     if (keyPart == part)
                         partSize++;
@@ -796,9 +796,9 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
 
                 int partSize = 0;
 
-                for (Integer key :keys){
+                for (Integer key :keys) {
                     int keyPart = ignite(nodeIdx).affinity(DEFAULT_CACHE_NAME).partition(key);
-                    if(keyPart == part)
+                    if (keyPart == part)
                         partSize++;
                 }
 
@@ -883,7 +883,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
             }
 
             if (cacheMode() == REPLICATED) {
-                assertEquals(primary+backups, cache0.localSizeLong(part, ALL));
+                assertEquals(primary + backups, cache0.localSizeLong(part, ALL));
                 assertEquals(primary, cache0.localSizeLong(part, PRIMARY));
                 assertEquals(backups, cache0.localSizeLong(part, BACKUP));
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
index 98cdcc5..da0cc5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
@@ -258,7 +258,7 @@ public class IgniteClientCacheInitializationFailTest extends GridCommonAbstractT
 
         /** {@inheritDoc} */
         @Override public Collection<ColumnInformation> columnsInformation(String schemaNamePtrn, String tblNamePtrn,
-            String colNamePtrn){
+            String colNamePtrn) {
             return null;
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
index 3d21563..cd2bf05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
@@ -176,7 +176,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest {
 
         File marshStoreDir = U.resolveWorkDirectory(U.defaultWorkDirectory(), "marshaller", false);
 
-        try(FileOutputStream out = new FileOutputStream(new File(marshStoreDir, fileName))) {
+        try (FileOutputStream out = new FileOutputStream(new File(marshStoreDir, fileName))) {
             try (Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
                 writer.write(typeName);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
index c13739e..1fdd6ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
@@ -237,7 +237,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest {
             }
 
             for (int g = 0; g < GRID_CNT; g++) {
-                IgniteCache<Object, Object> checkCache =grid(g).cache(DEFAULT_CACHE_NAME);
+                IgniteCache<Object, Object> checkCache = grid(g).cache(DEFAULT_CACHE_NAME);
 
                 ClusterNode checkNode = grid(g).localNode();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
index b5fc48a..1436d1f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
@@ -93,7 +93,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
 
         IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME).withAllowAtomicOpsInTx();
 
-        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
+        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             cache.put(key, val);
 
             GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -120,7 +120,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
 
         IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME).withAllowAtomicOpsInTx();
 
-        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
+        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             cache.put(key, val);
 
             GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -147,7 +147,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
 
         IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME).withAllowAtomicOpsInTx();
 
-        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
+        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             cache.put(key, val);
 
             GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -174,7 +174,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
 
         IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME).withAllowAtomicOpsInTx();
 
-        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
+        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             cache.put(key, val);
 
             GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -201,7 +201,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
 
         IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME).withAllowAtomicOpsInTx();
 
-        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
+        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             cache.put(key, val);
 
             GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -228,7 +228,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
 
         IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME).withAllowAtomicOpsInTx();
 
-        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
+        try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             cache.put(key, val);
 
             GridTestUtils.assertThrows(log, new Callable<Object>() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
index 196e9b8..0faf350 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
@@ -441,7 +441,7 @@ public class IgniteTopologyValidatorGridSplitCacheTest extends IgniteCacheTopolo
                 }
             }
 
-            assertTrue("Failed to find affinity key [gridIdx=" + idx +", cache=" + cacheName + ']',
+            assertTrue("Failed to find affinity key [gridIdx=" + idx + ", cache=" + cacheName + ']',
                 key != -1);
 
             IgniteCache<Object, Object> cache = g.cache(cacheName);
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 a7c0bb6..fb20b89 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
@@ -590,7 +590,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 
                     sem2.acquire();
                 }
-                catch (Exception ignored){
+                catch (Exception ignored) {
                     failed = false;
                 }
                 finally {
@@ -605,7 +605,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
         assertTrue("Failed to wait for semaphore creation",
             createLatch.await(getTestTimeout(), TimeUnit.MILLISECONDS));
 
-        while(!sem1.hasQueuedThreads()) {
+        while (!sem1.hasQueuedThreads()) {
             try {
                 Thread.sleep(1);
             }
@@ -885,7 +885,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 
                     GridTestUtils.runAsync(new Callable<Void>() {
                         @Override public Void call() throws Exception {
-                            try{
+                            try {
                                 l.lock();
                             }
                             finally {
@@ -897,7 +897,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
                     }, "lock-thread");
 
                     // Wait until l.lock() has been called.
-                    while(!l.hasQueuedThreads() && !done.get()){
+                    while (!l.hasQueuedThreads() && !done.get()){
                         // No-op.
                     }
 
@@ -921,7 +921,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
                 }
                 finally {
                     // Broken lock cannot be used in non-failoversafe mode.
-                    if(!lock.isBroken() || failoverSafe) {
+                    if (!lock.isBroken() || failoverSafe) {
                         assertTrue(lock.isHeldByCurrentThread());
 
                         lock.unlock();
@@ -936,7 +936,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 
             fut.get();
 
-            for (Ignite g : G.allGrids()){
+            for (Ignite g : G.allGrids()) {
                 IgniteLock l = g.reentrantLock(STRUCTURE_NAME, failoverSafe, fair, false);
 
                 assertTrue(g.name(), !l.isHeldByCurrentThread() || lock.isBroken());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
index e499577..f13aa4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
@@ -72,6 +72,6 @@ public class GridCacheMultiNodeDataStructureTest {
         atomicLong.incrementAndGet();
         atomicLong.incrementAndGet();
 
-        X.println(cacheName+": Seq: " + seq.get() + " atomicLong " + atomicLong.get());
+        X.println(cacheName + ": Seq: " + seq.get() + " atomicLong " + atomicLong.get());
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
index 3114f62..ba6f1ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
@@ -207,7 +207,7 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA
                     e.getMessage().startsWith(expectedMessage)
                 );
             }
-            catch (IgniteException e){
+            catch (IgniteException e) {
                 String expectedMessage = "Failed to find atomic long:";
 
                 assertTrue(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java
index 71cd842..91a7555 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerDiscoHistoryTest.java
@@ -84,7 +84,7 @@ public class IgniteExchangeLatchManagerDiscoHistoryTest extends GridCommonAbstra
 
         TcpDiscoveryIpFinder ipFinder = ((TcpDiscoverySpi)cfg.getDiscoverySpi()).getIpFinder();
 
-        int topHistSize = victim? TOPOLOGY_HISTORY_SIZE: TcpDiscoverySpi.DFLT_TOP_HISTORY_SIZE;
+        int topHistSize = victim ? TOPOLOGY_HISTORY_SIZE : TcpDiscoverySpi.DFLT_TOP_HISTORY_SIZE;
 
         CustomTcpDiscoverySpi discoSpi = new CustomTcpDiscoverySpi(topHistSize, ipFinder);
 
@@ -185,7 +185,7 @@ public class IgniteExchangeLatchManagerDiscoHistoryTest extends GridCommonAbstra
         // Start server node with short topology history.
         victim = true;
 
-        GridTestUtils.runAsync(() ->startGrid(1));
+        GridTestUtils.runAsync(() -> startGrid(1));
 
         // Waits for the initial exchange.
         startSrvsLatch.await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
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 29039c9..c5bbc84 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
@@ -739,15 +739,15 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
 
         boolean done = false;
 
-        while(!done) {
+        while (!done) {
             done = true;
 
-            for (IgniteInternalFuture<?> fut : futs){
-                if(!fut.isDone())
+            for (IgniteInternalFuture<?> fut : futs) {
+                if (!fut.isDone())
                     done = false;
             }
 
-            try{
+            try {
                 lock.lock();
 
                 lock.getOrCreateCondition("c1").signal();
@@ -893,12 +893,12 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
 
                             IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() {
                                 @Override public Void call() throws Exception {
-                                    try{
+                                    try {
                                         thread.set(Thread.currentThread());
 
                                         l.lockInterruptibly();
                                     }
-                                    catch(IgniteInterruptedException ignored){
+                                    catch (IgniteInterruptedException ignored) {
                                         exceptionThrown.set(true);
                                     }
                                     finally {
@@ -910,7 +910,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
                             });
 
                             // Wait until l.lock() has been called.
-                            while(!l.hasQueuedThreads()){
+                            while (!l.hasQueuedThreads()){
                                 // No-op.
                             }
 
@@ -920,7 +920,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
 
                             thread.get().interrupt();
 
-                            while(!done.get()){
+                            while (!done.get()){
                                 // No-op.
                             }
 
@@ -1621,29 +1621,29 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
 
                             latch.await();
 
-                            while(true){
+                            while (true) {
                                 l.lock();
 
                                 try {
                                     long opsCounter = (long) ignite.getOrCreateCache(OPS_COUNTER).get(OPS_COUNTER);
 
-                                    if(opsCounter == opsCount)
+                                    if (opsCounter == opsCount)
                                         break;
 
                                     ignite.getOrCreateCache(OPS_COUNTER).put(OPS_COUNTER, ++opsCounter);
 
                                     localCount++;
 
-                                    if(localCount > 1000){
+                                    if (localCount > 1000) {
                                         assertTrue(localCount < (1 + tolerance) * opsCounter / threadCount);
 
                                         assertTrue(localCount > (1 - tolerance) * opsCounter / threadCount);
                                     }
 
-                                    if(localCount % 100 == 0) {
-                                        info("Node [id=" +ignite.cluster().localNode().id() + "] acquired " +
+                                    if (localCount % 100 == 0) {
+                                        info("Node [id=" + ignite.cluster().localNode().id() + "] acquired " +
                                             localCount + " times. " + "Total ops count: " +
-                                            opsCounter + "/" + opsCount +"]");
+                                            opsCounter + "/" + opsCount + "]");
                                     }
                                 }
                                 finally {
@@ -1667,8 +1667,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
 
         long totalSum = 0;
 
-        for(int i=0; i<gridCount(); i++){
-
+        for (int i = 0; i < gridCount(); i++) {
             totalSum += counts.get(i);
 
             info("Node " + grid(i).localNode().id() + " acquired the lock " + counts.get(i) + " times. ");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
index d4d1426..c7a7962 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
@@ -86,4 +86,5 @@ public class IgnitePartitionedQueueNoBackupsTest extends GridCachePartitionedQue
                     fail("For collocated queue all items should be stored on single node.");
             }
         }
-    }}
+    }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
index 4df5c65..cd4de7e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
@@ -186,7 +186,7 @@ public class CacheDataLossOnPartitionMoveTest extends GridCommonAbstractTest {
 
             int i = 0;
 
-            while(i < GRIDS_CNT / 2) {
+            while (i < GRIDS_CNT / 2) {
                 stopGrid(GRIDS_CNT / 2 + i);
 
                 i++;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledTransactionalWriteReadRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledTransactionalWriteReadRestartSelfTest.java
index 148a95db..f2afb6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledTransactionalWriteReadRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledTransactionalWriteReadRestartSelfTest.java
@@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  * Transactional write read consistency test.
  */
-public class CacheNearDisabledTransactionalWriteReadRestartSelfTest extends CacheAbstractRestartSelfTest{
+public class CacheNearDisabledTransactionalWriteReadRestartSelfTest extends CacheAbstractRestartSelfTest {
     /** */
     public static final int RANGE = 100;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
index 27c95c8..29c3dee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
@@ -133,7 +133,7 @@ public class CachePageWriteLockUnlockTest extends GridCommonAbstractTest {
     private void putData(Ignite grid, int total, int part) {
         int c = 0, k = 0;
 
-        while(c < total) {
+        while (c < total) {
             if (grid(0).affinity(DEFAULT_CACHE_NAME).partition(k) == part) {
                 grid.cache(DEFAULT_CACHE_NAME).put(k, k);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostWhileClearingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostWhileClearingTest.java
index cbf4d15..d5a4594 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostWhileClearingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostWhileClearingTest.java
@@ -160,7 +160,7 @@ public class CachePartitionLostWhileClearingTest extends GridCommonAbstractTest
     private void load(IgniteEx ignite, String cache, int partId, int cnt, int skip) {
         List<Integer> keys = partitionKeys(ignite.cache(cache), partId, cnt, skip);
 
-        try(IgniteDataStreamer<Object, Object> s = ignite.dataStreamer(cache)) {
+        try (IgniteDataStreamer<Object, Object> s = ignite.dataStreamer(cache)) {
             for (Integer key : keys)
                 s.addData(key, key);
         }
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 3b0d806..1ee41ae 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
@@ -178,7 +178,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
         assert !cache.isLocalLocked(key, true);
 
         if (partitioned()) {
-            for(int i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
                 if (cache.isLocalLocked(key, false)) {
                     try {
                         Thread.sleep(10);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index 57d95de..568cecd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@ -308,7 +308,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
                                 expVals.remove(key);
                         }
                         catch (Exception e) {
-                            log.error("Cache update failed [putMap=" + putMap+ ", rmvSet=" + rmvSet + ']', e);
+                            log.error("Cache update failed [putMap=" + putMap + ", rmvSet=" + rmvSet + ']', e);
 
                             errCtr.incrementAndGet();
                         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
index 62d58bc..370782c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
@@ -107,8 +107,8 @@ public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCom
                     catch (Throwable ignore) {
                         // No-op.
                     }
-                    if(Thread.currentThread().isInterrupted())
-                        throw new IgniteInterruptedCheckedException("Execution of ["+Thread.currentThread().getName()+"] Interrupted. Test is probably timed out");
+                    if (Thread.currentThread().isInterrupted())
+                        throw new IgniteInterruptedCheckedException("Execution of [" + Thread.currentThread().getName() + "] Interrupted. Test is probably timed out");
                 }
 
                 return null;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
index d9bf3ff..91bbc6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
@@ -136,7 +136,7 @@ public class IgniteCacheConnectionRecoveryTest extends GridCommonAbstractTest {
                     catch (Exception e) {
                         synchronized (IgniteCacheConnectionRecoveryTest.class) {
                             log.error("Failed to execute update, will dump debug information" +
-                                " [err=" + e+ ", iter=" + iter + ']', e);
+                                " [err=" + e + ", iter=" + iter + ']', e);
 
                             List<Ignite> nodes = IgnitionEx.allGridsx();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
index 6cb36d6..e9fa201 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
@@ -131,7 +131,7 @@ public class IgniteCacheMessageRecoveryIdleConnectionTest extends GridCommonAbst
                 }
                 catch (IgniteException e) {
                     log.error("Failed to execute update, will dump debug information" +
-                        " [err=" + e+ ", iter=" + iter + ']', e);
+                        " [err=" + e + ", iter=" + iter + ']', e);
 
                     List<Ignite> nodes = IgnitionEx.allGridsx();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
index 48fbe0a..c16675e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
@@ -218,7 +218,7 @@ public class CacheGetReadFromBackupFailoverTest extends GridCommonAbstractTest {
 
         stop.set(true);
 
-        while (true){
+        while (true) {
             try {
                 fut.get(10_000);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java
index 0c5a58c..622034a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.java
@@ -21,7 +21,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht;
  * Tests for byte array values in PARTITIONED-ONLY caches with P2P enabled.
  */
 public class GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest extends
-    GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest{
+    GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean peerClassLoading() {
         return true;
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 7a15c2c..0518513 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
@@ -222,7 +222,7 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
 
                         U.sleep(100);
                     }
-                    catch (Throwable e){
+                    catch (Throwable e) {
                         U.error(log(), "Failed unlock.", e);
 
                         err = e;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index 7a321f1..a767aa3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -440,7 +440,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
     /**
      * @throws Exception If failed.
      */
-    private void checkInternalCleanup() throws Exception{
+    private void checkInternalCleanup() throws Exception {
         checkNoAtomicFutures();
 
         checkOnePhaseCommitReturnValuesCleaned(GRID_CNT);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManagerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManagerAbstractTest.java
index 825cf9d..5d0d174 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManagerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManagerAbstractTest.java
@@ -178,7 +178,7 @@ public abstract class PartitionsEvictManagerAbstractTest extends GridCommonAbstr
             Object obj = super.poll();
 
             // This code uses for failure handler testing into PartitionEvictionTask.
-            if(obj != null && completeWithError) {
+            if (obj != null && completeWithError) {
                 try {
                     Field field = U.findField(PartitionsEvictManager.PartitionEvictionTask.class, "finishFut");
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
index 0f36fbc..f3eca92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
@@ -232,7 +232,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
                 assertEquals(0, jcache.localMetrics().getCacheHits());
                 assertEquals(1, jcache.localMetrics().getCacheMisses());
             }
-            else if (affinity(jcache).isBackup(g.cluster().localNode(), key)){
+            else if (affinity(jcache).isBackup(g.cluster().localNode(), key)) {
                 assertEquals(1, jcache.localMetrics().getCacheGets());
                 assertEquals(1, jcache.localMetrics().getCacheHits());
                 assertEquals(0, jcache.localMetrics().getCacheMisses());
@@ -285,7 +285,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
                 assertEquals(0, jcache.localMetrics().getCacheHits());
                 assertEquals(1, jcache.localMetrics().getCacheMisses());
             }
-            else if (affinity(jcache).isBackup(g.cluster().localNode(), key)){
+            else if (affinity(jcache).isBackup(g.cluster().localNode(), key)) {
                 assertEquals(0, jcache.localMetrics().getCacheGets());
                 assertEquals(0, jcache.localMetrics().getCacheHits());
                 assertEquals(0, jcache.localMetrics().getCacheMisses());
@@ -448,7 +448,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
                 assertEquals(0, jcache.localMetrics().getCacheHits());
                 assertEquals(2, jcache.localMetrics().getCacheMisses());
             }
-            else if (affinity(jcache).isBackup(g.cluster().localNode(), key)){
+            else if (affinity(jcache).isBackup(g.cluster().localNode(), key)) {
                 assertEquals(0, jcache.localMetrics().getCacheGets());
                 assertEquals(0, jcache.localMetrics().getCacheHits());
                 assertEquals(0, jcache.localMetrics().getCacheMisses());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.java
index a95414d..623fb6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.java
@@ -21,7 +21,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
  * Tests for byte array values in NEAR-PARTITIONED caches with P2P enabled.
  */
 public class GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest extends
-    GridCacheAbstractNearPartitionedByteArrayValuesSelfTest{
+    GridCacheAbstractNearPartitionedByteArrayValuesSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean peerClassLoading() {
         return true;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
index 04ff576..71fdb24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
@@ -113,7 +113,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
         for (String msg : msgs)
             info(msg);
 
-        info(">>> t2/t1: " + (t2/t1));
+        info(">>> t2/t1: " + (t2 / t1));
     }
 
     /**
@@ -195,7 +195,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
         for (String msg : msgs)
             info(msg);
 
-        info(">>> cnt1/cnt2=" + (cnt1/cnt2));
+        info(">>> cnt1/cnt2=" + (cnt1 / cnt2));
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index f132d06..f4dba2c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -49,7 +49,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  * Tests for partitioned cache automatic eviction.
  */
-@WithSystemProperty(key="IGNITE_UNWIND_THROTTLING_TIMEOUT", value="5")
+@WithSystemProperty(key = "IGNITE_UNWIND_THROTTLING_TIMEOUT", value = "5")
 public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfTest {
     /** */
     private static final int GRID_CNT = 2;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
index 85b35b9..496958d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
@@ -70,7 +70,7 @@ public class GridCacheRebalancingSyncCheckDataTest extends GridCommonAbstractTes
 
             GridTestUtils.runMultiThreaded(new Callable<Void>() {
                 @Override public Void call() throws Exception {
-                    try(Ignite ignite = startGrid(idx.getAndIncrement())) {
+                    try (Ignite ignite = startGrid(idx.getAndIncrement())) {
                         IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
 
                         for (int i = 0; i < KEYS; i++)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java
index 7b635c2..ac1b967 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java
@@ -325,7 +325,7 @@ public class IgniteRebalanceOnCachesStoppingOrDestroyingTest extends GridCommonA
         /**
          * @param cacheId Cache id.
          */
-        public synchronized void resume(int cacheId){
+        public synchronized void resume(int cacheId) {
             for (T3<UUID, Message, IgniteRunnable> t : suspendedMessages.remove(cacheId))
                 super.notifyListener(t.get1(), t.get2(), t.get3());
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index e0760f4..c0407ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -1057,7 +1057,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
      */
     @Test
     public void testNearExpiresWithCacheStore() throws Exception {
-        if(cacheMode() != PARTITIONED)
+        if (cacheMode() != PARTITIONED)
             return;
 
         factory = CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, 1));
@@ -1090,7 +1090,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
 
         waitExpired(key);
 
-        for(int i = 0; i < gridCount(); i++)
+        for (int i = 0; i < gridCount(); i++)
             assertNull(jcache(i).localPeek(key, CachePeekMode.BACKUP, CachePeekMode.PRIMARY));
 
         assertEquals(null, cache.get(key));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
index f5a89b2..6cf7b41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
@@ -91,7 +91,7 @@ public abstract class IgniteCacheStoreNodeRestartAbstractTest extends IgniteCach
     /**
      * Custom object.
      */
-    private static class UserObject implements Serializable{
+    private static class UserObject implements Serializable {
         /** */
         private String field;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheFastNodeLeftForTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheFastNodeLeftForTransactionTest.java
index 7100683..b10a5b2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheFastNodeLeftForTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheFastNodeLeftForTransactionTest.java
@@ -254,7 +254,7 @@ public class GridCacheFastNodeLeftForTransactionTest extends GridCommonAbstractT
 
         PrintStream sysOut = System.out;
 
-        try(PrintStream out = new PrintStream(baos)) {
+        try (PrintStream out = new PrintStream(baos)) {
             System.setOut(out);
 
             Logger cmdLog = createTestLogger(baos);
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 7509392..2a5f752 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
@@ -853,7 +853,7 @@ public abstract class CacheMvccAbstractTest extends GridCommonAbstractTest {
      */
     protected static void mergeSql(TestCache<Integer, MvccTestAccount> cache, Integer key, Integer val, Integer updateCnt) {
         SqlFieldsQuery qry = new SqlFieldsQuery("merge into MvccTestAccount(_key, val, updateCnt) values " +
-            " (" + key+ ", " + val + ", " + updateCnt + ")");
+            " (" + key + ", " + val + ", " + updateCnt + ")");
 
         cache.cache.query(qry).getAll();
     }
@@ -868,7 +868,7 @@ public abstract class CacheMvccAbstractTest extends GridCommonAbstractTest {
      */
     private static void insertSql(TestCache<Integer, MvccTestAccount> cache, int key, Integer val, Integer updateCnt) {
         SqlFieldsQuery qry = new SqlFieldsQuery("insert into MvccTestAccount(_key, val, updateCnt) values " +
-            " (" + key+ ", " + val + ", " + updateCnt + ")");
+            " (" + key + ", " + val + ", " + updateCnt + ")");
 
         cache.cache.query(qry).getAll();
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
index d1c519f..8392048 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
@@ -1701,7 +1701,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest {
                             while (id1.equals(id2))
                                 id2 = rnd.nextInt(ACCOUNTS);
 
-                            if(id1 > id2) {
+                            if (id1 > id2) {
                                 int tmp = id1;
                                 id1 = id2;
                                 id2 = tmp;
@@ -2057,7 +2057,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest {
                         while (keys.size() < keysCnt) {
                             int key = rnd.nextInt(KEYS);
 
-                            if(keys.add(key))
+                            if (keys.add(key))
                                 map.put(key, cnt);
                         }
 
@@ -2885,7 +2885,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest {
                         while (k1.equals(k2))
                             k2 = partKeys.get(rnd.nextInt(KEYS_PER_PART));
 
-                        if(k1 > k2) {
+                        if (k1 > k2) {
                             int tmp = k1;
                             k1 = k2;
                             k2 = tmp;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
index 2d69101..5636b19 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
@@ -149,7 +149,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest {
 
         IgniteWriteAheadLogManager wal = node.context().cache().context().wal();
 
-        if (recoverFromWAL){
+        if (recoverFromWAL) {
             //Force checkpoint. See for details: https://issues.apache.org/jira/browse/IGNITE-10187
             node.context().cache().context().database().waitForCheckpoint(null);
 
@@ -168,7 +168,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest {
 
             flushTask.onTimeout(); // Flush WAL.
 
-            if (!recoverFromWAL){
+            if (!recoverFromWAL) {
                 //Force checkpoint, then disable.
                 node.context().cache().context().database().waitForCheckpoint(null);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java
index 1f2a535..a59e952 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java
@@ -127,7 +127,7 @@ public abstract class IgnitePdsDestroyCacheAbstractTest extends GridCommonAbstra
 
         assertEquals("Check that caches don't survived", CACHES - 2, ignite.cacheNames().size());
 
-        for(Ignite ig: G.allGrids()) {
+        for (Ignite ig: G.allGrids()) {
             IgniteCache cache = ig.cache(cacheName(2));
 
             for (int j = 0; j < NUM_OF_KEYS; j++)
@@ -160,7 +160,7 @@ public abstract class IgnitePdsDestroyCacheAbstractTest extends GridCommonAbstra
 
         log.warning("Grid started");
 
-        for(Ignite ig: G.allGrids()) {
+        for (Ignite ig: G.allGrids()) {
             assertTrue(ig.cacheNames().contains(cacheName(2)));
 
             IgniteCache cache = ig.cache(cacheName(2));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
index ff79ab7..95e24cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
@@ -334,7 +334,7 @@ public class IgnitePdsTaskCancelingTest extends GridCommonAbstractTest {
                 }
 
                 private void parkForAWhile() {
-                    if(slowFileIoEnabled.get() && slow)
+                    if (slowFileIoEnabled.get() && slow)
                         LockSupport.parkNanos(1_000_000_000L);
                 }
             };
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
index 5e60530..e977b2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
@@ -581,7 +581,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
         cache = newIgnite.cache(DEFAULT_CACHE_NAME);
 
         for (int k = 0; k < keysCnt; k++)
-            assertFalse("k=" + k +", v="  + cache.get(k), cache.containsKey(k));
+            assertFalse("k=" + k + ", v="  + cache.get(k), cache.containsKey(k));
 
         Set<Integer> keys = new TreeSet<>();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
index 849e667..0f4ddd4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
@@ -91,7 +91,7 @@ public class IgniteAbsentEvictionNodeOutOfBaselineTest extends GridCommonAbstrac
 
         IgniteCache<Object, Object> cache = ignite0.getOrCreateCache(TEST_CACHE_NAME);
 
-        for(int i = 0; i< 100; i++)
+        for (int i = 0; i < 100; i++)
             cache.put(i, i);
 
         //when: stop one node and reset baseline topology
@@ -101,7 +101,7 @@ public class IgniteAbsentEvictionNodeOutOfBaselineTest extends GridCommonAbstrac
 
         awaitPartitionMapExchange();
 
-        for(int i = 0; i< 200; i++)
+        for (int i = 0; i < 200; i++)
             cache.put(i, i);
 
         //then: after returning stopped node to grid its partitions should be removed
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java
index b42eb8a..654dde9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java
@@ -667,7 +667,7 @@ public class IgnitePdsPartitionPreloadTest extends GridCommonAbstractTest {
 
         int realSize = 0;
 
-        while(cursor.hasNext()) {
+        while (cursor.hasNext()) {
             realSize++;
 
             cursor.next();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java
index 1fc0885..51a4073 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java
@@ -39,11 +39,11 @@ public class CheckpointStartLoggingTest extends GridCommonAbstractTest {
     private static final String CHECKPOINT_STARTED_LOG_FORMAT = "Checkpoint started .*" +
         "checkpointBeforeLockTime=" + VALID_MS_PATTERN + ", " +
         "checkpointLockWait=" + VALID_MS_PATTERN + ", " +
-        "checkpointListenersExecuteTime="+ VALID_MS_PATTERN +", " +
-        "checkpointLockHoldTime="+ VALID_MS_PATTERN + ", " +
-        "walCpRecordFsyncDuration="+ VALID_MS_PATTERN +", " +
-        "writeCheckpointEntryDuration="+ VALID_MS_PATTERN +", " +
-        "splitAndSortCpPagesDuration="+ VALID_MS_PATTERN +", " +
+        "checkpointListenersExecuteTime=" + VALID_MS_PATTERN + ", " +
+        "checkpointLockHoldTime=" + VALID_MS_PATTERN + ", " +
+        "walCpRecordFsyncDuration=" + VALID_MS_PATTERN + ", " +
+        "writeCheckpointEntryDuration=" + VALID_MS_PATTERN + ", " +
+        "splitAndSortCpPagesDuration=" + VALID_MS_PATTERN + ", " +
         ".* pages=[1-9][0-9]*, " +
         "reason=.*";
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java
index 7eb2f21..98efd32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java
@@ -161,7 +161,7 @@ class ProgressWatchdog {
                 || name.contains("db-checkpoint-thread")
                 || name.contains("wal-file-archiver")
                 || name.contains("data-streamer")
-                || (clientThreadsName!=null && name.contains(clientThreadsName))) {
+                || (clientThreadsName != null && name.contains(clientThreadsName))) {
                 String str = threadInfo.toString();
 
                 if (name.contains("db-checkpoint-thread")) {
@@ -360,8 +360,8 @@ class ProgressWatchdog {
             "cpWriteSpeed=" + cpWriteSpeed + " " +
             "cpSyncSpeed=" + cpSyncSpeed + " " +
             "walSpeed= " + walSpeed + " " +
-            "walWorkSeg.="+walWorkSegments + " " +
-            "markDirtySpeed=" + markDirtySpeed +" " +
+            "walWorkSeg.=" + walWorkSegments + " " +
+            "markDirtySpeed=" + markDirtySpeed + " " +
             "Avg. " + operation + " " + averagePutPerSec + " recs/sec, " +
             "dirtyP=" + dirtyPages + ", " +
             "cpWrittenP.=" + cpWrittenPages + ", " +
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 daab8d5..efa9ee9 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
@@ -114,7 +114,7 @@ public class IgnitePdsThreadInterruptionTest extends GridCommonAbstractTest {
         try (IgniteDataStreamer<Integer, byte[]> st = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
             st.allowOverwrite(true);
 
-            for (int i = 0; i < maxKey; i++){
+            for (int i = 0; i < maxKey; i++) {
                 keysToCheck.add(i);
 
                 st.addData(i, PAYLOAD);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java
index a339b8a..4ff7283 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java
@@ -88,7 +88,7 @@ public class IgniteWALTailIsReachedDuringIterationOverArchiveTest extends GridCo
 
         ig.cluster().active(true);
 
-        try (IgniteDataStreamer<Integer, byte[]> st = ig.dataStreamer(DEFAULT_CACHE_NAME)){
+        try (IgniteDataStreamer<Integer, byte[]> st = ig.dataStreamer(DEFAULT_CACHE_NAME)) {
             st.allowOverwrite(true);
 
             byte[] payload = new byte[1024];
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
index f3426bd..4d5dc1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
@@ -192,7 +192,7 @@ public class IgniteWalFlushFailoverTest extends GridCommonAbstractTest {
 
                 @Override public int write(ByteBuffer srcBuf) throws IOException {
 
-                    if (--writeAttempts <= 0 && fail!= null && fail.get())
+                    if (--writeAttempts <= 0 && fail != null && fail.get())
                         throw new IOException("No space left on device");
 
                     return super.write(srcBuf);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
index 58ea990..ea598f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
@@ -275,7 +275,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
             return new FileIODecorator(delegate) {
                 /** {@inheritDoc} */
                 @Override public int write(ByteBuffer srcBuf) throws IOException {
-                    System.out.println(">>>!!!! W "+file.getName());
+                    System.out.println(">>>!!!! W " + file.getName());
 
                     if (fail != null && file.getName().endsWith(".wal") && fail.get())
                         throw new IOException("No space left on device");
@@ -285,7 +285,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
 
                 /** {@inheritDoc} */
                 @Override public MappedByteBuffer map(int sizeBytes) throws IOException {
-                    System.out.println(">>>!!!! M "+file.getName());
+                    System.out.println(">>>!!!! M " + file.getName());
 
                     if (fail != null && file.getName().endsWith(".wal") && fail.get())
                         throw new IOException("No space left on deive");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
index 1788cdd..fea8828 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
@@ -218,7 +218,7 @@ public class IgniteWalSerializerVersionTest extends GridCommonAbstractTest {
 
                 if (exp == 0L)
                     assertTrue(act0.timestamp() == 0L);
-                else{
+                else {
                     long diff = Math.abs(exp - act0.timestamp());
 
                     assertTrue(String.valueOf(diff), diff < 10_000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
index 1da4c5a..d8a6604 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
@@ -931,7 +931,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
      * @param keys Keys.
      */
     private int prepareTx(Ignite ignite, List<Integer> keys) throws IgniteCheckedException {
-        try(Transaction tx = ignite.transactions().txStart()) {
+        try (Transaction tx = ignite.transactions().txStart()) {
             for (Integer key : keys)
                 ignite.cache(CACHE_NAME).put(key, key);
 
@@ -964,7 +964,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
         try (IgniteRebalanceIterator it = offh.rebalanceIterator(map, topVer)) {
             assertNotNull(it);
 
-            while(it.hasNextX())
+            while (it.hasNextX())
                 rows.add(it.next());
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java
index 208db74..9b0c0e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java
@@ -67,7 +67,7 @@ public class IgniteDataIntegrityTests {
 
         ThreadLocalRandom curr = ThreadLocalRandom.current();
 
-        for (int i = 0; i < 1024; i+=16) {
+        for (int i = 0; i < 1024; i += 16) {
             buf.putInt(curr.nextInt());
             buf.putInt(curr.nextInt());
             buf.putInt(curr.nextInt());
@@ -208,7 +208,7 @@ public class IgniteDataIntegrityTests {
         fileInput.io().position(0);
 
         for (int i = 0; i < 1024 / 16; i++) {
-            try(FileInput.Crc32CheckingFileInput in = fileInput.startRead(false)) {
+            try (FileInput.Crc32CheckingFileInput in = fileInput.startRead(false)) {
                 in.readInt();
                 in.readInt();
                 in.readInt();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgnitePureJavaCrcCompatibility.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgnitePureJavaCrcCompatibility.java
index 4f49990..b21364b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgnitePureJavaCrcCompatibility.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgnitePureJavaCrcCompatibility.java
@@ -40,7 +40,7 @@ public class IgnitePureJavaCrcCompatibility {
 
         ThreadLocalRandom curr = ThreadLocalRandom.current();
 
-        for (int i = 0; i < 1024; i+=16) {
+        for (int i = 0; i < 1024; i += 16) {
             buf.putInt(curr.nextInt());
             buf.putInt(curr.nextInt());
             buf.putInt(curr.nextInt());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java
index 509bdd4..35d14a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java
@@ -117,7 +117,7 @@ public class IgniteWithoutArchiverWalIteratorInvalidCrcTest extends GridCommonAb
 
         List<FileWALPointer> pointers = WalTestUtils.getPointers(lastWalFile, iterFactory, LOGICAL);
 
-        WalTestUtils.corruptWalSegmentFile(lastWalFile, pointers.get(pointers.size()-1));
+        WalTestUtils.corruptWalSegmentFile(lastWalFile, pointers.get(pointers.size() - 1));
 
         IgniteEx ex = startGrid(0);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index d48e752..de86c5e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -161,7 +161,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
         File db = U.resolveWorkDirectory(workDir, DFLT_STORE_DIR, false);
         File wal = new File(db, "wal");
 
-        if(setWalAndArchiveToSameVal) {
+        if (setWalAndArchiveToSameVal) {
             String walAbsPath = wal.getAbsolutePath();
 
             dsCfg.setWalPath(walAbsPath);
@@ -1279,7 +1279,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
             }
         }
 
-        log.info("Check REPLAY BETWEEN:" + exp2First + " " + exp2Last+ "\n" +
+        log.info("Check REPLAY BETWEEN:" + exp2First + " " + exp2Last + "\n" +
             "expFirst=" + exp2First + " actlFirst=" + actl2First + ", " +
             "expLast=" + exp2Last + " actlLast=" + actl2Last);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java
index 9e246fd..1d95dff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java
@@ -40,7 +40,7 @@ public class PageLockTrackerManagerTest {
      *
      */
     @Test
-    public void testDisableTracking(){
+    public void testDisableTracking() {
         System.setProperty("IGNITE_PAGE_LOCK_TRACKER_TYPE", String.valueOf(-1));
 
         try {
@@ -51,7 +51,7 @@ public class PageLockTrackerManagerTest {
             Assert.assertNotNull(pll);
             Assert.assertSame(pll, DataStructure.NOOP_LSNR);
 
-        }finally {
+        } finally {
             System.clearProperty("IGNITE_PAGE_LOCK_TRACKER_TYPE");
         }
 
@@ -65,7 +65,7 @@ public class PageLockTrackerManagerTest {
             Assert.assertNotNull(pll);
             Assert.assertNotSame(pll, DataStructure.NOOP_LSNR);
 
-        }finally {
+        } finally {
             System.clearProperty("IGNITE_PAGE_LOCK_TRACKER_TYPE");
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/BPlusTreePageMemoryImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/BPlusTreePageMemoryImplTest.java
index ec892fb..5549d69 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/BPlusTreePageMemoryImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/BPlusTreePageMemoryImplTest.java
@@ -28,10 +28,10 @@ import org.apache.ignite.internal.pagemem.FullPageId;
 import org.apache.ignite.internal.pagemem.PageMemory;
 import org.apache.ignite.internal.processors.cache.CacheDiagnosticManager;
 import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
-import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgress;
-import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgressImpl;
 import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
 import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
+import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgress;
+import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgressImpl;
 import org.apache.ignite.internal.processors.database.BPlusTreeSelfTest;
 import org.apache.ignite.internal.processors.metric.GridMetricManager;
 import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
@@ -111,7 +111,7 @@ public class BPlusTreePageMemoryImplTest extends BPlusTreeSelfTest {
             (fullPageId, byteBuf, tag) -> {
                 assert false : "No page replacement should happen during the test";
             },
-            new CIX3<Long, FullPageId, PageMemoryEx>(){
+            new CIX3<Long, FullPageId, PageMemoryEx>() {
                 @Override public void applyx(Long aLong, FullPageId fullPageId, PageMemoryEx ex) {
                 }
             },
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java
index 5ddbb2f..5df178c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java
@@ -224,7 +224,7 @@ public class FullPageIdTableTest  {
         }
         finally {
             long msPassed = U.currentTimeMillis() - seed;
-            System.err.println("Seed used [" + seed + "] duration ["+ msPassed+ "] ms");
+            System.err.println("Seed used [" + seed + "] duration [" + msPassed + "] ms");
             prov.shutdown(true);
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java
index f4f4be1..92c872c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java
@@ -653,7 +653,7 @@ public class PageMemoryImplTest extends GridCommonAbstractTest {
                 NO_OP_METRICS),
             throttlingPlc,
             noThrottle
-        ): new PageMemoryImpl(
+        ) : new PageMemoryImpl(
             provider,
             sizes,
             sharedCtx,
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java
index d48b38c..0936244 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java
@@ -80,7 +80,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
      * @param ig Node.
      * @return Node caches.
      */
-    protected static Map<String, GridCacheAdapter> caches(IgniteEx ig){
+    protected static Map<String, GridCacheAdapter> caches(IgniteEx ig) {
         return field(ig.context().cache(), CACHES);
     }
 
@@ -510,7 +510,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
          * @param caches Callback.
          * @return Test builder.
          */
-        public JoinNodeTestPlanBuilder dynamicCacheStart(IgniteCallable<List<CacheConfiguration>> caches){
+        public JoinNodeTestPlanBuilder dynamicCacheStart(IgniteCallable<List<CacheConfiguration>> caches) {
             strPlanBuilder.append("Dynamic caches start")
                 .append("\n");
 
@@ -523,7 +523,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
          * @param r Cache start callback.
          * @return Test builder.
          */
-        public JoinNodeTestPlanBuilder afterDynamicCacheStarted(Runnable r){
+        public JoinNodeTestPlanBuilder afterDynamicCacheStarted(Runnable r) {
             strPlanBuilder.append("Check after dynamic caches start")
                 .append("\n");
 
@@ -536,7 +536,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
          * @param caches Callback.
          * @return Test builder.
          */
-        public JoinNodeTestPlanBuilder dynamicCacheStop(IgniteCallable<List<String>> caches){
+        public JoinNodeTestPlanBuilder dynamicCacheStop(IgniteCallable<List<String>> caches) {
             strPlanBuilder.append("Dynamic caches stop")
                 .append("\n");
 
@@ -549,7 +549,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
          * @param r Callback.
          * @return Test builder.
          */
-        public JoinNodeTestPlanBuilder afterDynamicCacheStopped(Runnable r){
+        public JoinNodeTestPlanBuilder afterDynamicCacheStopped(Runnable r) {
             strPlanBuilder.append("Check after dynamic caches stop")
                 .append("\n");
 
@@ -689,23 +689,23 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
          * @param ig Node.
          * @return Next minor version.
          */
-        private AffinityTopologyVersion nextMinorVersion(IgniteEx ig){
+        private AffinityTopologyVersion nextMinorVersion(IgniteEx ig) {
             AffinityTopologyVersion cur = ig.context().discovery().topologyVersionEx();
 
-           return cur.nextMinorVersion();
+            return cur.nextMinorVersion();
         }
 
         /**
          * @param ver Version.
          */
-        private void awaitTopologyVersion(final AffinityTopologyVersion ver){
+        private void awaitTopologyVersion(final AffinityTopologyVersion ver) {
             onAllNode(new CI1<IgniteEx>() {
                 @Override public void apply(IgniteEx ig) {
                     while (true) {
                         AffinityTopologyVersion locTopVer = ig.context().cache().context()
                             .exchange().readyAffinityVersion();
 
-                        if (locTopVer.compareTo(ver) < 0){
+                        if (locTopVer.compareTo(ver) < 0) {
                             System.out.println("Top ready " + locTopVer + " on " + ig.localNode().id());
 
                             try {
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 f4729a4..753f741 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
@@ -33,7 +33,7 @@ public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbs
      *
      */
     @Test
-    public void testCheckValueAfterActivation(){
+    public void testCheckValueAfterActivation() {
         String cacheName = "my-cache";
 
         Ignite ig1P = primary(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
index a5fedc0..7ff9779 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
@@ -205,7 +205,7 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
      *
      */
     @Test
-    public void testDeActivateAndActivateAtomicSequence(){
+    public void testDeActivateAndActivateAtomicSequence() {
         String seqName = "mySeq";
 
         Ignite ig1 = primary(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
index a13eba2..fcb74de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
@@ -84,7 +84,7 @@ public class IgniteChangeGlobalStateServiceTest extends IgniteChangeGlobalStateA
     /**
      *
      */
-    private static class TestService implements Service{
+    private static class TestService implements Service {
         /** */
         private static final long serialVersionUID = 0L;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
index 878088e..00bb5ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
@@ -482,7 +482,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
     /**
      * @param ig Node.
      */
-    private void checkExceptionTryUseDataStructure(final Ignite ig){
+    private void checkExceptionTryUseDataStructure(final Ignite ig) {
         assertThrows(log, new Callable<Void>() {
             @Override public Void call() throws Exception {
                 IgniteAtomicSequence seq = ig.atomicSequence("seq", 0, true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
index 1ca79fd..d8ef809 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
@@ -98,7 +98,7 @@ public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest
 
         log.info("start backup cluster");
 
-        for (String name: backUpCluster.keySet()){
+        for (String name: backUpCluster.keySet()) {
             String n = name + "backUp";
 
             IgniteConfiguration cfg = getConfiguration(n);
@@ -112,7 +112,7 @@ public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest
 
         log.info("shutdown main cluster");
 
-        for (String name : backUpCluster.keySet()){
+        for (String name : backUpCluster.keySet()) {
             log.info(name + " stopping");
 
             stopGrid(name);
@@ -178,7 +178,7 @@ public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest
     /**
      *
      */
-    public boolean onlyClient(){
+    public boolean onlyClient() {
         for (int i = 0; i < gridCount(); i++)
             if (!grid(i).configuration().isClientMode())
                 return false;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java
index a138d8d..76f72a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java
@@ -60,7 +60,7 @@ public class JoinInActiveNodeToActiveClusterWithPersistence extends JoinInActive
         return b;
     }
 
-    @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationInClusterTemplate() throws Exception{
+    @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationInClusterTemplate() throws Exception {
         return persistent(super.joinClientStaticCacheConfigurationInClusterTemplate());
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java
index f472b49..08783c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java
@@ -138,7 +138,7 @@ public class TrackingPageIOTest {
             for (Map.Entry<Long, Boolean> e : map.entrySet())
                 assertEquals(
                     e.getValue().booleanValue(),
-                    io.wasChanged(buf, e.getKey(), backupId, backupId -1, PAGE_SIZE));
+                    io.wasChanged(buf, e.getKey(), backupId, backupId - 1, PAGE_SIZE));
         }
         catch (Throwable e) {
             System.out.println("snapshotId = " + backupId + ", basePageId = " + basePageId);
@@ -177,7 +177,7 @@ public class TrackingPageIOTest {
         try {
             TreeSet<Long> setIdx = new TreeSet<>();
 
-            generateMarking(buf, track, basePageId, maxId, setIdx, backupId, backupId -1);
+            generateMarking(buf, track, basePageId, maxId, setIdx, backupId, backupId - 1);
 
             for (long pageId = basePageId; pageId < basePageId + track; pageId++) {
                 Long foundNextChangedPage = io.findNextChangedPage(buf, pageId, backupId, backupId - 1, PAGE_SIZE);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
index 33d1a12..fa8f6c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
@@ -516,7 +516,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr
 
                                             tx.commit();
 
-                                            committed =true;
+                                            committed = true;
                                         }
                                         catch (Exception ex) {
                                             assertTrue(ex.getCause() instanceof TransactionSerializationException);
@@ -673,7 +673,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr
 
                                             tx.commit();
 
-                                            committed =true;
+                                            committed = true;
                                         }
                                         catch (Exception ex) {
                                             assertTrue(ex.toString(), X.hasCause(ex, TransactionSerializationException.class));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
index 657f517..c2902a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
@@ -237,7 +237,7 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati
                     };
 
                     final CacheEntryUpdatedListener<Object, Object> lsnr = asyncCallback ?
-                        new AsyncLocalNonSerializableListener(clsr): new LocalNonSerializableListener(clsr);
+                        new AsyncLocalNonSerializableListener(clsr) : new LocalNonSerializableListener(clsr);
 
                     IgniteCache<Object, Object> jcache = keepBinary ? jcache(idx).withKeepBinary() : jcache(idx);
 
@@ -616,7 +616,7 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati
      */
     private Object checkAndGetObject(@Nullable Object obj) {
         if (obj != null) {
-            assert obj instanceof BinaryObject || dataMode == EXTERNALIZABLE: obj;
+            assert obj instanceof BinaryObject || dataMode == EXTERNALIZABLE : obj;
 
             if (obj instanceof BinaryObject)
                 obj = ((BinaryObject)obj).deserialize();
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 a80eb5e..af76777 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
@@ -204,7 +204,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
                 for (int i = 0; i < gridCount(); i++) {
                     GridContinuousProcessor proc = grid(i).context().continuous();
 
-                    if(!((Map)U.field(proc, "rmtInfos")).isEmpty())
+                    if (!((Map)U.field(proc, "rmtInfos")).isEmpty())
                         return false;
                 }
 
@@ -1229,7 +1229,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
      * @throws Exception if failed.
      */
     @Test
-    public void testQueryWithRemoteTransformer() throws Exception{
+    public void testQueryWithRemoteTransformer() throws Exception {
         doQueryWithRemoteTransformer(true, true);
         doQueryWithRemoteTransformer(true, false);
         doQueryWithRemoteTransformer(false, true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java
index 8a25cea..5351751 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java
@@ -120,7 +120,7 @@ public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWri
             Thread timer = new Thread(new Runnable() {
                 @Override public void run() {
                     try {
-                        U.sleep(FLUSH_FREQUENCY+50);
+                        U.sleep(FLUSH_FREQUENCY + 50);
                     } catch (IgniteInterruptedCheckedException e) {
                         assertTrue("Timer was interrupted", false);
                     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
index 9a47c82..4e6cb4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
@@ -71,10 +71,10 @@ public class IgnteCacheClientWriteBehindStoreNonCoalescingTest extends IgniteCac
     }
 
     /** {@inheritDoc} */
-    @Override protected boolean writeBehindEnabled() { return true;}
+    @Override protected boolean writeBehindEnabled() { return true; }
 
     /** {@inheritDoc} */
-    @Override protected boolean writeBehindCoalescing() { return false;}
+    @Override protected boolean writeBehindCoalescing() { return false; }
 
     private static Random rnd = new Random();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
index 6f19932..8e8a674 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
@@ -92,25 +92,25 @@ public class DepthFirstSearchTest {
         assertAllNull(wfg);
 
         wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
-            put(T1, new HashSet<GridCacheVersion>(){{add(T2);}});
-            put(T2, new HashSet<GridCacheVersion>(){{add(T3);}});
-            put(T4, new HashSet<GridCacheVersion>(){{add(T1); add(T3);}});
+            put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
+            put(T2, new HashSet<GridCacheVersion>() {{ add(T3); }});
+            put(T4, new HashSet<GridCacheVersion>() {{ add(T1); add(T3); }});
         }};
 
         assertAllNull(wfg);
 
         wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
-            put(T1, new HashSet<GridCacheVersion>(){{add(T2);}});
-            put(T2, new HashSet<GridCacheVersion>(){{add(T3);}});
-            put(T4, new HashSet<GridCacheVersion>(){{add(T1); add(T2); add(T3);}});
+            put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
+            put(T2, new HashSet<GridCacheVersion>() {{ add(T3); }});
+            put(T4, new HashSet<GridCacheVersion>() {{ add(T1); add(T2); add(T3); }});
         }};
 
         assertAllNull(wfg);
 
         wfg = new HashMap<GridCacheVersion, Set<GridCacheVersion>>() {{
-            put(T1, new HashSet<GridCacheVersion>(){{add(T2);}});
-            put(T3, new HashSet<GridCacheVersion>(){{add(T4);}});
-            put(T4, new HashSet<GridCacheVersion>(){{add(T1);}});
+            put(T1, new HashSet<GridCacheVersion>() {{ add(T2); }});
+            put(T3, new HashSet<GridCacheVersion>() {{ add(T4); }});
+            put(T4, new HashSet<GridCacheVersion>() {{ add(T1); }});
         }};
 
         assertAllNull(wfg);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/PartitionUpdateCounterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/PartitionUpdateCounterTest.java
index 5178e70..32fabe0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/PartitionUpdateCounterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/PartitionUpdateCounterTest.java
@@ -158,7 +158,7 @@ public class PartitionUpdateCounterTest extends GridCommonAbstractTest {
         LongAdder reserveCntr = new LongAdder();
 
         IgniteInternalFuture<?> fut = multithreadedAsync(() -> {
-            while(!stop.get() || !reservations.isEmpty()) {
+            while (!stop.get() || !reservations.isEmpty()) {
                 if (!stop.get() && ThreadLocalRandom.current().nextBoolean()) {
                     int size = ThreadLocalRandom.current().nextInt(9) + 1;
 
@@ -314,7 +314,7 @@ public class PartitionUpdateCounterTest extends GridCommonAbstractTest {
             @Override public void run() {
                 int val;
 
-                while((val = id.incrementAndGet()) <= max) {
+                while ((val = id.incrementAndGet()) <= max) {
                     try {
                         cntr.update(val);
                     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCachePartitionConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCachePartitionConsistencyTest.java
index 785ebc7..826fb89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCachePartitionConsistencyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCachePartitionConsistencyTest.java
@@ -264,14 +264,14 @@ public class TxCrossCachePartitionConsistencyTest extends GridCommonAbstractTest
      * @param balance Balance.
      */
     private void preload(IgniteEx node, List<Integer> keys, long balance) {
-        try(IgniteDataStreamer<Object, Object> ds = node.dataStreamer(CACHE1)) {
+        try (IgniteDataStreamer<Object, Object> ds = node.dataStreamer(CACHE1)) {
             ds.allowOverwrite(true);
 
             for (Integer key : keys)
                 ds.addData(key, new Deposit(key, balance));
         }
 
-        try(IgniteDataStreamer<Object, Object> ds = node.dataStreamer(CACHE2)) {
+        try (IgniteDataStreamer<Object, Object> ds = node.dataStreamer(CACHE2)) {
             ds.allowOverwrite(true);
 
             for (Integer key : keys)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCacheRemoteMultiplePartitionReservationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCacheRemoteMultiplePartitionReservationTest.java
index b5a5e0a..339aced 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCacheRemoteMultiplePartitionReservationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxCrossCacheRemoteMultiplePartitionReservationTest.java
@@ -145,7 +145,7 @@ public class TxCrossCacheRemoteMultiplePartitionReservationTest extends GridComm
 
             // By this moment a backup partition with id=evictingBackupPartId is mocked and will count reservations on
             // backup commits.
-            try(Transaction tx = client.transactions().txStart()) {
+            try (Transaction tx = client.transactions().txStart()) {
                 cache1.put(evictingBackupPartId, 0);
                 cache2.put(evictingBackupPartId, 0);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDataConsistencyOnCommitFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDataConsistencyOnCommitFailureTest.java
index 8199cb1..3d21b24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDataConsistencyOnCommitFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDataConsistencyOnCommitFailureTest.java
@@ -145,7 +145,7 @@ public class TxDataConsistencyOnCommitFailureTest extends GridCommonAbstractTest
 
         IgniteTransactions transactions = ignite.transactions();
 
-        try(Transaction tx = transactions.txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ, 0, 1)) {
+        try (Transaction tx = transactions.txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ, 0, 1)) {
             assertNotNull(transactions.tx());
 
             ignite.cache(DEFAULT_CACHE_NAME).put(KEY, KEY + 1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
index 74413aa..4877ede 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
@@ -179,7 +179,7 @@ public class TxDeadlockCauseTest extends GridCommonAbstractTest {
                     for (int i = 0; i < keys0.size(); i++) {
                         Integer key = keys0.get(i);
 
-                        if(oneOp)
+                        if (oneOp)
                             cache.getAndPut(key, new Account(key, (key + 1) * 100));
                         else
                             cache.put(key, new Account(cache.get(key).id, (key + 1) * 100));
@@ -203,7 +203,7 @@ public class TxDeadlockCauseTest extends GridCommonAbstractTest {
 
         boolean detected = X.hasCause(e, TransactionDeadlockException.class);
 
-        if(!detected)
+        if (!detected)
             U.error(log, "Failed to detect a deadlock.", e);
         else
             log.info(X.cause(e, TransactionDeadlockException.class).getMessage());
@@ -229,7 +229,7 @@ public class TxDeadlockCauseTest extends GridCommonAbstractTest {
         while (true) {
             boolean res = b.get();
 
-            if(b.compareAndSet(res, !res))
+            if (b.compareAndSet(res, !res))
                 return res;
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
index a00bc9a..a1b228e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
@@ -56,7 +56,7 @@ public class TxLabelTest extends GridCommonAbstractTest {
      * @param lbl Label.
      */
     private void testLabel0(Ignite ignite, String lbl) {
-        try(Transaction tx = ignite.transactions().withLabel(lbl).txStart()) {
+        try (Transaction tx = ignite.transactions().withLabel(lbl).txStart()) {
             assertEquals(lbl, tx.label());
 
             ignite.cache(DEFAULT_CACHE_NAME).put(0, 0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java
index e926984..1db5053 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java
@@ -450,7 +450,7 @@ public class TxOnCachesStopTest extends GridCommonAbstractTest {
         final AtomicInteger cacheIdxToBeDestroyed,
         final List<Ignite> clients,
         TransactionConcurrency concurrency,
-        TransactionIsolation isolation){
+        TransactionIsolation isolation) {
         final GridCompoundFuture fut = new GridCompoundFuture();
 
         for (Ignite c : clients) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
index 4486201..a6f86f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
@@ -349,7 +349,7 @@ public class TxOptimisticDeadlockDetectionTest extends AbstractDeadlockDetection
 
                     log.info(stackTrace);
 
-                    assertTrue("DeadlockDetection hasn't executed at "+ (threadNum - 1) + " node.",
+                    assertTrue("DeadlockDetection hasn't executed at " + (threadNum - 1) + " node.",
                         stackTrace.contains(TxDeadlockDetection.class.getName()));
 
                     // At least one stack trace should contain TransactionDeadlockException.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticReadThroughTest.java
index f97a5ab..5f4a9b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticReadThroughTest.java
@@ -181,7 +181,7 @@ public class TxOptimisticReadThroughTest extends GridCommonAbstractTest {
     }
 
     /** @return Default configuration of a transactional cache cache. */
-    private static CacheConfiguration<Object, Object> cacheConfiguration(){
+    private static CacheConfiguration<Object, Object> cacheConfiguration() {
         return new CacheConfiguration<>("tx")
             .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)
             .setCacheStoreFactory(new TestStoreFactory())
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
index 0b04b6b..53a8ab3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
@@ -882,7 +882,7 @@ public abstract class TxPartitionCounterStateAbstractTest extends GridCommonAbst
          * @param primary Primary node.
          * @param tx Primary tx.
          */
-        protected void onCounterAssigned(IgniteEx primary, IgniteInternalTx tx, int idx){
+        protected void onCounterAssigned(IgniteEx primary, IgniteInternalTx tx, int idx) {
             log.info("TX: primary counter assigned: [name=" + primary.name() + ", txId=" + idx + ']');
         }
 
@@ -915,7 +915,7 @@ public abstract class TxPartitionCounterStateAbstractTest extends GridCommonAbst
                 });
 
                 // Order counter assigns.
-                if (countForNode(primary, TxState.ASSIGN) == txCnt) {// Wait until all prep requests queued and force prepare order.
+                if (countForNode(primary, TxState.ASSIGN) == txCnt) { // Wait until all prep requests queued and force prepare order.
                     futures.remove(new T3<>(primary, TxState.ASSIGN, version(assigns.get(primary).poll()))).onDone();
                 }
             });
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
index 3a3a77e..e461c50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
@@ -642,11 +642,11 @@ public class TxPartitionCounterStateConsistencyTest extends TxPartitionCounterSt
         IgniteInternalFuture<?> fut = multithreadedAsync(() -> {
             U.awaitQuiet(sync);
 
-            while(!done.get()) {
+            while (!done.get()) {
                 int batch0 = 1 + r.nextInt(batch - 1);
                 int start = r.nextInt(keys - batch0);
 
-                try(Transaction tx = client.transactions().txStart()) {
+                try (Transaction tx = client.transactions().txStart()) {
                     Map<Integer, Integer> map = new TreeMap<>();
 
                     IntStream.range(start, start + batch0).forEach(value -> map.put(value, value));
@@ -663,7 +663,7 @@ public class TxPartitionCounterStateConsistencyTest extends TxPartitionCounterSt
         IgniteInternalFuture fut2 = GridTestUtils.runAsync(() -> {
             U.awaitQuiet(sync);
 
-            while(!done.get()) {
+            while (!done.get()) {
                 try {
                     IgniteCache cache1 = client.createCache(cacheConfiguration(DEFAULT_CACHE_NAME + "2"));
 
@@ -709,7 +709,7 @@ public class TxPartitionCounterStateConsistencyTest extends TxPartitionCounterSt
         IgniteCache<Object, Object> cache = client.cache(DEFAULT_CACHE_NAME);
 
         // Put one key per partition.
-        try(IgniteDataStreamer<Object, Object> streamer = client.dataStreamer(DEFAULT_CACHE_NAME)) {
+        try (IgniteDataStreamer<Object, Object> streamer = client.dataStreamer(DEFAULT_CACHE_NAME)) {
             for (int k = 0; k < partitions(); k++)
                 streamer.addData(k, 0);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
index 8968d99..d2bb8a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
@@ -336,7 +336,7 @@ public class TxPartitionCounterStateOnePrimaryOneBackupTest extends TxPartitionC
                 prepFuts.put(nearXidVer, proceedFut);
 
                 // Order prepares.
-                if (prepFuts.size() == txCnt) {// Wait until all prep requests queued and force prepare order.
+                if (prepFuts.size() == txCnt) { // Wait until all prep requests queued and force prepare order.
                     prepFuts.remove(version(prepOrder.poll())).onDone();
                 }
             });
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRecoveryWithConcurrentRollbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRecoveryWithConcurrentRollbackTest.java
index 9886bad..baf5212 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRecoveryWithConcurrentRollbackTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRecoveryWithConcurrentRollbackTest.java
@@ -153,7 +153,7 @@ public class TxRecoveryWithConcurrentRollbackTest extends GridCommonAbstractTest
 
         int[] stripeHolder = new int[1];
 
-        try(final Transaction tx = client.transactions().txStart(PESSIMISTIC, READ_COMMITTED)) {
+        try (final Transaction tx = client.transactions().txStart(PESSIMISTIC, READ_COMMITTED)) {
             cache.put(k1, Boolean.TRUE);
             cache.put(k2, Boolean.TRUE);
 
... 6238 lines suppressed ...